[vala] gtk+-3.0: Update to 2.99.2



commit ff573b13c1b3a5258a55be083f0e315bc7998561
Author: Jürg Billeter <j bitron ch>
Date:   Sat Jan 15 11:31:16 2011 +0100

    gtk+-3.0: Update to 2.99.2

 vapi/gdk-3.0.vapi                              |  239 +--
 vapi/gdk-x11-3.0.vapi                          |  168 +-
 vapi/gtk+-3.0.vapi                             |  802 +++++-
 vapi/packages/gdk-3.0/gdk-3.0.excludes         |    1 +
 vapi/packages/gdk-3.0/gdk-3.0.files            |    2 +-
 vapi/packages/gdk-3.0/gdk-3.0.gi               |  809 ++-----
 vapi/packages/gdk-x11-3.0/gdk-x11-3.0.defines  |    1 +
 vapi/packages/gdk-x11-3.0/gdk-x11-3.0.excludes |    1 +
 vapi/packages/gdk-x11-3.0/gdk-x11-3.0.files    |    3 +-
 vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi       |  417 ++--
 vapi/packages/gdk-x11-3.0/gdk-x11-3.0.metadata |    5 +-
 vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala    |    3 -
 vapi/packages/gtk+-3.0/gtk+-3.0.excludes       |    2 +-
 vapi/packages/gtk+-3.0/gtk+-3.0.files          |    2 +-
 vapi/packages/gtk+-3.0/gtk+-3.0.gi             | 3311 +++++++++++++++++++++---
 vapi/packages/gtk+-3.0/gtk+-3.0.metadata       |    3 +
 16 files changed, 4315 insertions(+), 1454 deletions(-)
---
diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi
index f18a3f8..5874977 100644
--- a/vapi/gdk-3.0.vapi
+++ b/vapi/gdk-3.0.vapi
@@ -24,20 +24,20 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class AppLaunchContext : GLib.AppLaunchContext {
 		[CCode (has_construct_function = false)]
-		public AppLaunchContext ();
+		protected AppLaunchContext ();
 		public void set_desktop (int desktop);
-		public void set_display (Gdk.Display display);
 		public void set_icon (GLib.Icon icon);
 		public void set_icon_name (string icon_name);
 		public void set_screen (Gdk.Screen screen);
 		public void set_timestamp (uint32 timestamp);
+		[NoAccessorMethod]
+		public Gdk.Display display { owned get; construct; }
 	}
 	[CCode (ref_function = "g_object_ref", unref_function = "g_object_unref", cheader_filename = "gdk/gdk.h")]
 	public class Bitmap {
 	}
-	[Compact]
-	[CCode (ref_function = "gdk_cursor_ref", unref_function = "gdk_cursor_unref", type_id = "GDK_TYPE_CURSOR", cheader_filename = "gdk/gdk.h")]
-	public class Cursor {
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class Cursor : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Cursor (Gdk.CursorType cursor_type);
 		[CCode (has_construct_function = false)]
@@ -49,6 +49,8 @@ namespace Gdk {
 		public Gdk.CursorType get_cursor_type ();
 		public unowned Gdk.Display get_display ();
 		public unowned Gdk.Pixbuf get_image ();
+		public Gdk.CursorType cursor_type { get; construct; }
+		public Gdk.Display display { get; construct; }
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Device : GLib.Object {
@@ -65,18 +67,22 @@ namespace Gdk {
 		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 int get_n_axes ();
+		public int get_n_keys ();
 		public unowned string get_name ();
+		public void get_position (out unowned Gdk.Screen screen, int x, int y);
 		public Gdk.InputSource get_source ();
 		public void get_state (Gdk.Window window, double axes, Gdk.ModifierType mask);
+		public unowned Gdk.Window get_window_at_position (int win_x, int win_y);
 		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 ();
+		public unowned GLib.List list_slave_devices ();
 		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);
 		public void ungrab (uint32 time_);
+		public void warp (Gdk.Screen screen, int x, int y);
 		public Gdk.Device associated_device { get; }
 		[NoAccessorMethod]
 		public Gdk.DeviceManager device_manager { owned get; construct; }
@@ -90,18 +96,19 @@ namespace Gdk {
 		public string name { get; construct; }
 		[NoAccessorMethod]
 		public Gdk.DeviceType type { get; construct; }
+		public virtual signal void changed ();
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class DeviceManager : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected DeviceManager ();
-		public virtual unowned Gdk.Device get_client_pointer ();
+		public unowned Gdk.Device get_client_pointer ();
 		public unowned Gdk.Display get_display ();
-		public virtual unowned GLib.List list_devices (Gdk.DeviceType type);
+		public unowned GLib.List list_devices (Gdk.DeviceType type);
 		public Gdk.Display display { get; construct; }
-		public virtual signal void device_added (Gdk.Device device);
-		public virtual signal void device_changed (Gdk.Device device);
-		public virtual signal void device_removed (Gdk.Device device);
+		public virtual signal void device_added (Gdk.Device p0);
+		public virtual signal void device_changed (Gdk.Device p0);
+		public virtual signal void device_removed (Gdk.Device p0);
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Display : GLib.Object {
@@ -112,35 +119,27 @@ namespace Gdk {
 		public void close ();
 		public bool device_is_grabbed (Gdk.Device device);
 		public void flush ();
+		public unowned Gdk.AppLaunchContext get_app_launch_context ();
 		public static unowned Gdk.Display get_default ();
 		public uint get_default_cursor_size ();
 		public unowned Gdk.Window get_default_group ();
-		public virtual unowned Gdk.Screen get_default_screen ();
+		public unowned Gdk.Screen get_default_screen ();
 		public unowned Gdk.DeviceManager get_device_manager ();
-		public void get_device_state (Gdk.Device device, out unowned Gdk.Screen screen, int x, int y, Gdk.ModifierType mask);
-		[NoWrapper]
-		public virtual unowned string get_display_name ();
 		public Gdk.Event get_event ();
 		public void get_maximal_cursor_size (out uint width, out uint height);
-		public virtual int get_n_screens ();
+		public int get_n_screens ();
 		public unowned string get_name ();
-		public void get_pointer (out unowned Gdk.Screen screen, out int x, out int y, out Gdk.ModifierType mask);
-		public virtual unowned Gdk.Screen get_screen (int screen_num);
-		public unowned Gdk.Window get_window_at_device_position (Gdk.Device device, int win_x, int win_y);
-		public unowned Gdk.Window get_window_at_pointer (int win_x, int win_y);
+		public unowned Gdk.Screen get_screen (int screen_num);
+		public bool has_pending ();
 		public bool is_closed ();
-		public void keyboard_ungrab (uint32 time_);
+		public void notify_startup_complete (string startup_id);
 		public static unowned Gdk.Display open (string display_name);
 		public static unowned Gdk.Display open_default_libgtk_only ();
 		public Gdk.Event peek_event ();
-		public bool pointer_is_grabbed ();
-		public void pointer_ungrab (uint32 time_);
 		public void put_event (Gdk.Event event);
 		public bool request_selection_notification (Gdk.Atom selection);
-		public unowned Gdk.DisplayDeviceHooks set_device_hooks (Gdk.DisplayDeviceHooks new_hooks);
 		public void set_double_click_distance (uint distance);
 		public void set_double_click_time (uint msec);
-		public unowned Gdk.DisplayPointerHooks set_pointer_hooks (Gdk.DisplayPointerHooks new_hooks);
 		public void store_clipboard (Gdk.Window clipboard_window, uint32 time_, Gdk.Atom[] targets);
 		public bool supports_clipboard_persistence ();
 		public bool supports_composite ();
@@ -150,18 +149,9 @@ namespace Gdk {
 		public bool supports_selection_notification ();
 		public bool supports_shapes ();
 		public void sync ();
-		public void warp_device (Gdk.Device device, Gdk.Screen screen, int x, int y);
-		public void warp_pointer (Gdk.Screen screen, int x, int y);
-		public virtual signal void closed (bool is_error);
+		public virtual signal void closed (bool p0);
 		public virtual signal void opened ();
 	}
-	[Compact]
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class DisplayDeviceHooks {
-		public weak GLib.Callback get_device_state;
-		public weak GLib.Callback window_at_device_position;
-		public weak GLib.Callback window_get_device_position;
-	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class DisplayManager : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -169,42 +159,25 @@ namespace Gdk {
 		public static unowned Gdk.DisplayManager @get ();
 		public unowned Gdk.Display get_default_display ();
 		public GLib.SList<weak Gdk.Display> list_displays ();
+		public unowned Gdk.Display open_display (string name);
 		public void set_default_display (Gdk.Display display);
 		public Gdk.Display default_display { get; set; }
-		public virtual signal void display_opened (Gdk.Display display);
-	}
-	[Compact]
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class DisplayPointerHooks {
-		public weak GLib.Callback get_pointer;
-		public weak GLib.Callback window_at_pointer;
-		public weak GLib.Callback window_get_pointer;
+		public virtual signal void display_opened (Gdk.Display p0);
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class DragContext : GLib.Object {
 		[CCode (has_construct_function = false)]
-		public DragContext ();
+		protected DragContext ();
 		public Gdk.DragAction get_actions ();
+		public unowned Gdk.Window get_dest_window ();
 		public unowned Gdk.Device get_device ();
+		public Gdk.DragProtocol get_protocol ();
 		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);
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Drawable : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Drawable ();
-		[NoWrapper]
-		public virtual unowned Cairo.Surface create_cairo_surface (int width, int height);
-		public virtual unowned Cairo.Region get_clip_region ();
-		public virtual unowned Cairo.Region get_visible_region ();
-		[NoWrapper]
-		public virtual unowned Cairo.Surface ref_cairo_surface ();
-		[NoWrapper]
-		public virtual void set_cairo_clip (Cairo.Context cr);
-	}
 	[Compact]
 	[CCode (copy_function = "gdk_event_copy", type_id = "GDK_TYPE_EVENT", cheader_filename = "gdk/gdk.h")]
 	public class Event {
@@ -219,7 +192,6 @@ namespace Gdk {
 		public Gdk.EventGrabBroken grab_broken;
 		public Gdk.EventKey key;
 		public Gdk.EventMotion motion;
-		public Gdk.EventNoExpose no_expose;
 		public Gdk.EventOwnerChange owner_change;
 		public Gdk.EventProperty property;
 		public Gdk.EventProximity proximity;
@@ -238,6 +210,7 @@ namespace Gdk {
 		public unowned Gdk.Device get_device ();
 		public bool get_root_coords (out double x_root, out double y_root);
 		public unowned Gdk.Screen get_screen ();
+		public unowned Gdk.Device get_source_device ();
 		public bool get_state (out Gdk.ModifierType state);
 		public uint32 get_time ();
 		public static void handler_set (owned Gdk.EventFunc func);
@@ -249,15 +222,7 @@ namespace Gdk {
 		public void send_clientmessage_toall ();
 		public void set_device (Gdk.Device device);
 		public void set_screen (Gdk.Screen screen);
-	}
-	[Compact]
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class KeyboardGrabInfo {
-		public weak Gdk.Window native_window;
-		public bool owner_events;
-		public ulong serial;
-		public uint32 time;
-		public weak Gdk.Window window;
+		public void set_source_device (Gdk.Device device);
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Keymap : GLib.Object {
@@ -279,36 +244,6 @@ namespace Gdk {
 		public virtual signal void keys_changed ();
 		public virtual signal void state_changed ();
 	}
-	[Compact]
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class MultipleClickInfo {
-		[CCode (array_length = false)]
-		public weak uint32[] button_click_time;
-		[CCode (array_length = false)]
-		public weak int[] button_number;
-		[CCode (array_length = false)]
-		public weak Gdk.Window[] button_window;
-		[CCode (array_length = false)]
-		public weak int[] button_x;
-		[CCode (array_length = false)]
-		public weak int[] button_y;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class PointerHooks {
-		public weak GLib.Callback get_pointer;
-		public weak GLib.Callback window_at_pointer;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class PointerWindowInfo {
-		public uint32 button;
-		public uint32 state;
-		public weak Gdk.Window toplevel_under_pointer;
-		public double toplevel_x;
-		public double toplevel_y;
-		public weak Gdk.Window window_under_pointer;
-	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Screen : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -375,7 +310,7 @@ namespace Gdk {
 		public Gdk.VisualType get_visual_type ();
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Window : Gdk.Drawable {
+	public class Window : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Window (Gdk.Window? parent, Gdk.WindowAttr attributes, int attributes_mask);
 		public void add_filter (Gdk.FilterFunc function);
@@ -397,8 +332,6 @@ namespace Gdk {
 		public bool ensure_native ();
 		public void flush ();
 		public void focus (uint32 timestamp);
-		public static unowned Gdk.Window foreign_new (Gdk.NativeWindow anid);
-		public static unowned Gdk.Window foreign_new_for_display (Gdk.Display display, Gdk.NativeWindow anid);
 		public void freeze_toplevel_updates_libgtk_only ();
 		public void freeze_updates ();
 		public void fullscreen ();
@@ -406,6 +339,7 @@ namespace Gdk {
 		public bool get_accept_focus ();
 		public unowned Cairo.Pattern get_background_pattern ();
 		public GLib.List<weak Gdk.Window> get_children ();
+		public unowned Cairo.Region get_clip_region ();
 		public bool get_composited ();
 		public unowned Gdk.Cursor? get_cursor ();
 		public bool get_decorations (out Gdk.WMDecoration decorations);
@@ -418,7 +352,7 @@ namespace Gdk {
 		public Gdk.EventMask get_events ();
 		public bool get_focus_on_map ();
 		public void get_frame_extents (out Gdk.Rectangle rect);
-		public void get_geometry (out int x, out int y, out int width, out int height, out int depth);
+		public void get_geometry (out int x, out int y, out int width, out int height);
 		public unowned Gdk.Window get_group ();
 		public int get_height ();
 		public bool get_modal_hint ();
@@ -429,12 +363,14 @@ namespace Gdk {
 		public void get_root_coords (int x, int y, int root_x, int root_y);
 		public void get_root_origin (out int x, out int y);
 		public unowned Gdk.Screen get_screen ();
+		public Gdk.EventMask get_source_events (Gdk.InputSource source);
 		public Gdk.WindowState get_state ();
 		public bool get_support_multidevice ();
 		public unowned Gdk.Window get_toplevel ();
 		public Gdk.WindowTypeHint get_type_hint ();
 		public unowned Cairo.Region get_update_area ();
 		public void get_user_data (void* data);
+		public unowned Cairo.Region get_visible_region ();
 		public unowned Gdk.Visual get_visual ();
 		public int get_width ();
 		public Gdk.WindowType get_window_type ();
@@ -450,8 +386,6 @@ namespace Gdk {
 		public bool is_shaped ();
 		public bool is_viewable ();
 		public bool is_visible ();
-		public static unowned Gdk.Window lookup (Gdk.NativeWindow anid);
-		public static unowned Gdk.Window lookup_for_display (Gdk.Display display, Gdk.NativeWindow anid);
 		public void lower ();
 		public void maximize ();
 		public void merge_child_input_shapes ();
@@ -496,6 +430,7 @@ namespace Gdk {
 		public void set_role (string role);
 		public void set_skip_pager_hint (bool skips_pager);
 		public void set_skip_taskbar_hint (bool skips_taskbar);
+		public void set_source_events (Gdk.InputSource source, Gdk.EventMask event_mask);
 		public void set_startup_id (string startup_id);
 		public bool set_static_gravities (bool use_static);
 		public void set_support_multidevice (bool support_multidevice);
@@ -515,10 +450,10 @@ namespace Gdk {
 		public void unstick ();
 		public void withdraw ();
 		public Gdk.Cursor cursor { get; set; }
-		public virtual signal Cairo.Surface create_surface (int p0, int p1);
-		public virtual signal void from_embedder (double p0, double p1, void* p2, void* p3);
-		public virtual signal unowned Gdk.Window pick_embedded_child (double p0, double p1);
-		public virtual signal void to_embedder (double p0, double p1, void* p2, void* p3);
+		public virtual signal Cairo.Surface create_surface (int width, int height);
+		public virtual signal void from_embedder (double embedder_x, double embedder_y, void* offscreen_x, void* offscreen_y);
+		public virtual signal unowned Gdk.Window pick_embedded_child (double x, double y);
+		public virtual signal void to_embedder (double offscreen_x, double offscreen_y, void* embedder_x, void* embedder_y);
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	[SimpleType]
@@ -540,17 +475,6 @@ namespace Gdk {
 		public static bool parse (string spec, out Gdk.Color color);
 		public string to_string ();
 	}
-	[CCode (type_id = "GDK_TYPE_DEVICE_AXIS", cheader_filename = "gdk/gdk.h")]
-	public struct DeviceAxis {
-		public Gdk.AxisUse use;
-		public double min;
-		public double max;
-	}
-	[CCode (type_id = "GDK_TYPE_DEVICE_KEY", cheader_filename = "gdk/gdk.h")]
-	public struct DeviceKey {
-		public uint keyval;
-		public Gdk.ModifierType modifiers;
-	}
 	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
 	public struct EventAny {
 		public Gdk.EventType type;
@@ -675,12 +599,6 @@ namespace Gdk {
 		public double y_root;
 	}
 	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
-	public struct EventNoExpose {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
 	public struct EventOwnerChange {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -795,7 +713,7 @@ namespace Gdk {
 		public static bool equal (void* p1, void* p2);
 		public void free ();
 		public static uint hash (void* p);
-		public static bool parse (string spec, Gdk.RGBA rgba);
+		public bool parse (string spec);
 		public unowned string to_string ();
 	}
 	[CCode (type_id = "GDK_TYPE_RECTANGLE", cheader_filename = "gdk/gdk.h")]
@@ -817,7 +735,7 @@ namespace Gdk {
 		public int y;
 		public int width;
 		public int height;
-		public Gdk.WindowClass wclass;
+		public Gdk.WindowWindowClass wclass;
 		public weak Gdk.Visual visual;
 		public Gdk.WindowType window_type;
 		public weak Gdk.Cursor cursor;
@@ -1025,7 +943,6 @@ namespace Gdk {
 		DROP_FINISHED,
 		CLIENT_EVENT,
 		VISIBILITY_NOTIFY,
-		NO_EXPOSE,
 		SCROLL,
 		WINDOW_STATE,
 		SETTING,
@@ -1204,11 +1121,6 @@ namespace Gdk {
 		NOREDIR,
 		TYPE_HINT
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
-	public enum WindowClass {
-		INPUT_OUTPUT,
-		INPUT_ONLY
-	}
 	[CCode (cprefix = "GDK_WINDOW_EDGE_", cheader_filename = "gdk/gdk.h")]
 	public enum WindowEdge {
 		NORTH_WEST,
@@ -1270,6 +1182,11 @@ namespace Gdk {
 		COMBO,
 		DND
 	}
+	[CCode (cprefix = "GDK_INPUT_", cheader_filename = "gdk/gdk.h")]
+	public enum WindowWindowClass {
+		OUTPUT,
+		ONLY
+	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public delegate void EventFunc (Gdk.Event event);
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1297,7 +1214,7 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void beep ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static Cairo.Context cairo_create (Gdk.Drawable drawable);
+	public static Cairo.Context cairo_create (Gdk.Window window);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool cairo_get_clip_rectangle (Cairo.Context cr, Gdk.Rectangle rect);
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1307,8 +1224,6 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static unowned Cairo.Region cairo_region_create_from_surface (Cairo.Surface surface);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void cairo_reset_clip (Cairo.Context cr, Gdk.Drawable drawable);
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void cairo_set_source_color (Cairo.Context cr, Gdk.Color color);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void cairo_set_source_pixbuf (Cairo.Context cr, Gdk.Pixbuf pixbuf, double pixbuf_x, double pixbuf_y);
@@ -1317,20 +1232,20 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void cairo_set_source_window (Cairo.Context cr, Gdk.Window window, double x, double y);
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static void disable_multidevice ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void drag_abort (Gdk.DragContext context, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static unowned Gdk.DragContext drag_begin (Gdk.Window window, GLib.List targets);
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static unowned Gdk.DragContext drag_begin_for_device (Gdk.Window window, Gdk.Device device, GLib.List targets);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void drag_drop (Gdk.DragContext context, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool drag_drop_succeeded (Gdk.DragContext context);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void drag_find_window (Gdk.DragContext context, Gdk.Window drag_window, int x_root, int y_root, out unowned Gdk.Window dest_window, Gdk.DragProtocol protocol);
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void drag_find_window_for_screen (Gdk.DragContext context, Gdk.Window drag_window, Gdk.Screen screen, int x_root, int y_root, out unowned Gdk.Window dest_window, Gdk.DragProtocol protocol);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static Gdk.NativeWindow drag_get_protocol (Gdk.NativeWindow xid, Gdk.DragProtocol protocol);
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static Gdk.NativeWindow drag_get_protocol_for_display (Gdk.Display display, Gdk.NativeWindow xid, Gdk.DragProtocol protocol);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static Gdk.Atom drag_get_selection (Gdk.DragContext context);
@@ -1341,9 +1256,7 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void drop_finish (Gdk.DragContext context, bool success, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void drop_reply (Gdk.DragContext context, bool ok, uint32 time_);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void enable_multidevice ();
+	public static void drop_reply (Gdk.DragContext context, bool accepted, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static int error_trap_pop ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1361,10 +1274,6 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void flush ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void free_compound_text (uchar[] ctext);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void free_text_list (string list);
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static unowned Gdk.Window get_default_root_window ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static unowned string get_display ();
@@ -1379,10 +1288,6 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool init_check ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static Gdk.GrabStatus keyboard_grab (Gdk.Window window, bool owner_events, uint32 time_);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void keyboard_ungrab (uint32 time_);
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void keyval_convert_case (uint symbol, uint lower, uint upper);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static uint keyval_from_name (string keyval_name);
@@ -1425,12 +1330,6 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static unowned Gdk.Pixbuf pixbuf_get_from_window (Gdk.Window window, int src_x, int src_y, int width, int height);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static Gdk.GrabStatus pointer_grab (Gdk.Window window, bool owner_events, Gdk.EventMask event_mask, Gdk.Window? confine_to, Gdk.Cursor? cursor, uint32 time_);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static bool pointer_is_grabbed ();
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void pointer_ungrab (uint32 time_);
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void pre_parse_libgtk_only ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void property_change (Gdk.Window window, Gdk.Atom property, Gdk.Atom type, int format, Gdk.PropMode mode, [CCode (array_length = false)] uchar[] data, int nelements);
@@ -1469,40 +1368,18 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void set_double_click_time (uint msec);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static unowned string set_locale ();
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static unowned Gdk.PointerHooks set_pointer_hooks (Gdk.PointerHooks new_hooks);
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void set_program_class (string program_class);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void set_show_events (bool show_events);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void set_sm_client_id (string sm_client_id);
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool setting_get (string name, GLib.Value value);
 	[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 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 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")]
-	public static int string_to_compound_text_for_display (Gdk.Display display, string str, Gdk.Atom encoding, int format, uchar[] ctext, int length);
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void test_render_sync (Gdk.Window window);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool test_simulate_button (Gdk.Window window, int x, int y, uint button, Gdk.ModifierType modifiers, Gdk.EventType button_pressrelease);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool test_simulate_key (Gdk.Window window, int x, int y, uint keyval, Gdk.ModifierType modifiers, Gdk.EventType key_pressrelease);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static int text_property_to_text_list (Gdk.Atom encoding, int format, uchar[] text, int length, string list);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static int text_property_to_text_list_for_display (Gdk.Display display, Gdk.Atom encoding, int format, uchar[] text, int length, string list);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static int text_property_to_utf8_list (Gdk.Atom encoding, int format, uchar[] text, int length, string list);
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static int text_property_to_utf8_list_for_display (Gdk.Display display, Gdk.Atom encoding, int format, uchar[] text, int length, string list);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static uint threads_add_idle (GLib.SourceFunc function);
@@ -1527,9 +1404,5 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static uint unicode_to_keyval (uint32 wc);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static bool utf8_to_compound_text (string str, Gdk.Atom encoding, int format, uchar[] ctext, int length);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static bool utf8_to_compound_text_for_display (Gdk.Display display, string str, Gdk.Atom encoding, int format, uchar[] ctext, int length);
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static unowned string utf8_to_string_target (string str);
 }
diff --git a/vapi/gdk-x11-3.0.vapi b/vapi/gdk-x11-3.0.vapi
index 1c3d3a1..697581d 100644
--- a/vapi/gdk-x11-3.0.vapi
+++ b/vapi/gdk-x11-3.0.vapi
@@ -3,39 +3,123 @@
 [CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")]
 namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11AppLaunchContext : Gdk.AppLaunchContext {
+		[CCode (has_construct_function = false)]
+		protected X11AppLaunchContext ();
+	}
+	[Compact]
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11AppLaunchContextClass {
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11Cursor : Gdk.Cursor {
+		[CCode (has_construct_function = false)]
+		protected X11Cursor ();
+		public static unowned Gdk.Cursor get_xcursor (Gdk.Cursor cursor);
+		public static unowned X.Display get_xdisplay (Gdk.Cursor cursor);
+	}
+	[Compact]
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11CursorClass {
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11Display : Gdk.Display {
+		[CCode (has_construct_function = false)]
+		protected X11Display ();
+		public static void broadcast_startup_message (Gdk.Display display, string message_type);
+		public static int error_trap_pop (Gdk.Display display);
+		public static void error_trap_pop_ignored (Gdk.Display display);
+		public static void error_trap_push (Gdk.Display display);
+		public static unowned string get_startup_notification_id (Gdk.Display display);
+		public static uint32 get_user_time (Gdk.Display display);
+		public static unowned X.Display get_xdisplay (Gdk.Display display);
+		public static void grab (Gdk.Display display);
+		public static void set_cursor_theme (Gdk.Display display, string theme, int size);
+		public static void set_startup_notification_id (Gdk.Display display, string startup_id);
+		public static int string_to_compound_text (Gdk.Display display, string str, out Gdk.Atom encoding, int format, uchar[] ctext, int length);
+		public static int text_property_to_text_list (Gdk.Display display, Gdk.Atom encoding, int format, uchar[] text, int length, string list);
+		public static void ungrab (Gdk.Display display);
+		public static bool utf8_to_compound_text (Gdk.Display display, string str, out Gdk.Atom encoding, int format, uchar[] ctext, int length);
+	}
+	[Compact]
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11DisplayClass {
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11DisplayManager : Gdk.DisplayManager {
+		[CCode (has_construct_function = false)]
+		protected X11DisplayManager ();
+	}
+	[Compact]
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11DisplayManagerClass {
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11DragContext : Gdk.DragContext {
+		[CCode (has_construct_function = false)]
+		protected X11DragContext ();
+	}
+	[Compact]
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11DragContextClass {
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11Keymap : Gdk.Keymap {
+		[CCode (has_construct_function = false)]
+		protected X11Keymap ();
+	}
+	[Compact]
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11KeymapClass {
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11Screen : Gdk.Screen {
+		[CCode (has_construct_function = false)]
+		protected X11Screen ();
+		public static X.ID get_monitor_output (Gdk.Screen screen, int monitor_num);
+		public static int get_screen_number (Gdk.Screen screen);
+		public static unowned string get_window_manager_name (Gdk.Screen screen);
+		public static unowned X.Screen get_xscreen (Gdk.Screen screen);
+		public static unowned Gdk.Visual lookup_visual (Gdk.Screen screen, uint32 xvisualid);
+		public static bool supports_net_wm_hint (Gdk.Screen screen, Gdk.Atom property);
+		public virtual signal void window_manager_changed ();
+	}
+	[Compact]
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11ScreenClass {
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11Visual : Gdk.Visual {
+		[CCode (has_construct_function = false)]
+		protected X11Visual ();
+		public static unowned Gdk.Visual get_xvisual (Gdk.Visual visual);
+	}
+	[Compact]
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11VisualClass {
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11Window : Gdk.Window {
+		[CCode (has_construct_function = false)]
+		protected X11Window ();
+		public static unowned Gdk.Window foreign_new_for_display (Gdk.Display display, X.Window window);
+		public static X.Window get_xid (Gdk.Window window);
+		public static unowned Gdk.Window lookup_for_display (Gdk.Display display, X.Window window);
+		public static void move_to_current_desktop (Gdk.Window window);
+		public static void set_user_time (Gdk.Window window, uint32 timestamp);
+	}
+	[Compact]
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public class X11WindowClass {
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static X.Atom x11_atom_to_xatom (Gdk.Atom atom);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static X.Atom x11_atom_to_xatom_for_display (Gdk.Display display, Gdk.Atom atom);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static unowned Gdk.Cursor x11_cursor_get_xcursor (Gdk.Cursor cursor);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static unowned X.Display x11_cursor_get_xdisplay (Gdk.Cursor cursor);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static void x11_display_broadcast_startup_message (Gdk.Display display, string message_type);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static int x11_display_error_trap_pop (Gdk.Display display);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static void x11_display_error_trap_pop_ignored (Gdk.Display display);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static void x11_display_error_trap_push (Gdk.Display display);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static unowned string x11_display_get_startup_notification_id (Gdk.Display display);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static uint32 x11_display_get_user_time (Gdk.Display display);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static unowned X.Display x11_display_get_xdisplay (Gdk.Display display);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static void x11_display_grab (Gdk.Display display);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static void x11_display_set_cursor_theme (Gdk.Display display, string theme, int size);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static void x11_display_set_startup_notification_id (Gdk.Display display, string startup_id);
+	public static void x11_free_compound_text (uchar[] ctext);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static void x11_display_ungrab (Gdk.Display display);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static unowned X.Display x11_drawable_get_xdisplay (Gdk.Drawable drawable);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static X.ID x11_drawable_get_xid (Gdk.Drawable drawable);
+	public static void x11_free_text_list (string list);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static X.Window x11_get_default_root_xwindow ();
 	[CCode (cheader_filename = "gdk/gdkx.h")]
@@ -56,40 +140,14 @@ namespace Gdk {
 	public static void x11_grab_server ();
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static unowned Gdk.Display x11_lookup_xdisplay (X.Display xdisplay);
-	[CCode (cname = "gdk_net_wm_supports", cheader_filename = "gdk/gdkx.h")]
-	public static bool x11_net_wm_supports (Gdk.Atom property);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void x11_register_standard_event_type (Gdk.Display display, int event_base, int n_events);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static X.ID x11_screen_get_monitor_output (Gdk.Screen screen, int monitor_num);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static int x11_screen_get_screen_number (Gdk.Screen screen);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static unowned string x11_screen_get_window_manager_name (Gdk.Screen screen);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static unowned X.Screen x11_screen_get_xscreen (Gdk.Screen screen);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static unowned Gdk.Visual x11_screen_lookup_visual (Gdk.Screen screen, uint32 xvisualid);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static bool x11_screen_supports_net_wm_hint (Gdk.Screen screen, Gdk.Atom property);
+	public static void x11_set_sm_client_id (string sm_client_id);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void x11_ungrab_server ();
-	[CCode (cname = "gdkx_visual_get", cheader_filename = "gdk/gdkx.h")]
-	public static unowned Gdk.Visual x11_visual_get (uint32 xvisualid);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static unowned Gdk.Visual x11_visual_get_xvisual (Gdk.Visual visual);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static unowned Gdk.Drawable x11_window_get_drawable_impl (Gdk.Window window);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static void x11_window_move_to_current_desktop (Gdk.Window window);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static void x11_window_set_user_time (Gdk.Window window, uint32 timestamp);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static Gdk.Atom x11_xatom_to_atom (X.Atom xatom);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static Gdk.Atom x11_xatom_to_atom_for_display (Gdk.Display display, X.Atom xatom);
-	[CCode (cname = "gdk_xid_table_lookup", cheader_filename = "gdk/gdkx.h")]
-	public static void* x11_xid_table_lookup (X.ID xid);
-	[CCode (cname = "gdk_xid_table_lookup_for_display", cheader_filename = "gdk/gdkx.h")]
-	public static void* x11_xid_table_lookup_for_display (Gdk.Display display, X.ID xid);
 }
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index a3ec805..9fead42 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -503,6 +503,54 @@ namespace Gtk {
 		public float yscale { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class AppChooserButton : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.CellEditable, Gtk.AppChooser {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public AppChooserButton (string content_type);
+		public void append_custom_item (string name, string label, GLib.Icon icon);
+		public void append_separator ();
+		public bool get_show_dialog_item ();
+		public void set_active_custom_item (string name);
+		public void set_show_dialog_item (bool setting);
+		public bool show_dialog_item { get; set construct; }
+		public virtual signal void custom_item_activated (string item_name);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class AppChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.AppChooser {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public AppChooserDialog (Gtk.Window parent, Gtk.DialogFlags flags, GLib.File file);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public AppChooserDialog.for_content_type (Gtk.Window parent, Gtk.DialogFlags flags, string content_type);
+		public unowned Gtk.Widget get_widget ();
+		[NoAccessorMethod]
+		public GLib.File gfile { owned get; construct; }
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class AppChooserWidget : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.AppChooser {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public AppChooserWidget (string content_type);
+		public unowned string get_default_text ();
+		public bool get_show_all ();
+		public bool get_show_default ();
+		public bool get_show_fallback ();
+		public bool get_show_other ();
+		public bool get_show_recommended ();
+		public void set_default_text (string text);
+		public void set_show_all (bool setting);
+		public void set_show_default (bool setting);
+		public void set_show_fallback (bool setting);
+		public void set_show_other (bool setting);
+		public void set_show_recommended (bool setting);
+		public string default_text { get; set; }
+		public bool show_all { get; set construct; }
+		public bool show_default { get; set construct; }
+		public bool show_fallback { get; set construct; }
+		public bool show_other { get; set construct; }
+		public bool show_recommended { get; set construct; }
+		public virtual signal void application_activated (GLib.AppInfo app_info);
+		public virtual signal void application_selected (GLib.AppInfo app_info);
+		public virtual signal void populate_popup (Gtk.Menu menu, GLib.AppInfo app_info);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Application : GLib.Application, GLib.ActionGroup {
 		[CCode (has_construct_function = false)]
 		public Application (string application_id, GLib.ApplicationFlags flags);
@@ -510,12 +558,6 @@ namespace Gtk {
 		public unowned GLib.List<weak Gtk.Window> get_windows ();
 		public void remove_window (Gtk.Window window);
 	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Arg {
-		public weak string name;
-		public GLib.Type type;
-	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Arrow : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -777,10 +819,110 @@ namespace Gtk {
 		public virtual signal void prev_year ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class CellArea : GLib.InitiallyUnowned, Gtk.CellLayout, Gtk.Buildable {
+		[CCode (has_construct_function = false)]
+		protected CellArea ();
+		public virtual bool activate (Gtk.CellAreaContext context, Gtk.Widget widget, Gdk.Rectangle cell_area, Gtk.CellRendererState flags, bool edit_only);
+		public bool activate_cell (Gtk.Widget widget, Gtk.CellRenderer renderer, Gdk.Event event, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
+		public virtual void add (Gtk.CellRenderer renderer);
+		public void add_focus_sibling (Gtk.CellRenderer renderer, Gtk.CellRenderer sibling);
+		public void add_with_properties (Gtk.CellRenderer renderer, ...);
+		public void attribute_connect (Gtk.CellRenderer renderer, string attribute, int column);
+		public void attribute_disconnect (Gtk.CellRenderer renderer, string attribute);
+		public void cell_get (Gtk.CellRenderer renderer, ...);
+		public void cell_get_property (Gtk.CellRenderer renderer, string property_name, GLib.Value value);
+		public void cell_get_valist (Gtk.CellRenderer renderer, string first_property_name, void* var_args);
+		public void cell_set (Gtk.CellRenderer renderer, ...);
+		public void cell_set_property (Gtk.CellRenderer renderer, string property_name, GLib.Value value);
+		public void cell_set_valist (Gtk.CellRenderer renderer, string first_property_name, void* var_args);
+		public virtual unowned Gtk.CellAreaContext copy_context (Gtk.CellAreaContext context);
+		public virtual unowned Gtk.CellAreaContext create_context ();
+		public virtual int event (Gtk.CellAreaContext context, Gtk.Widget widget, Gdk.Event event, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
+		[CCode (cname = "gtk_cell_area_class_find_cell_property")]
+		public class unowned GLib.ParamSpec find_cell_property (string property_name);
+		public virtual bool focus (Gtk.DirectionType direction);
+		public virtual void @foreach (Gtk.CellCallback callback, void* callback_data);
+		public virtual void foreach_alloc (Gtk.CellAreaContext context, Gtk.Widget widget, Gdk.Rectangle cell_area, Gdk.Rectangle background_area, Gtk.CellAllocCallback callback, void* callback_data);
+		public void get_cell_allocation (Gtk.CellAreaContext context, Gtk.Widget widget, Gtk.CellRenderer renderer, Gdk.Rectangle cell_area, Gdk.Rectangle allocation);
+		public unowned Gtk.CellRenderer get_cell_at_position (Gtk.CellAreaContext context, Gtk.Widget widget, Gdk.Rectangle cell_area, int x, int y, Gdk.Rectangle alloc_area);
+		[NoWrapper]
+		public virtual void get_cell_property (Gtk.CellRenderer renderer, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
+		public unowned string get_current_path_string ();
+		public unowned Gtk.CellEditable get_edit_widget ();
+		public unowned Gtk.CellRenderer get_edited_cell ();
+		public unowned Gtk.CellRenderer get_focus_cell ();
+		public unowned Gtk.CellRenderer get_focus_from_sibling (Gtk.CellRenderer renderer);
+		public unowned GLib.List get_focus_siblings (Gtk.CellRenderer renderer);
+		public virtual void get_preferred_height (Gtk.CellAreaContext context, Gtk.Widget widget, int minimum_height, int natural_height);
+		public virtual void get_preferred_height_for_width (Gtk.CellAreaContext context, Gtk.Widget widget, int width, int minimum_height, int natural_height);
+		public virtual void get_preferred_width (Gtk.CellAreaContext context, Gtk.Widget widget, int minimum_width, int natural_width);
+		public virtual void get_preferred_width_for_height (Gtk.CellAreaContext context, Gtk.Widget widget, int height, int minimum_width, int natural_width);
+		public virtual Gtk.SizeRequestMode get_request_mode ();
+		public unowned string get_style_detail ();
+		public bool has_renderer (Gtk.CellRenderer renderer);
+		public void inner_cell_area (Gtk.Widget widget, Gdk.Rectangle cell_area, Gdk.Rectangle inner_area);
+		[CCode (cname = "gtk_cell_area_class_install_cell_property")]
+		public class void install_cell_property (uint property_id, GLib.ParamSpec pspec);
+		public virtual bool is_activatable ();
+		public bool is_focus_sibling (Gtk.CellRenderer renderer, Gtk.CellRenderer sibling);
+		[CCode (cname = "gtk_cell_area_class_list_cell_properties")]
+		public class unowned GLib.ParamSpec list_cell_properties (uint n_properties);
+		public virtual void remove (Gtk.CellRenderer renderer);
+		public void remove_focus_sibling (Gtk.CellRenderer renderer, Gtk.CellRenderer sibling);
+		public virtual void render (Gtk.CellAreaContext context, Gtk.Widget widget, Cairo.Context cr, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags, bool paint_focus);
+		public void request_renderer (Gtk.CellRenderer renderer, Gtk.Orientation orientation, Gtk.Widget widget, int for_size, int minimum_size, int natural_size);
+		[NoWrapper]
+		public virtual void set_cell_property (Gtk.CellRenderer renderer, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
+		public void set_focus_cell (Gtk.CellRenderer renderer);
+		public void set_style_detail (string detail);
+		public void stop_editing (bool canceled);
+		public Gtk.CellEditable edit_widget { get; }
+		public Gtk.CellRenderer edited_cell { get; }
+		public Gtk.CellRenderer focus_cell { get; set; }
+		public virtual signal void add_editable (Gtk.CellRenderer p0, Gtk.CellEditable p1, Gdk.Rectangle p2, string p3);
+		[HasEmitter]
+		public virtual signal void apply_attributes (Gtk.TreeModel tree_model, Gtk.TreeIter iter, bool is_expander, bool is_expanded);
+		public virtual signal void focus_changed (Gtk.CellRenderer p0, string p1);
+		public virtual signal void remove_editable (Gtk.CellRenderer p0, Gtk.CellEditable p1);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class CellAreaBox : Gtk.CellArea, Gtk.CellLayout, Gtk.Buildable, Gtk.Orientable {
+		[CCode (type = "GtkCellArea*", has_construct_function = false)]
+		public CellAreaBox ();
+		public int get_spacing ();
+		public void set_spacing (int spacing);
+		public int spacing { get; set; }
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class CellAreaContext : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected CellAreaContext ();
+		public virtual void allocate (int width, int height);
+		public void get_allocation (int width, int height);
+		public unowned Gtk.CellArea get_area ();
+		public void get_preferred_height (int minimum_height, int natural_height);
+		public virtual void get_preferred_height_for_width (int width, int minimum_height, int natural_height);
+		public void get_preferred_width (int minimum_width, int natural_width);
+		public virtual void get_preferred_width_for_height (int height, int minimum_width, int natural_width);
+		public void push_preferred_height (int minimum_height, int natural_height);
+		public void push_preferred_width (int minimum_width, int natural_width);
+		public virtual void reset ();
+		public Gtk.CellArea area { get; construct; }
+		[NoAccessorMethod]
+		public int minimum_height { get; }
+		[NoAccessorMethod]
+		public int minimum_width { get; }
+		[NoAccessorMethod]
+		public int natural_height { get; }
+		[NoAccessorMethod]
+		public int natural_width { get; }
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public abstract class CellRenderer : GLib.InitiallyUnowned {
 		[CCode (has_construct_function = false)]
 		protected CellRenderer ();
 		public virtual bool activate (Gdk.Event event, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
+		public virtual void get_aligned_area (Gtk.Widget widget, Gtk.CellRendererState flags, Gdk.Rectangle cell_area, Gdk.Rectangle aligned_area);
 		public void get_alignment (float xalign, float yalign);
 		public void get_fixed_size (out int width, out int height);
 		public void get_padding (int xpad, int ypad);
@@ -794,6 +936,7 @@ namespace Gtk {
 		[NoWrapper]
 		public abstract void get_size (Gtk.Widget widget, Gdk.Rectangle? cell_area, out int x_offset, out int y_offset, out int width, out int height);
 		public bool get_visible ();
+		public bool is_activatable ();
 		public abstract void render (Cairo.Context cr, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
 		public void set_alignment (float xalign, float yalign);
 		public void set_fixed_size (int width, int height);
@@ -1046,18 +1189,22 @@ 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.CellLayout {
+	public class CellView : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CellView ();
-		public void get_desired_height_for_width_of_row (Gtk.TreePath path, int avail_size, int minimum_size, int natural_size);
-		public void get_desired_width_of_row (Gtk.TreePath path, int minimum_size, int natural_size);
 		public unowned Gtk.TreePath get_displayed_row ();
+		public bool get_draw_sensitive ();
+		public bool get_fit_model ();
 		public unowned Gtk.TreeModel get_model ();
 		public void set_background_color (Gdk.Color color);
 		public void set_background_rgba (Gdk.RGBA rgba);
 		public void set_displayed_row (Gtk.TreePath path);
+		public void set_draw_sensitive (bool draw_sensitive);
+		public void set_fit_model (bool fit_model);
 		public void set_model (Gtk.TreeModel? model);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public CellView.with_context (Gtk.CellArea area, Gtk.CellAreaContext context);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CellView.with_markup (string markup);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CellView.with_pixbuf (Gdk.Pixbuf pixbuf);
@@ -1071,6 +1218,12 @@ namespace Gtk {
 		public Gdk.RGBA background_rgba { get; set; }
 		[NoAccessorMethod]
 		public bool background_set { get; set; }
+		[NoAccessorMethod]
+		public Gtk.CellArea cell_area { owned get; construct; }
+		[NoAccessorMethod]
+		public Gtk.CellAreaContext cell_area_context { owned get; construct; }
+		public bool draw_sensitive { get; set; }
+		public bool fit_model { get; set; }
 		public Gtk.TreeModel model { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -1214,6 +1367,7 @@ namespace Gtk {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ComboBox ();
 		public int get_active ();
+		public unowned string get_active_id ();
 		public bool get_active_iter (out Gtk.TreeIter iter);
 		public bool get_add_tearoffs ();
 		public Gtk.SensitivityType get_button_sensitivity ();
@@ -1221,6 +1375,7 @@ namespace Gtk {
 		public int get_entry_text_column ();
 		public bool get_focus_on_click ();
 		public bool get_has_entry ();
+		public int get_id_column ();
 		public unowned Gtk.TreeModel get_model ();
 		public unowned Atk.Object get_popup_accessible ();
 		public bool get_popup_fixed_width ();
@@ -1230,12 +1385,14 @@ namespace Gtk {
 		public int get_wrap_width ();
 		public void popup_for_device (Gdk.Device device);
 		public void set_active (int index_);
+		public void set_active_id (string active_id);
 		public void set_active_iter (Gtk.TreeIter iter);
 		public void set_add_tearoffs (bool add_tearoffs);
 		public void set_button_sensitivity (Gtk.SensitivityType sensitivity);
 		public void set_column_span_column (int column_span);
 		public void set_entry_text_column (int text_column);
 		public void set_focus_on_click (bool focus_on_click);
+		public void set_id_column (int id_column);
 		public void set_model (Gtk.TreeModel? model);
 		public void set_popup_fixed_width (bool fixed);
 		public void set_row_separator_func (owned Gtk.TreeViewRowSeparatorFunc func);
@@ -1243,20 +1400,28 @@ namespace Gtk {
 		public void set_title (string title);
 		public void set_wrap_width (int width);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ComboBox.with_area (Gtk.CellArea area);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ComboBox.with_area_and_entry (Gtk.CellArea area);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ComboBox.with_entry ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ComboBox.with_model (Gtk.TreeModel model);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ComboBox.with_model_and_entry (Gtk.TreeModel model);
 		public int active { get; set; }
+		public string active_id { get; set; }
 		public bool add_tearoffs { get; set; }
 		public Gtk.SensitivityType button_sensitivity { get; set; }
+		[NoAccessorMethod]
+		public Gtk.CellArea cell_area { owned get; construct; }
 		public int column_span_column { get; set; }
 		public int entry_text_column { get; set; }
 		public bool focus_on_click { get; set; }
 		public bool has_entry { get; construct; }
 		[NoAccessorMethod]
 		public bool has_frame { get; set; }
+		public int id_column { get; set; }
 		public Gtk.TreeModel model { get; set; }
 		public bool popup_fixed_width { get; set; }
 		[NoAccessorMethod]
@@ -1276,9 +1441,12 @@ namespace Gtk {
 	public class ComboBoxText : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.CellEditable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ComboBoxText ();
+		public void append (string id, string text);
 		public void append_text (string text);
 		public unowned string get_active_text ();
+		public void insert (int position, string id, string text);
 		public void insert_text (int position, string text);
+		public void prepend (string id, string text);
 		public void prepend_text (string text);
 		public void remove (int position);
 		public void remove_all ();
@@ -1313,6 +1481,7 @@ namespace Gtk {
 		public unowned Gtk.Widget get_focus_child ();
 		public unowned Gtk.Adjustment get_focus_hadjustment ();
 		public unowned Gtk.Adjustment get_focus_vadjustment ();
+		public virtual unowned Gtk.WidgetPath get_path_for_child (Gtk.Widget child);
 		public Gtk.ResizeMode get_resize_mode ();
 		[CCode (cname = "gtk_container_class_handle_border_width")]
 		public class void handle_border_width ();
@@ -1343,6 +1512,17 @@ namespace Gtk {
 		public virtual signal void set_focus_child (Gtk.Widget? widget);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class CssProvider : GLib.Object, Gtk.StyleProvider {
+		[CCode (has_construct_function = false)]
+		public CssProvider ();
+		public static GLib.Quark error_quark ();
+		public static unowned Gtk.CssProvider get_default ();
+		public static unowned Gtk.CssProvider get_named (string name, string variant);
+		public bool load_from_data (string data, ssize_t length) throws GLib.Error;
+		public bool load_from_file (GLib.File file) throws GLib.Error;
+		public bool load_from_path (string path) throws GLib.Error;
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Dialog : Gtk.Window, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Dialog ();
@@ -1367,6 +1547,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class DrawingArea : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
+		public void* dummy;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public DrawingArea ();
 	}
@@ -1569,6 +1750,10 @@ namespace Gtk {
 		public void set_popup_set_width (bool popup_set_width);
 		public void set_popup_single_match (bool popup_single_match);
 		public void set_text_column (int column);
+		[CCode (has_construct_function = false)]
+		public EntryCompletion.with_area (Gtk.CellArea area);
+		[NoAccessorMethod]
+		public Gtk.CellArea cell_area { owned get; construct; }
 		public bool inline_completion { get; set; }
 		public bool inline_selection { get; set; }
 		public int minimum_key_length { get; set; }
@@ -1766,6 +1951,16 @@ namespace Gtk {
 		public float label_yalign { get; set; }
 		public Gtk.ShadowType shadow_type { get; set; }
 	}
+	[Compact]
+	[CCode (ref_function = "gtk_gradient_ref", unref_function = "gtk_gradient_unref", type_id = "GTK_TYPE_GRADIENT", cheader_filename = "gtk/gtk.h")]
+	public class Gradient {
+		public void add_color_stop (double offset, Gtk.SymbolicColor color);
+		[CCode (has_construct_function = false)]
+		public Gradient.linear (double x0, double y0, double x1, double y1);
+		[CCode (has_construct_function = false)]
+		public Gradient.radial (double x0, double y0, double radius0, double x1, double y1, double radius1);
+		public bool resolve (Gtk.StyleProperties props, out unowned Cairo.Pattern resolved_gradient);
+	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Grid : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -1801,11 +1996,6 @@ namespace Gtk {
 		public HPaned ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HRuler : Gtk.Ruler, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public HRuler ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HSV : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public HSV ();
@@ -1914,7 +2104,7 @@ namespace Gtk {
 		public unowned string get_filename ();
 		public Gdk.Pixbuf load_icon () throws GLib.Error;
 		public unowned Gdk.Pixbuf load_symbolic (Gdk.RGBA fg, Gdk.RGBA success_color, Gdk.RGBA warning_color, Gdk.RGBA 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 unowned Gdk.Pixbuf load_symbolic_for_context (Gtk.StyleContext context, bool was_symbolic) throws GLib.Error;
 		public void set_raw_coordinates (bool raw_coordinates);
 	}
 	[Compact]
@@ -1928,6 +2118,7 @@ namespace Gtk {
 		public IconSet.from_pixbuf (Gdk.Pixbuf pixbuf);
 		public void get_sizes (Gtk.IconSize[] sizes);
 		public unowned Gdk.Pixbuf render_icon (Gtk.Style style, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail);
+		public unowned Gdk.Pixbuf render_icon_pixbuf (Gtk.StyleContext context, Gtk.IconSize size);
 	}
 	[Compact]
 	[CCode (copy_function = "gtk_icon_source_copy", type_id = "GTK_TYPE_ICON_SOURCE", cheader_filename = "gtk/gtk.h")]
@@ -2040,7 +2231,11 @@ namespace Gtk {
 		public void unset_model_drag_dest ();
 		public void unset_model_drag_source ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public IconView.with_area (Gtk.CellArea area);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public IconView.with_model (Gtk.TreeModel model);
+		[NoAccessorMethod]
+		public Gtk.CellArea cell_area { owned get; construct; }
 		public int column_spacing { get; set; }
 		public int columns { get; set; }
 		public Gtk.Orientation item_orientation { get; set; }
@@ -2407,11 +2602,13 @@ namespace Gtk {
 		public MenuItem ();
 		public unowned string get_accel_path ();
 		public virtual unowned string get_label ();
+		public bool get_reserve_indicator ();
 		public bool get_right_justified ();
 		public unowned Gtk.Widget get_submenu ();
 		public bool get_use_underline ();
 		public void set_accel_path (string accel_path);
 		public virtual void set_label (string label);
+		public void set_reserve_indicator (bool reserve);
 		public void set_right_justified (bool right_justified);
 		public void set_submenu (Gtk.Widget submenu);
 		public void set_use_underline (bool setting);
@@ -2441,8 +2638,10 @@ namespace Gtk {
 		public void activate_item (Gtk.Widget menu_item, bool force_deactivate);
 		public void append ([CCode (type = "GtkWidget*")] Gtk.MenuItem child);
 		public void deselect ();
+		public unowned Gtk.Widget get_parent_shell ();
 		[NoWrapper]
 		public virtual int get_popup_delay ();
+		public unowned Gtk.Widget get_selected_item ();
 		public bool get_take_focus ();
 		public virtual void insert (Gtk.Widget child, int position);
 		public void prepend (Gtk.Widget child);
@@ -2600,6 +2799,29 @@ namespace Gtk {
 		public virtual signal void switch_page (Gtk.Widget page, uint page_num);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class NumerableIcon : GLib.EmblemedIcon, GLib.Icon {
+		[CCode (type = "GIcon*", has_construct_function = false)]
+		public NumerableIcon (GLib.Icon base_icon);
+		public unowned GLib.Icon get_background_gicon ();
+		public unowned string get_background_icon_name ();
+		public int get_count ();
+		public unowned string get_label ();
+		public unowned Gtk.StyleContext get_style_context ();
+		public void set_background_gicon (GLib.Icon icon);
+		public void set_background_icon_name (string icon_name);
+		public void set_count (int count);
+		public void set_label (string label);
+		public void set_style_context (Gtk.StyleContext style);
+		[CCode (type = "GIcon*", has_construct_function = false)]
+		public NumerableIcon.with_style_context (GLib.Icon base_icon, Gtk.StyleContext context);
+		[NoAccessorMethod]
+		public GLib.Icon background_icon { owned get; set; }
+		public string background_icon_name { get; set; }
+		public int count { get; set; }
+		public string label { get; set; }
+		public Gtk.StyleContext style_context { get; set; }
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class OffscreenWindow : Gtk.Window, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public OffscreenWindow ();
@@ -2992,7 +3214,6 @@ namespace Gtk {
 		public bool get_show_fill_level ();
 		public void get_slider_range (int slider_start, int slider_end);
 		public bool get_slider_size_fixed ();
-		public Gtk.UpdateType get_update_policy ();
 		public Gtk.SensitivityType get_upper_stepper_sensitivity ();
 		public double get_value ();
 		public void set_adjustment (Gtk.Adjustment adjustment);
@@ -3006,7 +3227,6 @@ namespace Gtk {
 		public void set_restrict_to_fill_level (bool restrict_to_fill_level);
 		public void set_show_fill_level (bool show_fill_level);
 		public void set_slider_size_fixed (bool size_fixed);
-		public void set_update_policy (Gtk.UpdateType policy);
 		public void set_upper_stepper_sensitivity (Gtk.SensitivityType sensitivity);
 		public void set_value (double value);
 		public Gtk.Adjustment adjustment { get; set construct; }
@@ -3015,7 +3235,6 @@ namespace Gtk {
 		public Gtk.SensitivityType lower_stepper_sensitivity { get; set; }
 		public bool restrict_to_fill_level { get; set; }
 		public bool show_fill_level { get; set; }
-		public Gtk.UpdateType update_policy { get; set; }
 		public Gtk.SensitivityType upper_stepper_sensitivity { get; set; }
 		public virtual signal void adjust_bounds (double new_value);
 		public virtual signal bool change_value (Gtk.ScrollType scroll, double new_value);
@@ -3199,39 +3418,6 @@ namespace Gtk {
 		public int natural_size;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Ruler : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Ruler (Gtk.Orientation orientation);
-		[NoWrapper]
-		public virtual void draw_pos (Cairo.Context cr);
-		[NoWrapper]
-		public virtual void draw_ticks (Cairo.Context cr);
-		public Gtk.MetricType get_metric ();
-		public void get_range (double lower, double upper, double position, double max_size);
-		public void set_metric (Gtk.MetricType metric);
-		public void set_range (double lower, double upper, double position, double max_size);
-		[NoAccessorMethod]
-		public double lower { get; set; }
-		[NoAccessorMethod]
-		public double max_size { get; set; }
-		public Gtk.MetricType metric { get; set; }
-		[NoAccessorMethod]
-		public double position { get; set; }
-		[NoAccessorMethod]
-		public double upper { get; set; }
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RulerMetric {
-		public weak string abbrev;
-		public weak string metric_name;
-		public double pixels_per_unit;
-		[CCode (array_length = false)]
-		public weak double[] ruler_scale;
-		[CCode (array_length = false)]
-		public weak int[] subdivide;
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Scale : Gtk.Range, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Scale (Gtk.Orientation orientation, Gtk.Adjustment adjustment);
@@ -3325,6 +3511,7 @@ namespace Gtk {
 		[CCode (array_length = false)]
 		public unowned uchar[] get_data ();
 		public Gdk.Atom get_data_type ();
+		public unowned uchar[] get_data_with_length (int length);
 		public unowned Gdk.Display get_display ();
 		public int get_format ();
 		public int get_length ();
@@ -3363,7 +3550,7 @@ namespace Gtk {
 		public bool draw { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Settings : GLib.Object {
+	public class Settings : GLib.Object, Gtk.StyleProvider {
 		[CCode (has_construct_function = false)]
 		protected Settings ();
 		public static unowned Gtk.Settings get_default ();
@@ -3515,10 +3702,6 @@ namespace Gtk {
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class SettingsPropertyValue {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class SettingsValue {
 		public weak string origin;
 		public GLib.Value value;
@@ -3767,16 +3950,116 @@ namespace Gtk {
 		public void @get (GLib.Type widget_type, ...);
 		public void get_style_property (GLib.Type widget_type, string property_name, out GLib.Value value);
 		public void get_valist (GLib.Type widget_type, string first_property_name, void* var_args);
+		public bool has_context ();
 		[NoWrapper]
 		public virtual void init_from_rc (Gtk.RcStyle rc_style);
 		public bool lookup_color (string color_name, out Gdk.Color color);
 		public unowned Gtk.IconSet lookup_icon_set (string stock_id);
 		public virtual unowned Gdk.Pixbuf render_icon (Gtk.IconSource source, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail);
 		public virtual void set_background (Gdk.Window window, Gtk.StateType state_type);
+		[NoAccessorMethod]
+		public Gtk.StyleContext context { owned get; construct; }
 		public virtual signal void realize ();
 		public virtual signal void unrealize ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class StyleContext : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public StyleContext ();
+		public void add_class (string class_name);
+		public void add_provider (Gtk.StyleProvider provider, uint priority);
+		public static void add_provider_for_screen (Gdk.Screen screen, Gtk.StyleProvider provider, uint priority);
+		public void add_region (string region_name, Gtk.RegionFlags flags);
+		public void cancel_animations (void* region_id);
+		public void @get (Gtk.StateFlags state);
+		public void get_background_color (Gtk.StateFlags state, Gdk.RGBA color);
+		public void get_border (Gtk.StateFlags state, Gtk.Border border);
+		public void get_border_color (Gtk.StateFlags state, Gdk.RGBA color);
+		public void get_color (Gtk.StateFlags state, Gdk.RGBA color);
+		public Gtk.TextDirection get_direction ();
+		public unowned Pango.FontDescription get_font (Gtk.StateFlags state);
+		public Gtk.JunctionSides get_junction_sides ();
+		public void get_margin (Gtk.StateFlags state, Gtk.Border margin);
+		public void get_padding (Gtk.StateFlags state, Gtk.Border padding);
+		public unowned Gtk.WidgetPath get_path ();
+		public void get_property (string property, Gtk.StateFlags state, GLib.Value value);
+		public unowned Gdk.Screen get_screen ();
+		public Gtk.StateFlags get_state ();
+		public void get_style ();
+		public void get_style_property (string property_name, GLib.Value value);
+		public void get_style_valist (void* args);
+		public void get_valist (Gtk.StateFlags state, void* args);
+		public bool has_class (string class_name);
+		public bool has_region (string region_name, Gtk.RegionFlags flags_return);
+		public void invalidate ();
+		public unowned GLib.List list_classes ();
+		public unowned GLib.List list_regions ();
+		public bool lookup_color (string color_name, Gdk.RGBA color);
+		public unowned Gtk.IconSet lookup_icon_set (string stock_id);
+		public void notify_state_change (Gdk.Window window, void* region_id, Gtk.StateType state, bool state_value);
+		public void pop_animatable_region ();
+		public void push_animatable_region (void* region_id);
+		public void remove_class (string class_name);
+		public void remove_provider (Gtk.StyleProvider provider);
+		public static void remove_provider_for_screen (Gdk.Screen screen, Gtk.StyleProvider provider);
+		public void remove_region (string region_name);
+		public static void reset_widgets (Gdk.Screen screen);
+		public void restore ();
+		public void save ();
+		public void scroll_animations (Gdk.Window window, int dx, int dy);
+		public void set_background (Gdk.Window window);
+		public void set_direction (Gtk.TextDirection direction);
+		public void set_junction_sides (Gtk.JunctionSides sides);
+		public void set_path (Gtk.WidgetPath path);
+		public void set_screen (Gdk.Screen screen);
+		public void set_state (Gtk.StateFlags flags);
+		public bool state_is_running (Gtk.StateType state, double progress);
+		public Gtk.TextDirection direction { get; set; }
+		public Gdk.Screen screen { get; set; }
+		public virtual signal void changed ();
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class StyleProperties : GLib.Object, Gtk.StyleProvider {
+		[CCode (has_construct_function = false)]
+		public StyleProperties ();
+		public void clear ();
+		public void @get (Gtk.StateFlags state);
+		public bool get_property (string property, Gtk.StateFlags state, GLib.Value value);
+		public void get_valist (Gtk.StateFlags state, void* args);
+		public unowned Gtk.SymbolicColor lookup_color (string name);
+		public static bool lookup_property (string property_name, Gtk.StylePropertyParser parse_func, out unowned GLib.ParamSpec pspec);
+		public void map_color (string name, Gtk.SymbolicColor color);
+		public void merge (Gtk.StyleProperties props_to_merge, bool replace);
+		public static void register_property (Gtk.StylePropertyParser parse_func, GLib.ParamSpec pspec);
+		public void @set (Gtk.StateFlags state);
+		public void set_property (string property, Gtk.StateFlags state, GLib.Value value);
+		public void set_valist (Gtk.StateFlags state, void* args);
+		public void unset_property (string property, Gtk.StateFlags state);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Switch : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Switch ();
+		public bool get_active ();
+		public void set_active (bool is_active);
+		public bool active { get; set; }
+	}
+	[Compact]
+	[CCode (ref_function = "gtk_symbolic_color_ref", unref_function = "gtk_symbolic_color_unref", type_id = "GTK_TYPE_SYMBOLIC_COLOR", cheader_filename = "gtk/gtk.h")]
+	public class SymbolicColor {
+		[CCode (has_construct_function = false)]
+		public SymbolicColor.alpha (Gtk.SymbolicColor color, double factor);
+		[CCode (has_construct_function = false)]
+		public SymbolicColor.literal (Gdk.RGBA color);
+		[CCode (has_construct_function = false)]
+		public SymbolicColor.mix (Gtk.SymbolicColor color1, Gtk.SymbolicColor color2, double factor);
+		[CCode (has_construct_function = false)]
+		public SymbolicColor.name (string name);
+		public bool resolve (Gtk.StyleProperties props, Gdk.RGBA resolved_color);
+		[CCode (has_construct_function = false)]
+		public SymbolicColor.shade (Gtk.SymbolicColor color, double factor);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Table : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Table (uint rows, uint columns, bool homogeneous);
@@ -3869,11 +4152,8 @@ namespace Gtk {
 		public Gdk.Color fg_color;
 		public uint inside_selection;
 		public uint is_text;
-		public uint pad1;
-		public uint pad2;
-		public uint pad3;
-		public uint pad4;
-		public void* padding1;
+		[CCode (array_length = false)]
+		public weak uint[] padding;
 		public int rise;
 		public uint strikethrough;
 		public uint underline;
@@ -3892,10 +4172,8 @@ namespace Gtk {
 		public Gtk.Justification justification;
 		public weak Pango.Language language;
 		public int left_margin;
-		public uint pad1;
-		public uint pad2;
-		public uint pad3;
-		public uint pad4;
+		[CCode (array_length = false)]
+		public weak uint[] padding;
 		public Gdk.Color pg_bg_color;
 		public int pixels_above_lines;
 		public int pixels_below_lines;
@@ -4013,6 +4291,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class TextChildAnchor : GLib.Object {
+		public void* segment;
 		[CCode (has_construct_function = false)]
 		public TextChildAnchor ();
 		public bool get_deleted ();
@@ -4020,6 +4299,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class TextMark : GLib.Object {
+		public void* segment;
 		[CCode (has_construct_function = false)]
 		public TextMark (string name, bool left_gravity);
 		public unowned Gtk.TextBuffer get_buffer ();
@@ -4163,7 +4443,7 @@ namespace Gtk {
 		public virtual signal bool event (GLib.Object event_object, Gdk.Event event, Gtk.TextIter iter);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TextTagTable : GLib.Object {
+	public class TextTagTable : GLib.Object, Gtk.Buildable {
 		[CCode (has_construct_function = false)]
 		public TextTagTable ();
 		public void add (Gtk.TextTag tag);
@@ -4274,6 +4554,67 @@ namespace Gtk {
 	public class ThemeEngine {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ThemingEngine : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected ThemingEngine ();
+		public void @get (Gtk.StateFlags state);
+		public void get_background_color (Gtk.StateFlags state, Gdk.RGBA color);
+		public void get_border (Gtk.StateFlags state, Gtk.Border border);
+		public void get_border_color (Gtk.StateFlags state, Gdk.RGBA color);
+		public void get_color (Gtk.StateFlags state, Gdk.RGBA color);
+		public Gtk.TextDirection get_direction ();
+		public unowned Pango.FontDescription get_font (Gtk.StateFlags state);
+		public Gtk.JunctionSides get_junction_sides ();
+		public void get_margin (Gtk.StateFlags state, Gtk.Border margin);
+		public void get_padding (Gtk.StateFlags state, Gtk.Border padding);
+		public unowned Gtk.WidgetPath get_path ();
+		public void get_property (string property, Gtk.StateFlags state, GLib.Value value);
+		public unowned Gdk.Screen get_screen ();
+		public Gtk.StateFlags get_state ();
+		public void get_style ();
+		public void get_style_property (string property_name, GLib.Value value);
+		public void get_style_valist (void* args);
+		public void get_valist (Gtk.StateFlags state, void* args);
+		public bool has_class (string style_class);
+		public bool has_region (string style_region, Gtk.RegionFlags flags);
+		public static unowned Gtk.ThemingEngine load (string name);
+		public bool lookup_color (string color_name, Gdk.RGBA color);
+		public static void register_property (string name_space, Gtk.StylePropertyParser parse_func, GLib.ParamSpec pspec);
+		[NoWrapper]
+		public virtual void render_activity (Cairo.Context cr, double x, double y, double width, double height);
+		[NoWrapper]
+		public virtual void render_arrow (Cairo.Context cr, double angle, double x, double y, double size);
+		[NoWrapper]
+		public virtual void render_background (Cairo.Context cr, double x, double y, double width, double height);
+		[NoWrapper]
+		public virtual void render_check (Cairo.Context cr, double x, double y, double width, double height);
+		[NoWrapper]
+		public virtual void render_expander (Cairo.Context cr, double x, double y, double width, double height);
+		[NoWrapper]
+		public virtual void render_extension (Cairo.Context cr, double x, double y, double width, double height, Gtk.PositionType gap_side);
+		[NoWrapper]
+		public virtual void render_focus (Cairo.Context cr, double x, double y, double width, double height);
+		[NoWrapper]
+		public virtual void render_frame (Cairo.Context cr, double x, double y, double width, double height);
+		[NoWrapper]
+		public virtual void render_frame_gap (Cairo.Context cr, double x, double y, double width, double height, Gtk.PositionType gap_side, double xy0_gap, double xy1_gap);
+		[NoWrapper]
+		public virtual void render_handle (Cairo.Context cr, double x, double y, double width, double height);
+		[NoWrapper]
+		public virtual unowned Gdk.Pixbuf render_icon_pixbuf (Gtk.IconSource source, Gtk.IconSize size);
+		[NoWrapper]
+		public virtual void render_layout (Cairo.Context cr, double x, double y, Pango.Layout layout);
+		[NoWrapper]
+		public virtual void render_line (Cairo.Context cr, double x0, double y0, double x1, double y1);
+		[NoWrapper]
+		public virtual void render_option (Cairo.Context cr, double x, double y, double width, double height);
+		[NoWrapper]
+		public virtual void render_slider (Cairo.Context cr, double x, double y, double width, double height, Gtk.Orientation orientation);
+		public bool state_is_running (Gtk.StateType state, double progress);
+		[NoAccessorMethod]
+		public string name { owned get; construct; }
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ToggleAction : Gtk.Action, Gtk.Buildable {
 		[CCode (has_construct_function = false)]
 		public ToggleAction (string name, string? label, string? tooltip, string? stock_id);
@@ -4664,6 +5005,7 @@ namespace Gtk {
 		public int insert_column (Gtk.TreeViewColumn column, int position);
 		public int insert_column_with_attributes (int position, string? title, Gtk.CellRenderer cell, ...);
 		public int insert_column_with_data_func (int position, string title, Gtk.CellRenderer cell, owned Gtk.TreeCellDataFunc func);
+		public bool is_blank_at_pos (int x, int y, out unowned Gtk.TreePath path, out unowned Gtk.TreeViewColumn column, int cell_x, int cell_y);
 		[CCode (cname = "gtk_tree_view_row_expanded")]
 		public bool is_row_expanded (Gtk.TreePath path);
 		public bool is_rubber_banding_active ();
@@ -4743,12 +5085,13 @@ namespace Gtk {
 	public class TreeViewColumn : GLib.InitiallyUnowned, Gtk.CellLayout, Gtk.Buildable {
 		[CCode (has_construct_function = false)]
 		public TreeViewColumn ();
-		public bool cell_get_position (Gtk.CellRenderer cell_renderer, int start_pos, int width);
+		public bool cell_get_position (Gtk.CellRenderer cell_renderer, int x_offset, int width);
 		public void cell_get_size (out Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height);
 		public bool cell_is_visible ();
 		public void cell_set_cell_data (Gtk.TreeModel tree_model, Gtk.TreeIter iter, bool is_expander, bool is_expanded);
 		public void focus_cell (Gtk.CellRenderer cell);
 		public float get_alignment ();
+		public unowned Gtk.Widget get_button ();
 		public bool get_clickable ();
 		public bool get_expand ();
 		public int get_fixed_width ();
@@ -4785,8 +5128,12 @@ namespace Gtk {
 		public void set_visible (bool visible);
 		public void set_widget (Gtk.Widget widget);
 		[CCode (has_construct_function = false)]
+		public TreeViewColumn.with_area (Gtk.CellArea area);
+		[CCode (has_construct_function = false)]
 		public TreeViewColumn.with_attributes (string? title, Gtk.CellRenderer cell, ...);
 		public float alignment { get; set; }
+		[NoAccessorMethod]
+		public Gtk.CellArea cell_area { owned get; construct; }
 		public bool clickable { get; set; }
 		public bool expand { get; set; }
 		public int fixed_width { get; set; }
@@ -4851,11 +5198,6 @@ namespace Gtk {
 		public VPaned ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class VRuler : Gtk.Ruler, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public VRuler ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class VScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public VScale (Gtk.Adjustment? adjustment);
@@ -4890,6 +5232,8 @@ namespace Gtk {
 	public class VolumeButton : Gtk.ScaleButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public VolumeButton ();
+		[NoAccessorMethod]
+		public bool use_symbolic { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Widget : GLib.InitiallyUnowned, Atk.Implementor, Gtk.Buildable {
@@ -4901,7 +5245,7 @@ namespace Gtk {
 		public void add_events (int events);
 		public void add_mnemonic_label (Gtk.Widget label);
 		[NoWrapper]
-		public virtual void adjust_size_allocation (Gtk.Orientation orientation, int natural_size, int allocated_pos, int allocated_size);
+		public virtual void adjust_size_allocation (Gtk.Orientation orientation, int minimum_size, int natural_size, int allocated_pos, int allocated_size);
 		[NoWrapper]
 		public virtual void adjust_size_request (Gtk.Orientation orientation, int minimum_size, int natural_size);
 		public bool child_focus (Gtk.DirectionType direction);
@@ -4931,12 +5275,12 @@ namespace Gtk {
 		public unowned string get_composite_name ();
 		public static Gtk.TextDirection get_default_direction ();
 		public static unowned Gtk.Style get_default_style ();
+		public bool get_device_enabled (Gdk.Device device);
 		public Gdk.EventMask get_device_events (Gdk.Device device);
 		public Gtk.TextDirection get_direction ();
 		public unowned Gdk.Display get_display ();
 		public bool get_double_buffered ();
 		public int get_events ();
-		public Gdk.ExtensionMode get_extension_events ();
 		public Gtk.Align get_halign ();
 		public bool get_has_tooltip ();
 		public bool get_has_window ();
@@ -4952,6 +5296,7 @@ namespace Gtk {
 		public unowned Pango.Context get_pango_context ();
 		public unowned Gtk.Widget get_parent ();
 		public unowned Gdk.Window get_parent_window ();
+		public unowned Gtk.WidgetPath get_path ();
 		public void get_pointer (out int x, out int y);
 		public virtual void get_preferred_height (int minimum_height, int natural_height);
 		public virtual void get_preferred_height_for_width (int width, int minimum_height, int natural_height);
@@ -4968,7 +5313,9 @@ namespace Gtk {
 		public unowned Gtk.Settings get_settings ();
 		public void get_size_request (out int width, out int height);
 		public Gtk.StateType get_state ();
+		public Gtk.StateFlags get_state_flags ();
 		public unowned Gtk.Style get_style ();
+		public unowned Gtk.StyleContext get_style_context ();
 		public bool get_support_multidevice ();
 		public unowned string get_tooltip_markup ();
 		public unowned string get_tooltip_text ();
@@ -5005,8 +5352,12 @@ namespace Gtk {
 		public void modify_fg (Gtk.StateType state, Gdk.Color? color);
 		public void modify_font (Pango.FontDescription? font_desc);
 		public void modify_style (Gtk.RcStyle style);
-		public void modify_symbolic_color (string name, Gdk.Color color);
 		public void modify_text (Gtk.StateType state, Gdk.Color? color);
+		public void override_background_color (Gtk.StateFlags state, Gdk.RGBA color);
+		public void override_color (Gtk.StateFlags state, Gdk.RGBA color);
+		public void override_cursor (Gdk.RGBA cursor, Gdk.RGBA secondary_cursor);
+		public void override_font (Pango.FontDescription font_desc);
+		public void override_symbolic_color (string name, Gdk.RGBA color);
 		public void path (out uint path_length, out unowned string path, out unowned string path_reversed);
 		public static void pop_composite_child ();
 		public static void push_composite_child ();
@@ -5020,9 +5371,10 @@ namespace Gtk {
 		public bool remove_accelerator (Gtk.AccelGroup accel_group, uint accel_key, Gdk.ModifierType accel_mods);
 		public void remove_mnemonic_label (Gtk.Widget label);
 		public Gdk.Pixbuf render_icon (string stock_id, Gtk.IconSize size, string? detail);
+		public unowned Gdk.Pixbuf render_icon_pixbuf (string stock_id, Gtk.IconSize size);
 		public void reparent (Gtk.Widget new_parent);
 		public void reset_rc_styles ();
-		public void reset_shapes ();
+		public void reset_style ();
 		public int send_expose (Gdk.Event event);
 		public bool send_focus_change (Gdk.Event event);
 		public void set_accel_path (string accel_path, Gtk.AccelGroup accel_group);
@@ -5033,11 +5385,11 @@ namespace Gtk {
 		public void set_child_visible (bool is_visible);
 		public void set_composite_name (string name);
 		public static void set_default_direction (Gtk.TextDirection dir);
+		public void set_device_enabled (Gdk.Device device, bool enabled);
 		public void set_device_events (Gdk.Device device, Gdk.EventMask events);
 		public void set_direction (Gtk.TextDirection dir);
 		public void set_double_buffered (bool double_buffered);
 		public void set_events (int events);
-		public void set_extension_events (Gdk.ExtensionMode mode);
 		public void set_halign (Gtk.Align align);
 		public void set_has_tooltip (bool has_tooltip);
 		public void set_has_window (bool has_window);
@@ -5057,6 +5409,7 @@ namespace Gtk {
 		public void set_sensitive (bool sensitive);
 		public void set_size_request (int width, int height);
 		public void set_state (Gtk.StateType state);
+		public void set_state_flags (Gtk.StateFlags flags, bool clear);
 		public void set_style (Gtk.Style? style);
 		public void set_support_multidevice (bool support_multidevice);
 		public void set_tooltip_markup (string markup);
@@ -5079,6 +5432,7 @@ namespace Gtk {
 		public bool translate_coordinates (Gtk.Widget dest_widget, int src_x, int src_y, out int dest_x, out int dest_y);
 		public void trigger_tooltip_query ();
 		public void unparent ();
+		public void unset_state_flags (Gtk.StateFlags flags);
 		public bool app_paintable { get; set; }
 		public bool can_default { get; set; }
 		[NoAccessorMethod]
@@ -5089,7 +5443,6 @@ namespace Gtk {
 		public Gdk.EventMask events { get; set; }
 		[NoAccessorMethod]
 		public bool expand { get; set; }
-		public Gdk.ExtensionMode extension_events { get; set; }
 		public Gtk.Align halign { get; set; }
 		[NoAccessorMethod]
 		public bool has_default { get; set; }
@@ -5144,7 +5497,7 @@ namespace Gtk {
 		public virtual signal void drag_data_received (Gdk.DragContext context, int x, int y, Gtk.SelectionData selection_data, uint info, uint time_);
 		public virtual signal bool drag_drop (Gdk.DragContext context, int x, int y, uint time_);
 		public virtual signal void drag_end (Gdk.DragContext context);
-		public virtual signal bool drag_failed (Gdk.DragContext p0, Gtk.DragResult p1);
+		public virtual signal bool drag_failed (Gdk.DragContext context, Gtk.DragResult result);
 		public virtual signal void drag_leave (Gdk.DragContext context, uint time_);
 		public virtual signal bool drag_motion (Gdk.DragContext context, int x, int y, uint time_);
 		[HasEmitter]
@@ -5175,7 +5528,6 @@ namespace Gtk {
 		public virtual signal bool mnemonic_activate (bool group_cycling);
 		public virtual signal bool motion_notify_event (Gdk.EventMotion event);
 		public virtual signal void move_focus (Gtk.DirectionType direction);
-		public virtual signal bool no_expose_event (Gdk.EventNoExpose event);
 		public virtual signal void parent_set (Gtk.Widget? previous_parent);
 		public virtual signal bool popup_menu ();
 		public virtual signal bool property_notify_event (Gdk.EventProperty event);
@@ -5196,10 +5548,10 @@ namespace Gtk {
 		public virtual signal bool show_help (Gtk.WidgetHelpType help_type);
 		[HasEmitter]
 		public virtual signal void size_allocate (Gdk.Rectangle allocation);
-		[HasEmitter]
-		public virtual signal void size_request (out Gtk.Requisition requisition);
 		public virtual signal void state_changed (Gtk.StateType previous_state);
+		public virtual signal void state_flags_changed (Gtk.StateFlags previous_state_flags);
 		public virtual signal void style_set (Gtk.Style? previous_style);
+		public virtual signal void style_updated ();
 		[HasEmitter]
 		public virtual signal void unmap ();
 		public virtual signal bool unmap_event (Gdk.Event event);
@@ -5217,6 +5569,37 @@ namespace Gtk {
 		public uint valign;
 		public int width;
 	}
+	[Compact]
+	[CCode (copy_function = "gtk_widget_path_copy", type_id = "GTK_TYPE_WIDGET_PATH", cheader_filename = "gtk/gtk.h")]
+	public class WidgetPath {
+		[CCode (has_construct_function = false)]
+		public WidgetPath ();
+		public int append_type (GLib.Type type);
+		public unowned Gtk.WidgetPath copy ();
+		public GLib.Type get_object_type ();
+		public bool has_parent (GLib.Type type);
+		public bool is_type (GLib.Type type);
+		public void iter_add_class (int pos, string name);
+		public void iter_add_region (int pos, string name, Gtk.RegionFlags flags);
+		public void iter_clear_classes (int pos);
+		public void iter_clear_regions (int pos);
+		public unowned string iter_get_name (int pos);
+		public GLib.Type iter_get_object_type (int pos);
+		public bool iter_has_class (int pos, string name);
+		public bool iter_has_name (int pos, string name);
+		public bool iter_has_qclass (int pos, GLib.Quark qname);
+		public bool iter_has_qname (int pos, GLib.Quark qname);
+		public bool iter_has_qregion (int pos, GLib.Quark qname, Gtk.RegionFlags flags);
+		public bool iter_has_region (int pos, string name, Gtk.RegionFlags flags);
+		public unowned GLib.SList iter_list_classes (int pos);
+		public unowned GLib.SList iter_list_regions (int pos);
+		public void iter_remove_class (int pos, string name);
+		public void iter_remove_region (int pos, string name);
+		public void iter_set_name (int pos, string name);
+		public void iter_set_object_type (int pos, GLib.Type type);
+		public int length ();
+		public void prepend_type (GLib.Type type);
+	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Window : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -5225,7 +5608,6 @@ namespace Gtk {
 		public bool activate_focus ();
 		public bool activate_key (Gdk.EventKey event);
 		public void add_accel_group (Gtk.AccelGroup accel_group);
-		public void add_embedded_xid (Gdk.NativeWindow xid);
 		public void add_mnemonic (uint keyval, Gtk.Widget target);
 		public void begin_move_drag (int button, int root_x, int root_y, uint32 timestamp);
 		public void begin_resize_drag (Gdk.WindowEdge edge, int button, int root_x, int root_y, uint32 timestamp);
@@ -5242,10 +5624,8 @@ namespace Gtk {
 		public bool get_destroy_with_parent ();
 		public unowned Gtk.Widget get_focus ();
 		public bool get_focus_on_map ();
-		public void get_frame_dimensions (int left, int top, int right, int bottom);
 		public Gdk.Gravity get_gravity ();
 		public unowned Gtk.WindowGroup get_group ();
-		public bool get_has_frame ();
 		public bool get_has_resize_grip ();
 		public unowned Gdk.Pixbuf get_icon ();
 		public GLib.List<weak Gdk.Pixbuf> get_icon_list ();
@@ -5278,7 +5658,6 @@ namespace Gtk {
 		public void present_with_time (uint32 timestamp);
 		public bool propagate_key_event (Gdk.EventKey event);
 		public void remove_accel_group (Gtk.AccelGroup accel_group);
-		public void remove_embedded_xid (Gdk.NativeWindow xid);
 		public void remove_mnemonic (uint keyval, Gtk.Widget target);
 		public void reshow_with_initial_size ();
 		public void resize (int width, int height);
@@ -5298,11 +5677,10 @@ namespace Gtk {
 		public void set_deletable (bool setting);
 		public void set_destroy_with_parent (bool setting);
 		public void set_focus_on_map (bool setting);
-		public void set_frame_dimensions (int left, int top, int right, int bottom);
 		public void set_geometry_hints (Gtk.Widget geometry_widget, Gdk.Geometry geometry, Gdk.WindowHints geom_mask);
 		public void set_gravity (Gdk.Gravity gravity);
-		public void set_has_frame (bool setting);
 		public void set_has_resize_grip (bool value);
+		public void set_has_user_ref_count (bool setting);
 		public void set_icon (Gdk.Pixbuf icon);
 		public bool set_icon_from_file (string filename) throws GLib.Error;
 		public void set_icon_list (GLib.List<Gdk.Pixbuf> list);
@@ -5368,7 +5746,6 @@ namespace Gtk {
 		public Gtk.WindowPosition window_position { get; set; }
 		public virtual signal void default_activated ();
 		public virtual signal void focus_activated ();
-		public virtual signal bool frame_event (Gdk.Event event);
 		public virtual signal void keys_changed ();
 		[HasEmitter]
 		public virtual signal void set_focus (Gtk.Widget? focus);
@@ -5401,6 +5778,13 @@ namespace Gtk {
 		public bool use_action_appearance { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public interface AppChooser : Gtk.Widget {
+		public unowned GLib.AppInfo get_app_info ();
+		public unowned string get_content_type ();
+		public void refresh ();
+		public string content_type { get; construct; }
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public interface Buildable : GLib.Object {
 		public abstract void add_child (Gtk.Builder builder, GLib.Object child, string? type);
 		public abstract unowned GLib.Object construct_child (Gtk.Builder builder, string name);
@@ -5427,6 +5811,7 @@ namespace Gtk {
 		public abstract void add_attribute (Gtk.CellRenderer cell, string attribute, int column);
 		public abstract void clear ();
 		public abstract void clear_attributes (Gtk.CellRenderer cell);
+		public abstract unowned Gtk.CellArea get_area ();
 		public abstract GLib.List<weak Gtk.CellRenderer> get_cells ();
 		public abstract void pack_end (Gtk.CellRenderer cell, bool expand);
 		public abstract void pack_start (Gtk.CellRenderer cell, bool expand);
@@ -5618,6 +6003,12 @@ namespace Gtk {
 		public Gtk.ScrollablePolicy vscroll_policy { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public interface StyleProvider {
+		public abstract unowned Gtk.IconFactory get_icon_factory (Gtk.WidgetPath path);
+		public abstract unowned Gtk.StyleProperties get_style (Gtk.WidgetPath path);
+		public abstract bool get_style_property (Gtk.WidgetPath path, Gtk.StateFlags state, GLib.ParamSpec pspec, GLib.Value value);
+	}
+	[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 ();
@@ -5661,6 +6052,7 @@ namespace Gtk {
 		public abstract bool iter_next (ref Gtk.TreeIter iter);
 		public abstract bool iter_nth_child (out Gtk.TreeIter iter, Gtk.TreeIter? parent, int n);
 		public abstract bool iter_parent (out Gtk.TreeIter iter, Gtk.TreeIter child);
+		public abstract bool iter_previous (Gtk.TreeIter iter);
 		public abstract void ref_node (Gtk.TreeIter iter);
 		public abstract void unref_node (Gtk.TreeIter iter);
 		[HasEmitter]
@@ -5933,6 +6325,13 @@ namespace Gtk {
 		SHRINK,
 		FILL
 	}
+	[CCode (cprefix = "GTK_BORDER_STYLE_", cheader_filename = "gtk/gtk.h")]
+	public enum BorderStyle {
+		NONE,
+		SOLID,
+		INSET,
+		OUTSET
+	}
 	[CCode (cprefix = "GTK_BUTTONBOX_", cheader_filename = "gtk/gtk.h")]
 	public enum ButtonBoxStyle {
 		SPREAD,
@@ -5986,6 +6385,10 @@ namespace Gtk {
 		TOP_RIGHT,
 		BOTTOM_RIGHT
 	}
+	[CCode (cprefix = "GTK_CSS_PROVIDER_ERROR_", cheader_filename = "gtk/gtk.h")]
+	public enum CssProviderError {
+		FAILED
+	}
 	[CCode (cprefix = "GTK_DEBUG_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum DebugFlag {
@@ -6141,6 +6544,19 @@ namespace Gtk {
 		ICON_NAME,
 		GICON
 	}
+	[CCode (cprefix = "GTK_JUNCTION_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum JunctionSides {
+		NONE,
+		CORNER_TOPLEFT,
+		CORNER_TOPRIGHT,
+		CORNER_BOTTOMLEFT,
+		CORNER_BOTTOMRIGHT,
+		TOP,
+		BOTTOM,
+		LEFT,
+		RIGHT
+	}
 	[CCode (cprefix = "GTK_JUSTIFY_", cheader_filename = "gtk/gtk.h")]
 	public enum Justification {
 		LEFT,
@@ -6175,12 +6591,6 @@ namespace Gtk {
 		ERROR,
 		OTHER
 	}
-	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
-	public enum MetricType {
-		PIXELS,
-		INCHES,
-		CENTIMETERS
-	}
 	[CCode (cprefix = "GTK_MOVEMENT_", cheader_filename = "gtk/gtk.h")]
 	public enum MovementStep {
 		LOGICAL_POSITIONS,
@@ -6404,6 +6814,15 @@ namespace Gtk {
 		LRU,
 		CUSTOM
 	}
+	[CCode (cprefix = "GTK_REGION_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum RegionFlags {
+		EVEN,
+		ODD,
+		FIRST,
+		LAST,
+		SORTED
+	}
 	[CCode (cprefix = "GTK_RELIEF_", cheader_filename = "gtk/gtk.h")]
 	public enum ReliefStyle {
 		NORMAL,
@@ -6516,13 +6935,26 @@ namespace Gtk {
 		END,
 		USER_DEFINED
 	}
+	[CCode (cprefix = "GTK_STATE_FLAG_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum StateFlags {
+		NORMAL,
+		ACTIVE,
+		PRELIGHT,
+		SELECTED,
+		INSENSITIVE,
+		INCONSISTENT,
+		FOCUSED
+	}
 	[CCode (cprefix = "GTK_STATE_", cheader_filename = "gtk/gtk.h")]
 	public enum StateType {
 		NORMAL,
 		ACTIVE,
 		PRELIGHT,
 		SELECTED,
-		INSENSITIVE
+		INSENSITIVE,
+		INCONSISTENT,
+		FOCUSED
 	}
 	[CCode (cprefix = "GTK_TARGET_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
@@ -6627,12 +7059,6 @@ namespace Gtk {
 		INCH,
 		MM
 	}
-	[CCode (cprefix = "GTK_UPDATE_", cheader_filename = "gtk/gtk.h")]
-	public enum UpdateType {
-		CONTINUOUS,
-		DISCONTINUOUS,
-		DELAYED
-	}
 	[CCode (cprefix = "GTK_WIDGET_HELP_", cheader_filename = "gtk/gtk.h")]
 	public enum WidgetHelpType {
 		TOOLTIP,
@@ -6686,8 +7112,10 @@ namespace Gtk {
 	public delegate string CalendarDetailFunc (Gtk.Calendar calendar, uint year, uint month, uint day);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void Callback (Gtk.Widget widget);
-	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
-	public delegate void CallbackMarshal (GLib.Object object, void* data, Gtk.Arg[] args);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public delegate bool CellAllocCallback (Gtk.CellRenderer renderer, Gdk.Rectangle cell_area, Gdk.Rectangle cell_background);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public delegate bool CellCallback (Gtk.CellRenderer renderer);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void CellLayoutDataFunc (Gtk.CellLayout cell_layout, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter);
 	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
@@ -6715,8 +7143,6 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate bool FileFilterFunc (Gtk.FileFilterInfo filter_info);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public delegate bool Function ();
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void IconViewForeachFunc (Gtk.IconView icon_view, Gtk.TreePath path);
 	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
 	public delegate int KeySnoopFunc (Gtk.Widget grab_widget, Gdk.EventKey event, void* func_data);
@@ -6740,6 +7166,8 @@ namespace Gtk {
 	public delegate bool RecentFilterFunc (Gtk.RecentFilterInfo filter_info);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate int RecentSortFunc (Gtk.RecentInfo a, Gtk.RecentInfo b);
+	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+	public delegate bool StylePropertyParser (string str, GLib.Value value, GLib.Error error);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate bool TextBufferDeserializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter iter, uchar data, size_t length, bool create_tags, GLib.Error error);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6777,8 +7205,6 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void TreeViewSearchPositionFunc (Gtk.TreeView tree_view, Gtk.Widget search_dialog);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public delegate void WindowKeysForeachFunc (Gtk.Window window, uint keyval, Gdk.ModifierType modifiers, bool is_mnemonic);
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int BINARY_AGE;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int INPUT_ERROR;
@@ -7186,6 +7612,122 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_ZOOM_OUT;
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_ACCELERATOR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_BACKGROUND;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_BUTTON;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_CALENDAR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_CELL;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_CHECK;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_DEFAULT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_DND;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_DOCK;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_ENTRY;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_ERROR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_EXPANDER;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_FRAME;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_GRIP;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_HEADER;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_HIGHLIGHT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_HORIZONTAL;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_INFO;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_MARK;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_MENU;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_MENUBAR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_MENUITEM;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_NOTEBOOK;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_PANE_SEPARATOR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_PROGRESSBAR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_QUESTION;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_RADIO;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_RUBBERBAND;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_SCALE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_SCROLLBAR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_SLIDER;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_SPINBUTTON;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_SPINNER;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_TOOLBAR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_TOOLTIP;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_TROUGH;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_VERTICAL;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_VIEW;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_WARNING;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_PROPERTY_BACKGROUND_COLOR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_PROPERTY_BACKGROUND_IMAGE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_PROPERTY_BORDER_COLOR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_PROPERTY_BORDER_RADIUS;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_PROPERTY_BORDER_STYLE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_PROPERTY_BORDER_WIDTH;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_PROPERTY_COLOR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_PROPERTY_FONT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_PROPERTY_MARGIN;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_PROPERTY_PADDING;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const int STYLE_PROVIDER_PRIORITY_APPLICATION;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const int STYLE_PROVIDER_PRIORITY_FALLBACK;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const int STYLE_PROVIDER_PRIORITY_SETTINGS;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const int STYLE_PROVIDER_PRIORITY_THEME;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const int STYLE_PROVIDER_PRIORITY_USER;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_REGION_COLUMN;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_REGION_COLUMN_HEADER;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_REGION_ROW;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_REGION_TAB;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int TEXT_VIEW_PRIORITY_VALIDATE;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool accel_groups_activate (GLib.Object object, uint accel_key, Gdk.ModifierType accel_mods);
@@ -7340,12 +7882,8 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void icon_size_register_alias (string alias, Gtk.IconSize target);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static GLib.Type identifier_get_type ();
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void init ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void init_add (Gtk.Function function);
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool init_check ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool init_with_args ([CCode (array_length_pos = 0.9)] ref unowned string[] argv, string parameter_string, [CCode (array_length = false)] GLib.OptionEntry[] entries, string? translation_domain) throws GLib.Error;
@@ -7416,14 +7954,6 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void propagate_event (Gtk.Widget widget, Gdk.Event event);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static uint quit_add (uint main_level, Gtk.Function function);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void quit_add_destroy (uint main_level, Gtk.Widget object);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void quit_remove (uint quit_handler_id);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void quit_remove_by_data (void* data);
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void rc_add_default_file (string filename);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static unowned string rc_find_module_in_path (string module_file);
@@ -7466,6 +7996,36 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void rc_set_default_files (string filenames);
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void render_activity (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void render_arrow (Gtk.StyleContext context, Cairo.Context cr, double angle, double x, double y, double size);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void render_background (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void render_check (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void render_expander (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void render_extension (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height, Gtk.PositionType gap_side);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void render_focus (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void render_frame (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void render_frame_gap (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height, Gtk.PositionType gap_side, double xy0_gap, double xy1_gap);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void render_handle (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static unowned Gdk.Pixbuf render_icon_pixbuf (Gtk.StyleContext context, Gtk.IconSource source, Gtk.IconSize size);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void render_layout (Gtk.StyleContext context, Cairo.Context cr, double x, double y, Pango.Layout layout);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void render_line (Gtk.StyleContext context, Cairo.Context cr, double x0, double y0, double x1, double y1);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void render_option (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void render_slider (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height, Gtk.Orientation orientation);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void rgb_to_hsv (double r, double g, double b, double h, double s, double v);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void selection_add_target (Gtk.Widget widget, Gdk.Atom selection, Gdk.Atom target, uint info);
@@ -7484,8 +8044,6 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void set_debug_flags (uint flags);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static unowned string set_locale ();
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void show_about_dialog (Gtk.Window? parent, ...);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool show_uri (Gdk.Screen? screen, string uri, uint32 timestamp) throws GLib.Error;
diff --git a/vapi/packages/gdk-3.0/gdk-3.0.excludes b/vapi/packages/gdk-3.0/gdk-3.0.excludes
index 735456c..ab6c52d 100644
--- a/vapi/packages/gdk-3.0/gdk-3.0.excludes
+++ b/vapi/packages/gdk-3.0/gdk-3.0.excludes
@@ -2,6 +2,7 @@ gdkalias.h
 gdkkeysyms.h
 gdkkeysyms-compat.h
 gdkx.h
+gdkx11.*h
 gdkdirectfb.h
 gdkprivate.h
 gdkprivate-directfb.h
diff --git a/vapi/packages/gdk-3.0/gdk-3.0.files b/vapi/packages/gdk-3.0/gdk-3.0.files
index 570e43b..6e8f5ca 100644
--- a/vapi/packages/gdk-3.0/gdk-3.0.files
+++ b/vapi/packages/gdk-3.0/gdk-3.0.files
@@ -1,3 +1,3 @@
 include/gtk-3.0/gdk/gdk.h
 include/gtk-3.0/gdk
-lib/libgdk-x11-3.0.so
+lib/libgdk-3.0.so
diff --git a/vapi/packages/gdk-3.0/gdk-3.0.gi b/vapi/packages/gdk-3.0/gdk-3.0.gi
index 1c45ecd..5cbd051 100644
--- a/vapi/packages/gdk-3.0/gdk-3.0.gi
+++ b/vapi/packages/gdk-3.0/gdk-3.0.gi
@@ -21,7 +21,7 @@
 		<function name="cairo_create" symbol="gdk_cairo_create">
 			<return-type type="cairo_t*"/>
 			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
+				<parameter name="window" type="GdkWindow*"/>
 			</parameters>
 		</function>
 		<function name="cairo_get_clip_rectangle" symbol="gdk_cairo_get_clip_rectangle">
@@ -51,13 +51,6 @@
 				<parameter name="surface" type="cairo_surface_t*"/>
 			</parameters>
 		</function>
-		<function name="cairo_reset_clip" symbol="gdk_cairo_reset_clip">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="cr" type="cairo_t*"/>
-				<parameter name="drawable" type="GdkDrawable*"/>
-			</parameters>
-		</function>
 		<function name="cairo_set_source_color" symbol="gdk_cairo_set_source_color">
 			<return-type type="void"/>
 			<parameters>
@@ -90,6 +83,9 @@
 				<parameter name="y" type="double"/>
 			</parameters>
 		</function>
+		<function name="disable_multidevice" symbol="gdk_disable_multidevice">
+			<return-type type="void"/>
+		</function>
 		<function name="drag_abort" symbol="gdk_drag_abort">
 			<return-type type="void"/>
 			<parameters>
@@ -104,6 +100,14 @@
 				<parameter name="targets" type="GList*"/>
 			</parameters>
 		</function>
+		<function name="drag_begin_for_device" symbol="gdk_drag_begin_for_device">
+			<return-type type="GdkDragContext*"/>
+			<parameters>
+				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="device" type="GdkDevice*"/>
+				<parameter name="targets" type="GList*"/>
+			</parameters>
+		</function>
 		<function name="drag_drop" symbol="gdk_drag_drop">
 			<return-type type="void"/>
 			<parameters>
@@ -117,17 +121,6 @@
 				<parameter name="context" type="GdkDragContext*"/>
 			</parameters>
 		</function>
-		<function name="drag_find_window" symbol="gdk_drag_find_window">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="context" type="GdkDragContext*"/>
-				<parameter name="drag_window" type="GdkWindow*"/>
-				<parameter name="x_root" type="gint"/>
-				<parameter name="y_root" type="gint"/>
-				<parameter name="dest_window" type="GdkWindow**"/>
-				<parameter name="protocol" type="GdkDragProtocol*"/>
-			</parameters>
-		</function>
 		<function name="drag_find_window_for_screen" symbol="gdk_drag_find_window_for_screen">
 			<return-type type="void"/>
 			<parameters>
@@ -140,13 +133,6 @@
 				<parameter name="protocol" type="GdkDragProtocol*"/>
 			</parameters>
 		</function>
-		<function name="drag_get_protocol" symbol="gdk_drag_get_protocol">
-			<return-type type="GdkNativeWindow"/>
-			<parameters>
-				<parameter name="xid" type="GdkNativeWindow"/>
-				<parameter name="protocol" type="GdkDragProtocol*"/>
-			</parameters>
-		</function>
 		<function name="drag_get_protocol_for_display" symbol="gdk_drag_get_protocol_for_display">
 			<return-type type="GdkNativeWindow"/>
 			<parameters>
@@ -194,13 +180,10 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="context" type="GdkDragContext*"/>
-				<parameter name="ok" type="gboolean"/>
+				<parameter name="accepted" type="gboolean"/>
 				<parameter name="time_" type="guint32"/>
 			</parameters>
 		</function>
-		<function name="enable_multidevice" symbol="gdk_enable_multidevice">
-			<return-type type="void"/>
-		</function>
 		<function name="error_trap_pop" symbol="gdk_error_trap_pop">
 			<return-type type="gint"/>
 		</function>
@@ -241,18 +224,6 @@
 		<function name="flush" symbol="gdk_flush">
 			<return-type type="void"/>
 		</function>
-		<function name="free_compound_text" symbol="gdk_free_compound_text">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="ctext" type="guchar*"/>
-			</parameters>
-		</function>
-		<function name="free_text_list" symbol="gdk_free_text_list">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="list" type="gchar**"/>
-			</parameters>
-		</function>
 		<function name="get_default_root_window" symbol="gdk_get_default_root_window">
 			<return-type type="GdkWindow*"/>
 		</function>
@@ -282,20 +253,6 @@
 				<parameter name="argv" type="gchar***"/>
 			</parameters>
 		</function>
-		<function name="keyboard_grab" symbol="gdk_keyboard_grab">
-			<return-type type="GdkGrabStatus"/>
-			<parameters>
-				<parameter name="window" type="GdkWindow*"/>
-				<parameter name="owner_events" type="gboolean"/>
-				<parameter name="time_" type="guint32"/>
-			</parameters>
-		</function>
-		<function name="keyboard_ungrab" symbol="gdk_keyboard_ungrab">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="time_" type="guint32"/>
-			</parameters>
-		</function>
 		<function name="keyval_convert_case" symbol="gdk_keyval_convert_case">
 			<return-type type="void"/>
 			<parameters>
@@ -433,26 +390,6 @@
 				<parameter name="height" type="int"/>
 			</parameters>
 		</function>
-		<function name="pointer_grab" symbol="gdk_pointer_grab">
-			<return-type type="GdkGrabStatus"/>
-			<parameters>
-				<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>
-		</function>
-		<function name="pointer_is_grabbed" symbol="gdk_pointer_is_grabbed">
-			<return-type type="gboolean"/>
-		</function>
-		<function name="pointer_ungrab" symbol="gdk_pointer_ungrab">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="time_" type="guint32"/>
-			</parameters>
-		</function>
 		<function name="pre_parse_libgtk_only" symbol="gdk_pre_parse_libgtk_only">
 			<return-type type="void"/>
 		</function>
@@ -581,15 +518,6 @@
 				<parameter name="msec" type="guint"/>
 			</parameters>
 		</function>
-		<function name="set_locale" symbol="gdk_set_locale">
-			<return-type type="gchar*"/>
-		</function>
-		<function name="set_pointer_hooks" symbol="gdk_set_pointer_hooks">
-			<return-type type="GdkPointerHooks*"/>
-			<parameters>
-				<parameter name="new_hooks" type="GdkPointerHooks*"/>
-			</parameters>
-		</function>
 		<function name="set_program_class" symbol="gdk_set_program_class">
 			<return-type type="void"/>
 			<parameters>
@@ -602,12 +530,6 @@
 				<parameter name="show_events" type="gboolean"/>
 			</parameters>
 		</function>
-		<function name="set_sm_client_id" symbol="gdk_set_sm_client_id">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="sm_client_id" type="gchar*"/>
-			</parameters>
-		</function>
 		<function name="setting_get" symbol="gdk_setting_get">
 			<return-type type="gboolean"/>
 			<parameters>
@@ -615,66 +537,6 @@
 				<parameter name="value" type="GValue*"/>
 			</parameters>
 		</function>
-		<function name="spawn_command_line_on_screen" symbol="gdk_spawn_command_line_on_screen">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="screen" type="GdkScreen*"/>
-				<parameter name="command_line" type="gchar*"/>
-				<parameter name="error" type="GError**"/>
-			</parameters>
-		</function>
-		<function name="spawn_on_screen" symbol="gdk_spawn_on_screen">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="screen" type="GdkScreen*"/>
-				<parameter name="working_directory" type="gchar*"/>
-				<parameter name="argv" type="gchar**"/>
-				<parameter name="envp" type="gchar**"/>
-				<parameter name="flags" type="GSpawnFlags"/>
-				<parameter name="child_setup" type="GSpawnChildSetupFunc"/>
-				<parameter name="user_data" type="gpointer"/>
-				<parameter name="child_pid" type="GPid*"/>
-				<parameter name="error" type="GError**"/>
-			</parameters>
-		</function>
-		<function name="spawn_on_screen_with_pipes" symbol="gdk_spawn_on_screen_with_pipes">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="screen" type="GdkScreen*"/>
-				<parameter name="working_directory" type="gchar*"/>
-				<parameter name="argv" type="gchar**"/>
-				<parameter name="envp" type="gchar**"/>
-				<parameter name="flags" type="GSpawnFlags"/>
-				<parameter name="child_setup" type="GSpawnChildSetupFunc"/>
-				<parameter name="user_data" type="gpointer"/>
-				<parameter name="child_pid" type="GPid*"/>
-				<parameter name="standard_input" type="gint*"/>
-				<parameter name="standard_output" type="gint*"/>
-				<parameter name="standard_error" type="gint*"/>
-				<parameter name="error" type="GError**"/>
-			</parameters>
-		</function>
-		<function name="string_to_compound_text" symbol="gdk_string_to_compound_text">
-			<return-type type="gint"/>
-			<parameters>
-				<parameter name="str" type="gchar*"/>
-				<parameter name="encoding" type="GdkAtom*"/>
-				<parameter name="format" type="gint*"/>
-				<parameter name="ctext" type="guchar**"/>
-				<parameter name="length" type="gint*"/>
-			</parameters>
-		</function>
-		<function name="string_to_compound_text_for_display" symbol="gdk_string_to_compound_text_for_display">
-			<return-type type="gint"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="str" type="gchar*"/>
-				<parameter name="encoding" type="GdkAtom*"/>
-				<parameter name="format" type="gint*"/>
-				<parameter name="ctext" type="guchar**"/>
-				<parameter name="length" type="gint*"/>
-			</parameters>
-		</function>
 		<function name="test_render_sync" symbol="gdk_test_render_sync">
 			<return-type type="void"/>
 			<parameters>
@@ -703,37 +565,6 @@
 				<parameter name="key_pressrelease" type="GdkEventType"/>
 			</parameters>
 		</function>
-		<function name="text_property_to_text_list" symbol="gdk_text_property_to_text_list">
-			<return-type type="gint"/>
-			<parameters>
-				<parameter name="encoding" type="GdkAtom"/>
-				<parameter name="format" type="gint"/>
-				<parameter name="text" type="guchar*"/>
-				<parameter name="length" type="gint"/>
-				<parameter name="list" type="gchar***"/>
-			</parameters>
-		</function>
-		<function name="text_property_to_text_list_for_display" symbol="gdk_text_property_to_text_list_for_display">
-			<return-type type="gint"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="encoding" type="GdkAtom"/>
-				<parameter name="format" type="gint"/>
-				<parameter name="text" type="guchar*"/>
-				<parameter name="length" type="gint"/>
-				<parameter name="list" type="gchar***"/>
-			</parameters>
-		</function>
-		<function name="text_property_to_utf8_list" symbol="gdk_text_property_to_utf8_list">
-			<return-type type="gint"/>
-			<parameters>
-				<parameter name="encoding" type="GdkAtom"/>
-				<parameter name="format" type="gint"/>
-				<parameter name="text" type="guchar*"/>
-				<parameter name="length" type="gint"/>
-				<parameter name="list" type="gchar***"/>
-			</parameters>
-		</function>
 		<function name="text_property_to_utf8_list_for_display" symbol="gdk_text_property_to_utf8_list_for_display">
 			<return-type type="gint"/>
 			<parameters>
@@ -819,27 +650,6 @@
 				<parameter name="wc" type="guint32"/>
 			</parameters>
 		</function>
-		<function name="utf8_to_compound_text" symbol="gdk_utf8_to_compound_text">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="str" type="gchar*"/>
-				<parameter name="encoding" type="GdkAtom*"/>
-				<parameter name="format" type="gint*"/>
-				<parameter name="ctext" type="guchar**"/>
-				<parameter name="length" type="gint*"/>
-			</parameters>
-		</function>
-		<function name="utf8_to_compound_text_for_display" symbol="gdk_utf8_to_compound_text_for_display">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="str" type="gchar*"/>
-				<parameter name="encoding" type="GdkAtom*"/>
-				<parameter name="format" type="gint*"/>
-				<parameter name="ctext" type="guchar**"/>
-				<parameter name="length" type="gint*"/>
-			</parameters>
-		</function>
 		<function name="utf8_to_string_target" symbol="gdk_utf8_to_string_target">
 			<return-type type="gchar*"/>
 			<parameters>
@@ -889,25 +699,6 @@
 				</parameters>
 			</method>
 		</struct>
-		<struct name="GdkDeviceAxis">
-			<field name="use" type="GdkAxisUse"/>
-			<field name="min" type="gdouble"/>
-			<field name="max" type="gdouble"/>
-		</struct>
-		<struct name="GdkDeviceKey">
-			<field name="keyval" type="guint"/>
-			<field name="modifiers" type="GdkModifierType"/>
-		</struct>
-		<struct name="GdkDisplayDeviceHooks">
-			<field name="get_device_state" type="GCallback"/>
-			<field name="window_get_device_position" type="GCallback"/>
-			<field name="window_at_device_position" type="GCallback"/>
-		</struct>
-		<struct name="GdkDisplayPointerHooks">
-			<field name="get_pointer" type="GCallback"/>
-			<field name="window_get_pointer" type="GCallback"/>
-			<field name="window_at_pointer" type="GCallback"/>
-		</struct>
 		<struct name="GdkEventAny">
 			<field name="type" type="GdkEventType"/>
 			<field name="window" type="GdkWindow*"/>
@@ -1017,11 +808,6 @@
 			<field name="x_root" type="gdouble"/>
 			<field name="y_root" type="gdouble"/>
 		</struct>
-		<struct name="GdkEventNoExpose">
-			<field name="type" type="GdkEventType"/>
-			<field name="window" type="GdkWindow*"/>
-			<field name="send_event" type="gint8"/>
-		</struct>
 		<struct name="GdkEventOwnerChange">
 			<field name="type" type="GdkEventType"/>
 			<field name="window" type="GdkWindow*"/>
@@ -1103,43 +889,17 @@
 			<field name="max_aspect" type="gdouble"/>
 			<field name="win_gravity" type="GdkGravity"/>
 		</struct>
-		<struct name="GdkKeyboardGrabInfo">
-			<field name="window" type="GdkWindow*"/>
-			<field name="native_window" type="GdkWindow*"/>
-			<field name="serial" type="gulong"/>
-			<field name="owner_events" type="gboolean"/>
-			<field name="time" type="guint32"/>
-		</struct>
 		<struct name="GdkKeymapKey">
 			<field name="keycode" type="guint"/>
 			<field name="group" type="gint"/>
 			<field name="level" type="gint"/>
 		</struct>
-		<struct name="GdkMultipleClickInfo">
-			<field name="button_click_time" type="guint32[]"/>
-			<field name="button_window" type="GdkWindow*[]"/>
-			<field name="button_number" type="gint[]"/>
-			<field name="button_x" type="gint[]"/>
-			<field name="button_y" type="gint[]"/>
-		</struct>
 		<struct name="GdkNativeWindow">
 		</struct>
 		<struct name="GdkPoint">
 			<field name="x" type="gint"/>
 			<field name="y" type="gint"/>
 		</struct>
-		<struct name="GdkPointerHooks">
-			<field name="get_pointer" type="GCallback"/>
-			<field name="window_at_pointer" type="GCallback"/>
-		</struct>
-		<struct name="GdkPointerWindowInfo">
-			<field name="toplevel_under_pointer" type="GdkWindow*"/>
-			<field name="window_under_pointer" type="GdkWindow*"/>
-			<field name="toplevel_x" type="gdouble"/>
-			<field name="toplevel_y" type="gdouble"/>
-			<field name="state" type="guint32"/>
-			<field name="button" type="guint32"/>
-		</struct>
 		<struct name="GdkRectangle">
 			<method name="intersect" symbol="gdk_rectangle_intersect">
 				<return-type type="gboolean"/>
@@ -1162,8 +922,6 @@
 			<field name="time" type="guint32"/>
 			<field name="axes" type="gdouble[]"/>
 		</struct>
-		<struct name="GdkVisualClass">
-		</struct>
 		<struct name="GdkWindowAttr">
 			<field name="title" type="gchar*"/>
 			<field name="event_mask" type="gint"/>
@@ -1171,7 +929,7 @@
 			<field name="y" type="gint"/>
 			<field name="width" type="gint"/>
 			<field name="height" type="gint"/>
-			<field name="wclass" type="GdkWindowClass"/>
+			<field name="wclass" type="GdkWindowWindowClass"/>
 			<field name="visual" type="GdkVisual*"/>
 			<field name="window_type" type="GdkWindowType"/>
 			<field name="cursor" type="GdkCursor*"/>
@@ -1180,23 +938,6 @@
 			<field name="override_redirect" type="gboolean"/>
 			<field name="type_hint" type="GdkWindowTypeHint"/>
 		</struct>
-		<struct name="GdkWindowObject">
-		</struct>
-		<struct name="GdkWindowObjectClass">
-			<field name="parent_class" type="GdkDrawableClass"/>
-			<field name="pick_embedded_child" type="GCallback"/>
-			<field name="to_embedder" type="GCallback"/>
-			<field name="from_embedder" type="GCallback"/>
-			<field name="create_surface" type="GCallback"/>
-			<field name="_gdk_reserved1" type="GCallback"/>
-			<field name="_gdk_reserved2" type="GCallback"/>
-			<field name="_gdk_reserved3" type="GCallback"/>
-			<field name="_gdk_reserved4" type="GCallback"/>
-			<field name="_gdk_reserved5" type="GCallback"/>
-			<field name="_gdk_reserved6" type="GCallback"/>
-			<field name="_gdk_reserved7" type="GCallback"/>
-			<field name="_gdk_reserved8" type="GCallback"/>
-		</struct>
 		<struct name="GdkWindowRedirect">
 		</struct>
 		<struct name="GdkXEvent">
@@ -1245,69 +986,6 @@
 			<field name="green" type="guint16"/>
 			<field name="blue" type="guint16"/>
 		</boxed>
-		<boxed name="GdkCursor" type-name="GdkCursor" get-type="gdk_cursor_get_type">
-			<method name="get_cursor_type" symbol="gdk_cursor_get_cursor_type">
-				<return-type type="GdkCursorType"/>
-				<parameters>
-					<parameter name="cursor" type="GdkCursor*"/>
-				</parameters>
-			</method>
-			<method name="get_display" symbol="gdk_cursor_get_display">
-				<return-type type="GdkDisplay*"/>
-				<parameters>
-					<parameter name="cursor" type="GdkCursor*"/>
-				</parameters>
-			</method>
-			<method name="get_image" symbol="gdk_cursor_get_image">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="cursor" type="GdkCursor*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="gdk_cursor_new">
-				<return-type type="GdkCursor*"/>
-				<parameters>
-					<parameter name="cursor_type" type="GdkCursorType"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_for_display" symbol="gdk_cursor_new_for_display">
-				<return-type type="GdkCursor*"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="cursor_type" type="GdkCursorType"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_from_name" symbol="gdk_cursor_new_from_name">
-				<return-type type="GdkCursor*"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="name" type="gchar*"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_from_pixbuf" symbol="gdk_cursor_new_from_pixbuf">
-				<return-type type="GdkCursor*"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-				</parameters>
-			</constructor>
-			<method name="ref" symbol="gdk_cursor_ref">
-				<return-type type="GdkCursor*"/>
-				<parameters>
-					<parameter name="cursor" type="GdkCursor*"/>
-				</parameters>
-			</method>
-			<method name="unref" symbol="gdk_cursor_unref">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cursor" type="GdkCursor*"/>
-				</parameters>
-			</method>
-			<field name="_g_sealed__type" type="GdkCursorType"/>
-			<field name="_g_sealed__ref_count" type="guint"/>
-		</boxed>
 		<boxed name="GdkEvent" type-name="GdkEvent" get-type="gdk_event_get_type">
 			<method name="copy" symbol="gdk_event_copy">
 				<return-type type="GdkEvent*"/>
@@ -1360,6 +1038,12 @@
 					<parameter name="event" type="GdkEvent*"/>
 				</parameters>
 			</method>
+			<method name="get_source_device" symbol="gdk_event_get_source_device">
+				<return-type type="GdkDevice*"/>
+				<parameters>
+					<parameter name="event" type="GdkEvent*"/>
+				</parameters>
+			</method>
 			<method name="get_state" symbol="gdk_event_get_state">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -1437,10 +1121,16 @@
 					<parameter name="screen" type="GdkScreen*"/>
 				</parameters>
 			</method>
+			<method name="set_source_device" symbol="gdk_event_set_source_device">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="event" type="GdkEvent*"/>
+					<parameter name="device" type="GdkDevice*"/>
+				</parameters>
+			</method>
 			<field name="type" type="GdkEventType"/>
 			<field name="any" type="GdkEventAny"/>
 			<field name="expose" type="GdkEventExpose"/>
-			<field name="no_expose" type="GdkEventNoExpose"/>
 			<field name="visibility" type="GdkEventVisibility"/>
 			<field name="motion" type="GdkEventMotion"/>
 			<field name="button" type="GdkEventButton"/>
@@ -1488,8 +1178,8 @@
 			<method name="parse" symbol="gdk_rgba_parse">
 				<return-type type="gboolean"/>
 				<parameters>
-					<parameter name="spec" type="gchar*"/>
 					<parameter name="rgba" type="GdkRGBA*"/>
+					<parameter name="spec" type="gchar*"/>
 				</parameters>
 			</method>
 			<method name="to_string" symbol="gdk_rgba_to_string">
@@ -1655,7 +1345,6 @@
 			<member name="GDK_DROP_FINISHED" value="27"/>
 			<member name="GDK_CLIENT_EVENT" value="28"/>
 			<member name="GDK_VISIBILITY_NOTIFY" value="29"/>
-			<member name="GDK_NO_EXPOSE" value="30"/>
 			<member name="GDK_SCROLL" value="31"/>
 			<member name="GDK_WINDOW_STATE" value="32"/>
 			<member name="GDK_SETTING" value="33"/>
@@ -1763,10 +1452,6 @@
 			<member name="GDK_VISUAL_TRUE_COLOR" value="4"/>
 			<member name="GDK_VISUAL_DIRECT_COLOR" value="5"/>
 		</enum>
-		<enum name="GdkWindowClass" type-name="GdkWindowClass" get-type="gdk_window_class_get_type">
-			<member name="GDK_INPUT_OUTPUT" value="0"/>
-			<member name="GDK_INPUT_ONLY" value="1"/>
-		</enum>
 		<enum name="GdkWindowEdge" type-name="GdkWindowEdge" get-type="gdk_window_edge_get_type">
 			<member name="GDK_WINDOW_EDGE_NORTH_WEST" value="0"/>
 			<member name="GDK_WINDOW_EDGE_NORTH" value="1"/>
@@ -1801,6 +1486,10 @@
 			<member name="GDK_WINDOW_TYPE_HINT_COMBO" value="12"/>
 			<member name="GDK_WINDOW_TYPE_HINT_DND" value="13"/>
 		</enum>
+		<enum name="GdkWindowWindowClass" type-name="GdkWindowWindowClass" get-type="gdk_window_window_class_get_type">
+			<member name="GDK_INPUT_OUTPUT" value="0"/>
+			<member name="GDK_INPUT_ONLY" value="1"/>
+		</enum>
 		<flags name="GdkDragAction" type-name="GdkDragAction" get-type="gdk_drag_action_get_type">
 			<member name="GDK_ACTION_DEFAULT" value="1"/>
 			<member name="GDK_ACTION_COPY" value="2"/>
@@ -1901,9 +1590,6 @@
 			<member name="GDK_WINDOW_STATE_BELOW" value="64"/>
 		</flags>
 		<object name="GdkAppLaunchContext" parent="GAppLaunchContext" type-name="GdkAppLaunchContext" get-type="gdk_app_launch_context_get_type">
-			<constructor name="new" symbol="gdk_app_launch_context_new">
-				<return-type type="GdkAppLaunchContext*"/>
-			</constructor>
 			<method name="set_desktop" symbol="gdk_app_launch_context_set_desktop">
 				<return-type type="void"/>
 				<parameters>
@@ -1911,13 +1597,6 @@
 					<parameter name="desktop" type="gint"/>
 				</parameters>
 			</method>
-			<method name="set_display" symbol="gdk_app_launch_context_set_display">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="context" type="GdkAppLaunchContext*"/>
-					<parameter name="display" type="GdkDisplay*"/>
-				</parameters>
-			</method>
 			<method name="set_icon" symbol="gdk_app_launch_context_set_icon">
 				<return-type type="void"/>
 				<parameters>
@@ -1946,6 +1625,58 @@
 					<parameter name="timestamp" type="guint32"/>
 				</parameters>
 			</method>
+			<property name="display" type="GdkDisplay*" readable="1" writable="1" construct="0" construct-only="1"/>
+		</object>
+		<object name="GdkCursor" parent="GObject" type-name="GdkCursor" get-type="gdk_cursor_get_type">
+			<method name="get_cursor_type" symbol="gdk_cursor_get_cursor_type">
+				<return-type type="GdkCursorType"/>
+				<parameters>
+					<parameter name="cursor" type="GdkCursor*"/>
+				</parameters>
+			</method>
+			<method name="get_display" symbol="gdk_cursor_get_display">
+				<return-type type="GdkDisplay*"/>
+				<parameters>
+					<parameter name="cursor" type="GdkCursor*"/>
+				</parameters>
+			</method>
+			<method name="get_image" symbol="gdk_cursor_get_image">
+				<return-type type="GdkPixbuf*"/>
+				<parameters>
+					<parameter name="cursor" type="GdkCursor*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gdk_cursor_new">
+				<return-type type="GdkCursor*"/>
+				<parameters>
+					<parameter name="cursor_type" type="GdkCursorType"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_for_display" symbol="gdk_cursor_new_for_display">
+				<return-type type="GdkCursor*"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="cursor_type" type="GdkCursorType"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_from_name" symbol="gdk_cursor_new_from_name">
+				<return-type type="GdkCursor*"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="name" type="gchar*"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_from_pixbuf" symbol="gdk_cursor_new_from_pixbuf">
+				<return-type type="GdkCursor*"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="pixbuf" type="GdkPixbuf*"/>
+					<parameter name="x" type="gint"/>
+					<parameter name="y" type="gint"/>
+				</parameters>
+			</constructor>
+			<property name="cursor-type" type="GdkCursorType" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="display" type="GdkDisplay*" readable="1" writable="1" construct="0" construct-only="1"/>
 		</object>
 		<object name="GdkDevice" parent="GObject" type-name="GdkDevice" get-type="gdk_device_get_type">
 			<method name="free_history" symbol="gdk_device_free_history">
@@ -2031,7 +1762,13 @@
 				</parameters>
 			</method>
 			<method name="get_n_axes" symbol="gdk_device_get_n_axes">
-				<return-type type="guint"/>
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="device" type="GdkDevice*"/>
+				</parameters>
+			</method>
+			<method name="get_n_keys" symbol="gdk_device_get_n_keys">
+				<return-type type="gint"/>
 				<parameters>
 					<parameter name="device" type="GdkDevice*"/>
 				</parameters>
@@ -2042,6 +1779,15 @@
 					<parameter name="device" type="GdkDevice*"/>
 				</parameters>
 			</method>
+			<method name="get_position" symbol="gdk_device_get_position">
+				<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>
+			</method>
 			<method name="get_source" symbol="gdk_device_get_source">
 				<return-type type="GdkInputSource"/>
 				<parameters>
@@ -2057,6 +1803,14 @@
 					<parameter name="mask" type="GdkModifierType*"/>
 				</parameters>
 			</method>
+			<method name="get_window_at_position" symbol="gdk_device_get_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*"/>
+				</parameters>
+			</method>
 			<method name="grab" symbol="gdk_device_grab">
 				<return-type type="GdkGrabStatus"/>
 				<parameters>
@@ -2084,6 +1838,12 @@
 					<parameter name="device" type="GdkDevice*"/>
 				</parameters>
 			</method>
+			<method name="list_slave_devices" symbol="gdk_device_list_slave_devices">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="device" type="GdkDevice*"/>
+				</parameters>
+			</method>
 			<method name="set_axis_use" symbol="gdk_device_set_axis_use">
 				<return-type type="void"/>
 				<parameters>
@@ -2108,18 +1868,20 @@
 					<parameter name="mode" type="GdkInputMode"/>
 				</parameters>
 			</method>
-			<method name="set_source" symbol="gdk_device_set_source">
+			<method name="ungrab" symbol="gdk_device_ungrab">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="device" type="GdkDevice*"/>
-					<parameter name="source" type="GdkInputSource"/>
+					<parameter name="time_" type="guint32"/>
 				</parameters>
 			</method>
-			<method name="ungrab" symbol="gdk_device_ungrab">
+			<method name="warp" symbol="gdk_device_warp">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="device" type="GdkDevice*"/>
-					<parameter name="time_" type="guint32"/>
+					<parameter name="screen" type="GdkScreen*"/>
+					<parameter name="x" type="gint"/>
+					<parameter name="y" type="gint"/>
 				</parameters>
 			</method>
 			<property name="associated-device" type="GdkDevice*" readable="1" writable="0" construct="0" construct-only="0"/>
@@ -2131,6 +1893,12 @@
 			<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"/>
+			<signal name="changed" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="GdkDevice*"/>
+				</parameters>
+			</signal>
 		</object>
 		<object name="GdkDeviceManager" parent="GObject" type-name="GdkDeviceManager" get-type="gdk_device_manager_get_type">
 			<method name="get_client_pointer" symbol="gdk_device_manager_get_client_pointer">
@@ -2156,37 +1924,24 @@
 			<signal name="device-added" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="device_manager" type="GdkDeviceManager*"/>
-					<parameter name="device" type="GdkDevice*"/>
+					<parameter name="object" type="GdkDeviceManager*"/>
+					<parameter name="p0" type="GdkDevice*"/>
 				</parameters>
 			</signal>
 			<signal name="device-changed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="device_manager" type="GdkDeviceManager*"/>
-					<parameter name="device" type="GdkDevice*"/>
+					<parameter name="object" type="GdkDeviceManager*"/>
+					<parameter name="p0" type="GdkDevice*"/>
 				</parameters>
 			</signal>
 			<signal name="device-removed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="device_manager" type="GdkDeviceManager*"/>
-					<parameter name="device" type="GdkDevice*"/>
+					<parameter name="object" type="GdkDeviceManager*"/>
+					<parameter name="p0" type="GdkDevice*"/>
 				</parameters>
 			</signal>
-			<vfunc name="get_client_pointer">
-				<return-type type="GdkDevice*"/>
-				<parameters>
-					<parameter name="device_manager" type="GdkDeviceManager*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="list_devices">
-				<return-type type="GList*"/>
-				<parameters>
-					<parameter name="device_manager" type="GdkDeviceManager*"/>
-					<parameter name="type" type="GdkDeviceType"/>
-				</parameters>
-			</vfunc>
 		</object>
 		<object name="GdkDisplay" parent="GObject" type-name="GdkDisplay" get-type="gdk_display_get_type">
 			<method name="add_client_message_filter" symbol="gdk_display_add_client_message_filter">
@@ -2223,6 +1978,12 @@
 					<parameter name="display" type="GdkDisplay*"/>
 				</parameters>
 			</method>
+			<method name="get_app_launch_context" symbol="gdk_display_get_app_launch_context">
+				<return-type type="GdkAppLaunchContext*"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+				</parameters>
+			</method>
 			<method name="get_default" symbol="gdk_display_get_default">
 				<return-type type="GdkDisplay*"/>
 			</method>
@@ -2250,17 +2011,6 @@
 					<parameter name="display" type="GdkDisplay*"/>
 				</parameters>
 			</method>
-			<method name="get_device_state" symbol="gdk_display_get_device_state">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="device" type="GdkDevice*"/>
-					<parameter name="screen" type="GdkScreen**"/>
-					<parameter name="x" type="gint*"/>
-					<parameter name="y" type="gint*"/>
-					<parameter name="mask" type="GdkModifierType*"/>
-				</parameters>
-			</method>
 			<method name="get_event" symbol="gdk_display_get_event">
 				<return-type type="GdkEvent*"/>
 				<parameters>
@@ -2287,16 +2037,6 @@
 					<parameter name="display" type="GdkDisplay*"/>
 				</parameters>
 			</method>
-			<method name="get_pointer" symbol="gdk_display_get_pointer">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="screen" type="GdkScreen**"/>
-					<parameter name="x" type="gint*"/>
-					<parameter name="y" type="gint*"/>
-					<parameter name="mask" type="GdkModifierType*"/>
-				</parameters>
-			</method>
 			<method name="get_screen" symbol="gdk_display_get_screen">
 				<return-type type="GdkScreen*"/>
 				<parameters>
@@ -2304,21 +2044,10 @@
 					<parameter name="screen_num" type="gint"/>
 				</parameters>
 			</method>
-			<method name="get_window_at_device_position" symbol="gdk_display_get_window_at_device_position">
-				<return-type type="GdkWindow*"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="device" type="GdkDevice*"/>
-					<parameter name="win_x" type="gint*"/>
-					<parameter name="win_y" type="gint*"/>
-				</parameters>
-			</method>
-			<method name="get_window_at_pointer" symbol="gdk_display_get_window_at_pointer">
-				<return-type type="GdkWindow*"/>
+			<method name="has_pending" symbol="gdk_display_has_pending">
+				<return-type type="gboolean"/>
 				<parameters>
 					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="win_x" type="gint*"/>
-					<parameter name="win_y" type="gint*"/>
 				</parameters>
 			</method>
 			<method name="is_closed" symbol="gdk_display_is_closed">
@@ -2327,11 +2056,11 @@
 					<parameter name="display" type="GdkDisplay*"/>
 				</parameters>
 			</method>
-			<method name="keyboard_ungrab" symbol="gdk_display_keyboard_ungrab">
+			<method name="notify_startup_complete" symbol="gdk_display_notify_startup_complete">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="time_" type="guint32"/>
+					<parameter name="startup_id" type="gchar*"/>
 				</parameters>
 			</method>
 			<method name="open" symbol="gdk_display_open">
@@ -2349,19 +2078,6 @@
 					<parameter name="display" type="GdkDisplay*"/>
 				</parameters>
 			</method>
-			<method name="pointer_is_grabbed" symbol="gdk_display_pointer_is_grabbed">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-				</parameters>
-			</method>
-			<method name="pointer_ungrab" symbol="gdk_display_pointer_ungrab">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="time_" type="guint32"/>
-				</parameters>
-			</method>
 			<method name="put_event" symbol="gdk_display_put_event">
 				<return-type type="void"/>
 				<parameters>
@@ -2376,13 +2092,6 @@
 					<parameter name="selection" type="GdkAtom"/>
 				</parameters>
 			</method>
-			<method name="set_device_hooks" symbol="gdk_display_set_device_hooks">
-				<return-type type="GdkDisplayDeviceHooks*"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="new_hooks" type="GdkDisplayDeviceHooks*"/>
-				</parameters>
-			</method>
 			<method name="set_double_click_distance" symbol="gdk_display_set_double_click_distance">
 				<return-type type="void"/>
 				<parameters>
@@ -2397,13 +2106,6 @@
 					<parameter name="msec" type="guint"/>
 				</parameters>
 			</method>
-			<method name="set_pointer_hooks" symbol="gdk_display_set_pointer_hooks">
-				<return-type type="GdkDisplayPointerHooks*"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="new_hooks" type="GdkDisplayPointerHooks*"/>
-				</parameters>
-			</method>
 			<method name="store_clipboard" symbol="gdk_display_store_clipboard">
 				<return-type type="void"/>
 				<parameters>
@@ -2462,30 +2164,11 @@
 					<parameter name="display" type="GdkDisplay*"/>
 				</parameters>
 			</method>
-			<method name="warp_device" symbol="gdk_display_warp_device">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="device" type="GdkDevice*"/>
-					<parameter name="screen" type="GdkScreen*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-				</parameters>
-			</method>
-			<method name="warp_pointer" symbol="gdk_display_warp_pointer">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="screen" type="GdkScreen*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-				</parameters>
-			</method>
 			<signal name="closed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="is_error" type="gboolean"/>
+					<parameter name="object" type="GdkDisplay*"/>
+					<parameter name="p0" type="gboolean"/>
 				</parameters>
 			</signal>
 			<signal name="opened" when="LAST">
@@ -2494,31 +2177,6 @@
 					<parameter name="object" type="GdkDisplay*"/>
 				</parameters>
 			</signal>
-			<vfunc name="get_default_screen">
-				<return-type type="GdkScreen*"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_display_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_n_screens">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_screen">
-				<return-type type="GdkScreen*"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="screen_num" type="gint"/>
-				</parameters>
-			</vfunc>
 		</object>
 		<object name="GdkDisplayManager" parent="GObject" type-name="GdkDisplayManager" get-type="gdk_display_manager_get_type">
 			<method name="get" symbol="gdk_display_manager_get">
@@ -2527,19 +2185,26 @@
 			<method name="get_default_display" symbol="gdk_display_manager_get_default_display">
 				<return-type type="GdkDisplay*"/>
 				<parameters>
-					<parameter name="display_manager" type="GdkDisplayManager*"/>
+					<parameter name="manager" type="GdkDisplayManager*"/>
 				</parameters>
 			</method>
 			<method name="list_displays" symbol="gdk_display_manager_list_displays">
 				<return-type type="GSList*"/>
 				<parameters>
-					<parameter name="display_manager" type="GdkDisplayManager*"/>
+					<parameter name="manager" type="GdkDisplayManager*"/>
+				</parameters>
+			</method>
+			<method name="open_display" symbol="gdk_display_manager_open_display">
+				<return-type type="GdkDisplay*"/>
+				<parameters>
+					<parameter name="manager" type="GdkDisplayManager*"/>
+					<parameter name="name" type="gchar*"/>
 				</parameters>
 			</method>
 			<method name="set_default_display" symbol="gdk_display_manager_set_default_display">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="display_manager" type="GdkDisplayManager*"/>
+					<parameter name="manager" type="GdkDisplayManager*"/>
 					<parameter name="display" type="GdkDisplay*"/>
 				</parameters>
 			</method>
@@ -2547,8 +2212,8 @@
 			<signal name="display-opened" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="display_manager" type="GdkDisplayManager*"/>
-					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="object" type="GdkDisplayManager*"/>
+					<parameter name="p0" type="GdkDisplay*"/>
 				</parameters>
 			</signal>
 		</object>
@@ -2559,12 +2224,24 @@
 					<parameter name="context" type="GdkDragContext*"/>
 				</parameters>
 			</method>
+			<method name="get_dest_window" symbol="gdk_drag_context_get_dest_window">
+				<return-type type="GdkWindow*"/>
+				<parameters>
+					<parameter name="context" type="GdkDragContext*"/>
+				</parameters>
+			</method>
 			<method name="get_device" symbol="gdk_drag_context_get_device">
 				<return-type type="GdkDevice*"/>
 				<parameters>
 					<parameter name="context" type="GdkDragContext*"/>
 				</parameters>
 			</method>
+			<method name="get_protocol" symbol="gdk_drag_context_get_protocol">
+				<return-type type="GdkDragProtocol"/>
+				<parameters>
+					<parameter name="context" type="GdkDragContext*"/>
+				</parameters>
+			</method>
 			<method name="get_selected_action" symbol="gdk_drag_context_get_selected_action">
 				<return-type type="GdkDragAction"/>
 				<parameters>
@@ -2589,9 +2266,6 @@
 					<parameter name="context" type="GdkDragContext*"/>
 				</parameters>
 			</method>
-			<constructor name="new" symbol="gdk_drag_context_new">
-				<return-type type="GdkDragContext*"/>
-			</constructor>
 			<method name="set_device" symbol="gdk_drag_context_set_device">
 				<return-type type="void"/>
 				<parameters>
@@ -2600,53 +2274,6 @@
 				</parameters>
 			</method>
 		</object>
-		<object name="GdkDrawable" parent="GObject" type-name="GdkDrawable" get-type="gdk_drawable_get_type">
-			<method name="get_clip_region" symbol="gdk_drawable_get_clip_region">
-				<return-type type="cairo_region_t*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-				</parameters>
-			</method>
-			<method name="get_visible_region" symbol="gdk_drawable_get_visible_region">
-				<return-type type="cairo_region_t*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-				</parameters>
-			</method>
-			<vfunc name="create_cairo_surface">
-				<return-type type="cairo_surface_t*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="width" type="int"/>
-					<parameter name="height" type="int"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_clip_region">
-				<return-type type="cairo_region_t*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_visible_region">
-				<return-type type="cairo_region_t*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="ref_cairo_surface">
-				<return-type type="cairo_surface_t*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="set_cairo_clip">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="cr" type="cairo_t*"/>
-				</parameters>
-			</vfunc>
-		</object>
 		<object name="GdkKeymap" parent="GObject" type-name="GdkKeymap" get-type="gdk_keymap_get_type">
 			<method name="add_virtual_modifiers" symbol="gdk_keymap_add_virtual_modifiers">
 				<return-type type="void"/>
@@ -2737,19 +2364,19 @@
 			<signal name="direction-changed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="keymap" type="GdkKeymap*"/>
+					<parameter name="object" type="GdkKeymap*"/>
 				</parameters>
 			</signal>
 			<signal name="keys-changed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="keymap" type="GdkKeymap*"/>
+					<parameter name="object" type="GdkKeymap*"/>
 				</parameters>
 			</signal>
 			<signal name="state-changed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="keymap" type="GdkKeymap*"/>
+					<parameter name="object" type="GdkKeymap*"/>
 				</parameters>
 			</signal>
 		</object>
@@ -2961,19 +2588,19 @@
 			<signal name="composited-changed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
+					<parameter name="object" type="GdkScreen*"/>
 				</parameters>
 			</signal>
 			<signal name="monitors-changed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
+					<parameter name="object" type="GdkScreen*"/>
 				</parameters>
 			</signal>
 			<signal name="size-changed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
+					<parameter name="object" type="GdkScreen*"/>
 				</parameters>
 			</signal>
 		</object>
@@ -3073,7 +2700,7 @@
 				</parameters>
 			</method>
 		</object>
-		<object name="GdkWindow" parent="GdkDrawable" type-name="GdkWindow" get-type="gdk_window_object_get_type">
+		<object name="GdkWindow" parent="GObject" type-name="GdkWindow" get-type="gdk_window_get_type">
 			<method name="add_filter" symbol="gdk_window_add_filter">
 				<return-type type="void"/>
 				<parameters>
@@ -3219,19 +2846,6 @@
 					<parameter name="timestamp" type="guint32"/>
 				</parameters>
 			</method>
-			<method name="foreign_new" symbol="gdk_window_foreign_new">
-				<return-type type="GdkWindow*"/>
-				<parameters>
-					<parameter name="anid" type="GdkNativeWindow"/>
-				</parameters>
-			</method>
-			<method name="foreign_new_for_display" symbol="gdk_window_foreign_new_for_display">
-				<return-type type="GdkWindow*"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="anid" type="GdkNativeWindow"/>
-				</parameters>
-			</method>
 			<method name="freeze_toplevel_updates_libgtk_only" symbol="gdk_window_freeze_toplevel_updates_libgtk_only">
 				<return-type type="void"/>
 				<parameters>
@@ -3274,6 +2888,12 @@
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
+			<method name="get_clip_region" symbol="gdk_window_get_clip_region">
+				<return-type type="cairo_region_t*"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
 			<method name="get_composited" symbol="gdk_window_get_composited">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -3362,7 +2982,6 @@
 					<parameter name="y" type="gint*"/>
 					<parameter name="width" type="gint*"/>
 					<parameter name="height" type="gint*"/>
-					<parameter name="depth" type="gint*"/>
 				</parameters>
 			</method>
 			<method name="get_group" symbol="gdk_window_get_group">
@@ -3438,6 +3057,13 @@
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
+			<method name="get_source_events" symbol="gdk_window_get_source_events">
+				<return-type type="GdkEventMask"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="source" type="GdkInputSource"/>
+				</parameters>
+			</method>
 			<method name="get_state" symbol="gdk_window_get_state">
 				<return-type type="GdkWindowState"/>
 				<parameters>
@@ -3475,6 +3101,12 @@
 					<parameter name="data" type="gpointer*"/>
 				</parameters>
 			</method>
+			<method name="get_visible_region" symbol="gdk_window_get_visible_region">
+				<return-type type="cairo_region_t*"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
 			<method name="get_visual" symbol="gdk_window_get_visual">
 				<return-type type="GdkVisual*"/>
 				<parameters>
@@ -3575,19 +3207,6 @@
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
-			<method name="lookup" symbol="gdk_window_lookup">
-				<return-type type="GdkWindow*"/>
-				<parameters>
-					<parameter name="anid" type="GdkNativeWindow"/>
-				</parameters>
-			</method>
-			<method name="lookup_for_display" symbol="gdk_window_lookup_for_display">
-				<return-type type="GdkWindow*"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="anid" type="GdkNativeWindow"/>
-				</parameters>
-			</method>
 			<method name="lower" symbol="gdk_window_lower">
 				<return-type type="void"/>
 				<parameters>
@@ -3905,6 +3524,14 @@
 					<parameter name="skips_taskbar" type="gboolean"/>
 				</parameters>
 			</method>
+			<method name="set_source_events" symbol="gdk_window_set_source_events">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="source" type="GdkInputSource"/>
+					<parameter name="event_mask" type="GdkEventMask"/>
+				</parameters>
+			</method>
 			<method name="set_startup_id" symbol="gdk_window_set_startup_id">
 				<return-type type="void"/>
 				<parameters>
@@ -4028,37 +3655,37 @@
 			<signal name="create-surface" when="LAST">
 				<return-type type="CairoSurface*"/>
 				<parameters>
-					<parameter name="object" type="GdkWindow*"/>
-					<parameter name="p0" type="gint"/>
-					<parameter name="p1" type="gint"/>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="height" type="gint"/>
 				</parameters>
 			</signal>
 			<signal name="from-embedder" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="object" type="GdkWindow*"/>
-					<parameter name="p0" type="gdouble"/>
-					<parameter name="p1" type="gdouble"/>
-					<parameter name="p2" type="gpointer"/>
-					<parameter name="p3" type="gpointer"/>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="embedder_x" type="gdouble"/>
+					<parameter name="embedder_y" type="gdouble"/>
+					<parameter name="offscreen_x" type="gpointer"/>
+					<parameter name="offscreen_y" type="gpointer"/>
 				</parameters>
 			</signal>
 			<signal name="pick-embedded-child" when="LAST">
 				<return-type type="GdkWindow*"/>
 				<parameters>
-					<parameter name="object" type="GdkWindow*"/>
-					<parameter name="p0" type="gdouble"/>
-					<parameter name="p1" type="gdouble"/>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="x" type="gdouble"/>
+					<parameter name="y" type="gdouble"/>
 				</parameters>
 			</signal>
 			<signal name="to-embedder" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="object" type="GdkWindow*"/>
-					<parameter name="p0" type="gdouble"/>
-					<parameter name="p1" type="gdouble"/>
-					<parameter name="p2" type="gpointer"/>
-					<parameter name="p3" type="gpointer"/>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="offscreen_x" type="gdouble"/>
+					<parameter name="offscreen_y" type="gdouble"/>
+					<parameter name="embedder_x" type="gpointer"/>
+					<parameter name="embedder_y" type="gpointer"/>
 				</parameters>
 			</signal>
 		</object>
diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.defines b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.defines
index a912cd8..4cc33b2 100644
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.defines
+++ b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.defines
@@ -1,2 +1,3 @@
+-DGDK_COMPILATION
 -DGDK_DISABLE_DEPRECATED
 -DGSEAL_ENABLE
diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.excludes b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.excludes
new file mode 100644
index 0000000..e0d9187
--- /dev/null
+++ b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.excludes
@@ -0,0 +1 @@
+gdkx11device.*h
diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.files b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.files
index 490ca8b..8a07537 100644
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.files
+++ b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.files
@@ -1,2 +1,3 @@
 include/gtk-3.0/gdk/gdkx.h
-lib/libgdk-x11-3.0.so
+include/gtk-3.0/gdk/x11
+lib/libgdk-3.0.so
diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi
index b196f17..72f77c1 100644
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi
+++ b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi
@@ -1,18 +1,6 @@
 <?xml version="1.0"?>
 <api version="1.0">
 	<namespace name="Gdk">
-		<function name="gdkx_visual_get" symbol="gdkx_visual_get">
-			<return-type type="GdkVisual*"/>
-			<parameters>
-				<parameter name="xvisualid" type="VisualID"/>
-			</parameters>
-		</function>
-		<function name="net_wm_supports" symbol="gdk_net_wm_supports">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="property" type="GdkAtom"/>
-			</parameters>
-		</function>
 		<function name="x11_atom_to_xatom" symbol="gdk_x11_atom_to_xatom">
 			<return-type type="Atom"/>
 			<parameters>
@@ -26,98 +14,16 @@
 				<parameter name="atom" type="GdkAtom"/>
 			</parameters>
 		</function>
-		<function name="x11_cursor_get_xcursor" symbol="gdk_x11_cursor_get_xcursor">
-			<return-type type="Cursor"/>
-			<parameters>
-				<parameter name="cursor" type="GdkCursor*"/>
-			</parameters>
-		</function>
-		<function name="x11_cursor_get_xdisplay" symbol="gdk_x11_cursor_get_xdisplay">
-			<return-type type="Display*"/>
-			<parameters>
-				<parameter name="cursor" type="GdkCursor*"/>
-			</parameters>
-		</function>
-		<function name="x11_display_broadcast_startup_message" symbol="gdk_x11_display_broadcast_startup_message">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="message_type" type="char*"/>
-			</parameters>
-		</function>
-		<function name="x11_display_error_trap_pop" symbol="gdk_x11_display_error_trap_pop">
-			<return-type type="gint"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-			</parameters>
-		</function>
-		<function name="x11_display_error_trap_pop_ignored" symbol="gdk_x11_display_error_trap_pop_ignored">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-			</parameters>
-		</function>
-		<function name="x11_display_error_trap_push" symbol="gdk_x11_display_error_trap_push">
+		<function name="x11_free_compound_text" symbol="gdk_x11_free_compound_text">
 			<return-type type="void"/>
 			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-			</parameters>
-		</function>
-		<function name="x11_display_get_startup_notification_id" symbol="gdk_x11_display_get_startup_notification_id">
-			<return-type type="gchar*"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-			</parameters>
-		</function>
-		<function name="x11_display_get_user_time" symbol="gdk_x11_display_get_user_time">
-			<return-type type="guint32"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
+				<parameter name="ctext" type="guchar*"/>
 			</parameters>
 		</function>
-		<function name="x11_display_get_xdisplay" symbol="gdk_x11_display_get_xdisplay">
-			<return-type type="Display*"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-			</parameters>
-		</function>
-		<function name="x11_display_grab" symbol="gdk_x11_display_grab">
+		<function name="x11_free_text_list" symbol="gdk_x11_free_text_list">
 			<return-type type="void"/>
 			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-			</parameters>
-		</function>
-		<function name="x11_display_set_cursor_theme" symbol="gdk_x11_display_set_cursor_theme">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="theme" type="gchar*"/>
-				<parameter name="size" type="gint"/>
-			</parameters>
-		</function>
-		<function name="x11_display_set_startup_notification_id" symbol="gdk_x11_display_set_startup_notification_id">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="startup_id" type="gchar*"/>
-			</parameters>
-		</function>
-		<function name="x11_display_ungrab" symbol="gdk_x11_display_ungrab">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-			</parameters>
-		</function>
-		<function name="x11_drawable_get_xdisplay" symbol="gdk_x11_drawable_get_xdisplay">
-			<return-type type="Display*"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-			</parameters>
-		</function>
-		<function name="x11_drawable_get_xid" symbol="gdk_x11_drawable_get_xid">
-			<return-type type="XID"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
+				<parameter name="list" type="gchar**"/>
 			</parameters>
 		</function>
 		<function name="x11_get_default_root_xwindow" symbol="gdk_x11_get_default_root_xwindow">
@@ -178,72 +84,14 @@
 				<parameter name="n_events" type="gint"/>
 			</parameters>
 		</function>
-		<function name="x11_screen_get_monitor_output" symbol="gdk_x11_screen_get_monitor_output">
-			<return-type type="XID"/>
-			<parameters>
-				<parameter name="screen" type="GdkScreen*"/>
-				<parameter name="monitor_num" type="gint"/>
-			</parameters>
-		</function>
-		<function name="x11_screen_get_screen_number" symbol="gdk_x11_screen_get_screen_number">
-			<return-type type="int"/>
-			<parameters>
-				<parameter name="screen" type="GdkScreen*"/>
-			</parameters>
-		</function>
-		<function name="x11_screen_get_window_manager_name" symbol="gdk_x11_screen_get_window_manager_name">
-			<return-type type="char*"/>
-			<parameters>
-				<parameter name="screen" type="GdkScreen*"/>
-			</parameters>
-		</function>
-		<function name="x11_screen_get_xscreen" symbol="gdk_x11_screen_get_xscreen">
-			<return-type type="Screen*"/>
-			<parameters>
-				<parameter name="screen" type="GdkScreen*"/>
-			</parameters>
-		</function>
-		<function name="x11_screen_lookup_visual" symbol="gdk_x11_screen_lookup_visual">
-			<return-type type="GdkVisual*"/>
-			<parameters>
-				<parameter name="screen" type="GdkScreen*"/>
-				<parameter name="xvisualid" type="VisualID"/>
-			</parameters>
-		</function>
-		<function name="x11_screen_supports_net_wm_hint" symbol="gdk_x11_screen_supports_net_wm_hint">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="screen" type="GdkScreen*"/>
-				<parameter name="property" type="GdkAtom"/>
-			</parameters>
-		</function>
-		<function name="x11_ungrab_server" symbol="gdk_x11_ungrab_server">
-			<return-type type="void"/>
-		</function>
-		<function name="x11_visual_get_xvisual" symbol="gdk_x11_visual_get_xvisual">
-			<return-type type="Visual*"/>
-			<parameters>
-				<parameter name="visual" type="GdkVisual*"/>
-			</parameters>
-		</function>
-		<function name="x11_window_get_drawable_impl" symbol="gdk_x11_window_get_drawable_impl">
-			<return-type type="GdkDrawable*"/>
-			<parameters>
-				<parameter name="window" type="GdkWindow*"/>
-			</parameters>
-		</function>
-		<function name="x11_window_move_to_current_desktop" symbol="gdk_x11_window_move_to_current_desktop">
+		<function name="x11_set_sm_client_id" symbol="gdk_x11_set_sm_client_id">
 			<return-type type="void"/>
 			<parameters>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="sm_client_id" type="gchar*"/>
 			</parameters>
 		</function>
-		<function name="x11_window_set_user_time" symbol="gdk_x11_window_set_user_time">
+		<function name="x11_ungrab_server" symbol="gdk_x11_ungrab_server">
 			<return-type type="void"/>
-			<parameters>
-				<parameter name="window" type="GdkWindow*"/>
-				<parameter name="timestamp" type="guint32"/>
-			</parameters>
 		</function>
 		<function name="x11_xatom_to_atom" symbol="gdk_x11_xatom_to_atom">
 			<return-type type="GdkAtom"/>
@@ -258,18 +106,243 @@
 				<parameter name="xatom" type="Atom"/>
 			</parameters>
 		</function>
-		<function name="xid_table_lookup" symbol="gdk_xid_table_lookup">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="xid" type="XID"/>
-			</parameters>
-		</function>
-		<function name="xid_table_lookup_for_display" symbol="gdk_xid_table_lookup_for_display">
-			<return-type type="gpointer"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="xid" type="XID"/>
-			</parameters>
-		</function>
+		<struct name="GdkX11AppLaunchContextClass">
+		</struct>
+		<struct name="GdkX11CursorClass">
+		</struct>
+		<struct name="GdkX11DisplayClass">
+		</struct>
+		<struct name="GdkX11DisplayManagerClass">
+		</struct>
+		<struct name="GdkX11DragContextClass">
+		</struct>
+		<struct name="GdkX11KeymapClass">
+		</struct>
+		<struct name="GdkX11ScreenClass">
+		</struct>
+		<struct name="GdkX11VisualClass">
+		</struct>
+		<struct name="GdkX11WindowClass">
+		</struct>
+		<object name="GdkX11AppLaunchContext" parent="GdkAppLaunchContext" type-name="GdkX11AppLaunchContext" get-type="gdk_x11_app_launch_context_get_type">
+		</object>
+		<object name="GdkX11Cursor" parent="GdkCursor" type-name="GdkX11Cursor" get-type="gdk_x11_cursor_get_type">
+			<method name="get_xcursor" symbol="gdk_x11_cursor_get_xcursor">
+				<return-type type="Cursor"/>
+				<parameters>
+					<parameter name="cursor" type="GdkCursor*"/>
+				</parameters>
+			</method>
+			<method name="get_xdisplay" symbol="gdk_x11_cursor_get_xdisplay">
+				<return-type type="Display*"/>
+				<parameters>
+					<parameter name="cursor" type="GdkCursor*"/>
+				</parameters>
+			</method>
+		</object>
+		<object name="GdkX11Display" parent="GdkDisplay" type-name="GdkX11Display" get-type="gdk_x11_display_get_type">
+			<implements>
+				<interface name="GdkEventTranslator"/>
+			</implements>
+			<method name="broadcast_startup_message" symbol="gdk_x11_display_broadcast_startup_message">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="message_type" type="char*"/>
+				</parameters>
+			</method>
+			<method name="error_trap_pop" symbol="gdk_x11_display_error_trap_pop">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+				</parameters>
+			</method>
+			<method name="error_trap_pop_ignored" symbol="gdk_x11_display_error_trap_pop_ignored">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+				</parameters>
+			</method>
+			<method name="error_trap_push" symbol="gdk_x11_display_error_trap_push">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+				</parameters>
+			</method>
+			<method name="get_startup_notification_id" symbol="gdk_x11_display_get_startup_notification_id">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+				</parameters>
+			</method>
+			<method name="get_user_time" symbol="gdk_x11_display_get_user_time">
+				<return-type type="guint32"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+				</parameters>
+			</method>
+			<method name="get_xdisplay" symbol="gdk_x11_display_get_xdisplay">
+				<return-type type="Display*"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+				</parameters>
+			</method>
+			<method name="grab" symbol="gdk_x11_display_grab">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+				</parameters>
+			</method>
+			<method name="set_cursor_theme" symbol="gdk_x11_display_set_cursor_theme">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="theme" type="gchar*"/>
+					<parameter name="size" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_startup_notification_id" symbol="gdk_x11_display_set_startup_notification_id">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="startup_id" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="string_to_compound_text" symbol="gdk_x11_display_string_to_compound_text">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="str" type="gchar*"/>
+					<parameter name="encoding" type="GdkAtom*"/>
+					<parameter name="format" type="gint*"/>
+					<parameter name="ctext" type="guchar**"/>
+					<parameter name="length" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="text_property_to_text_list" symbol="gdk_x11_display_text_property_to_text_list">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="encoding" type="GdkAtom"/>
+					<parameter name="format" type="gint"/>
+					<parameter name="text" type="guchar*"/>
+					<parameter name="length" type="gint"/>
+					<parameter name="list" type="gchar***"/>
+				</parameters>
+			</method>
+			<method name="ungrab" symbol="gdk_x11_display_ungrab">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+				</parameters>
+			</method>
+			<method name="utf8_to_compound_text" symbol="gdk_x11_display_utf8_to_compound_text">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="str" type="gchar*"/>
+					<parameter name="encoding" type="GdkAtom*"/>
+					<parameter name="format" type="gint*"/>
+					<parameter name="ctext" type="guchar**"/>
+					<parameter name="length" type="gint*"/>
+				</parameters>
+			</method>
+		</object>
+		<object name="GdkX11DisplayManager" parent="GdkDisplayManager" type-name="GdkX11DisplayManager" get-type="gdk_x11_display_manager_get_type">
+		</object>
+		<object name="GdkX11DragContext" parent="GdkDragContext" type-name="GdkX11DragContext" get-type="gdk_x11_drag_context_get_type">
+		</object>
+		<object name="GdkX11Keymap" parent="GdkKeymap" type-name="GdkX11Keymap" get-type="gdk_x11_keymap_get_type">
+		</object>
+		<object name="GdkX11Screen" parent="GdkScreen" type-name="GdkX11Screen" get-type="gdk_x11_screen_get_type">
+			<method name="get_monitor_output" symbol="gdk_x11_screen_get_monitor_output">
+				<return-type type="XID"/>
+				<parameters>
+					<parameter name="screen" type="GdkScreen*"/>
+					<parameter name="monitor_num" type="gint"/>
+				</parameters>
+			</method>
+			<method name="get_screen_number" symbol="gdk_x11_screen_get_screen_number">
+				<return-type type="int"/>
+				<parameters>
+					<parameter name="screen" type="GdkScreen*"/>
+				</parameters>
+			</method>
+			<method name="get_window_manager_name" symbol="gdk_x11_screen_get_window_manager_name">
+				<return-type type="char*"/>
+				<parameters>
+					<parameter name="screen" type="GdkScreen*"/>
+				</parameters>
+			</method>
+			<method name="get_xscreen" symbol="gdk_x11_screen_get_xscreen">
+				<return-type type="Screen*"/>
+				<parameters>
+					<parameter name="screen" type="GdkScreen*"/>
+				</parameters>
+			</method>
+			<method name="lookup_visual" symbol="gdk_x11_screen_lookup_visual">
+				<return-type type="GdkVisual*"/>
+				<parameters>
+					<parameter name="screen" type="GdkScreen*"/>
+					<parameter name="xvisualid" type="VisualID"/>
+				</parameters>
+			</method>
+			<method name="supports_net_wm_hint" symbol="gdk_x11_screen_supports_net_wm_hint">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="screen" type="GdkScreen*"/>
+					<parameter name="property" type="GdkAtom"/>
+				</parameters>
+			</method>
+			<signal name="window-manager-changed" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="GdkX11Screen*"/>
+				</parameters>
+			</signal>
+		</object>
+		<object name="GdkX11Visual" parent="GdkVisual" type-name="GdkX11Visual" get-type="gdk_x11_visual_get_type">
+			<method name="get_xvisual" symbol="gdk_x11_visual_get_xvisual">
+				<return-type type="Visual*"/>
+				<parameters>
+					<parameter name="visual" type="GdkVisual*"/>
+				</parameters>
+			</method>
+		</object>
+		<object name="GdkX11Window" parent="GdkWindow" type-name="GdkX11Window" get-type="gdk_x11_window_get_type">
+			<method name="foreign_new_for_display" symbol="gdk_x11_window_foreign_new_for_display">
+				<return-type type="GdkWindow*"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="window" type="Window"/>
+				</parameters>
+			</method>
+			<method name="get_xid" symbol="gdk_x11_window_get_xid">
+				<return-type type="Window"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
+			<method name="lookup_for_display" symbol="gdk_x11_window_lookup_for_display">
+				<return-type type="GdkWindow*"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="window" type="Window"/>
+				</parameters>
+			</method>
+			<method name="move_to_current_desktop" symbol="gdk_x11_window_move_to_current_desktop">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
+			<method name="set_user_time" symbol="gdk_x11_window_set_user_time">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="timestamp" type="guint32"/>
+				</parameters>
+			</method>
+		</object>
 	</namespace>
 </api>
diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.metadata b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.metadata
index a8c19a9..2561a02 100644
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.metadata
+++ b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.metadata
@@ -4,7 +4,4 @@ XID name="uint32"
 XImage name="pointer"
 GC name="pointer"
 Display name="pointer"
-gdkx_visual_get name="x11_visual_get"
-gdk_net_wm_supports name="x11_net_wm_supports"
-gdk_xid_table_lookup name="x11_xid_table_lookup"
-gdk_xid_table_lookup_for_display name="x11_xid_table_lookup_for_display"
+GdkEventTranslator hidden="1"
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
index a1cc6bd..a19a7e7 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
@@ -67,9 +67,6 @@ namespace Gtk {
 		public GLib.SList<GLib.File> get_files ();
 	}
 
-	[CCode (has_target = false)]
-	public delegate void CallbackMarshal (GLib.Object object, void* data, Arg[] args);
-
 	public delegate void ActionCallback (Action action);
 
 	public delegate void MenuPositionFunc (Gtk.Menu menu, out int x, out int y, out bool push_in);
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.excludes b/vapi/packages/gtk+-3.0/gtk+-3.0.excludes
index 4029716..d5efc74 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.excludes
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.excludes
@@ -1,3 +1,3 @@
-gtkfilesystem.h
+gtkcellareaboxcontextprivate.h
 gtktextdisplay.h
 gtktextlayout.h
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.files b/vapi/packages/gtk+-3.0/gtk+-3.0.files
index 212e69c..9b819f7 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.files
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.files
@@ -1,2 +1,2 @@
 include/gtk-3.0/gtk
-lib/libgtk-x11-3.0.so
+lib/libgtk-3.0.so
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.gi b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
index 9688d07..8d645fc 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.gi
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
@@ -497,9 +497,6 @@
 				<parameter name="target" type="GtkIconSize"/>
 			</parameters>
 		</function>
-		<function name="identifier_get_type" symbol="gtk_identifier_get_type">
-			<return-type type="GType"/>
-		</function>
 		<function name="init" symbol="gtk_init">
 			<return-type type="void"/>
 			<parameters>
@@ -507,13 +504,6 @@
 				<parameter name="argv" type="char***"/>
 			</parameters>
 		</function>
-		<function name="init_add" symbol="gtk_init_add">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="function" type="GtkFunction"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</function>
 		<function name="init_check" symbol="gtk_init_check">
 			<return-type type="gboolean"/>
 			<parameters>
@@ -907,43 +897,6 @@
 				<parameter name="event" type="GdkEvent*"/>
 			</parameters>
 		</function>
-		<function name="quit_add" symbol="gtk_quit_add">
-			<return-type type="guint"/>
-			<parameters>
-				<parameter name="main_level" type="guint"/>
-				<parameter name="function" type="GtkFunction"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</function>
-		<function name="quit_add_destroy" symbol="gtk_quit_add_destroy">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="main_level" type="guint"/>
-				<parameter name="object" type="GtkWidget*"/>
-			</parameters>
-		</function>
-		<function name="quit_add_full" symbol="gtk_quit_add_full">
-			<return-type type="guint"/>
-			<parameters>
-				<parameter name="main_level" type="guint"/>
-				<parameter name="function" type="GtkFunction"/>
-				<parameter name="marshal" type="GtkCallbackMarshal"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy" type="GDestroyNotify"/>
-			</parameters>
-		</function>
-		<function name="quit_remove" symbol="gtk_quit_remove">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="quit_handler_id" type="guint"/>
-			</parameters>
-		</function>
-		<function name="quit_remove_by_data" symbol="gtk_quit_remove_by_data">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</function>
 		<function name="rc_add_default_file" symbol="gtk_rc_add_default_file">
 			<return-type type="void"/>
 			<parameters>
@@ -1060,6 +1013,172 @@
 				<parameter name="filenames" type="gchar**"/>
 			</parameters>
 		</function>
+		<function name="render_activity" symbol="gtk_render_activity">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="context" type="GtkStyleContext*"/>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="x" type="gdouble"/>
+				<parameter name="y" type="gdouble"/>
+				<parameter name="width" type="gdouble"/>
+				<parameter name="height" type="gdouble"/>
+			</parameters>
+		</function>
+		<function name="render_arrow" symbol="gtk_render_arrow">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="context" type="GtkStyleContext*"/>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="angle" type="gdouble"/>
+				<parameter name="x" type="gdouble"/>
+				<parameter name="y" type="gdouble"/>
+				<parameter name="size" type="gdouble"/>
+			</parameters>
+		</function>
+		<function name="render_background" symbol="gtk_render_background">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="context" type="GtkStyleContext*"/>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="x" type="gdouble"/>
+				<parameter name="y" type="gdouble"/>
+				<parameter name="width" type="gdouble"/>
+				<parameter name="height" type="gdouble"/>
+			</parameters>
+		</function>
+		<function name="render_check" symbol="gtk_render_check">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="context" type="GtkStyleContext*"/>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="x" type="gdouble"/>
+				<parameter name="y" type="gdouble"/>
+				<parameter name="width" type="gdouble"/>
+				<parameter name="height" type="gdouble"/>
+			</parameters>
+		</function>
+		<function name="render_expander" symbol="gtk_render_expander">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="context" type="GtkStyleContext*"/>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="x" type="gdouble"/>
+				<parameter name="y" type="gdouble"/>
+				<parameter name="width" type="gdouble"/>
+				<parameter name="height" type="gdouble"/>
+			</parameters>
+		</function>
+		<function name="render_extension" symbol="gtk_render_extension">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="context" type="GtkStyleContext*"/>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="x" type="gdouble"/>
+				<parameter name="y" type="gdouble"/>
+				<parameter name="width" type="gdouble"/>
+				<parameter name="height" type="gdouble"/>
+				<parameter name="gap_side" type="GtkPositionType"/>
+			</parameters>
+		</function>
+		<function name="render_focus" symbol="gtk_render_focus">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="context" type="GtkStyleContext*"/>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="x" type="gdouble"/>
+				<parameter name="y" type="gdouble"/>
+				<parameter name="width" type="gdouble"/>
+				<parameter name="height" type="gdouble"/>
+			</parameters>
+		</function>
+		<function name="render_frame" symbol="gtk_render_frame">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="context" type="GtkStyleContext*"/>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="x" type="gdouble"/>
+				<parameter name="y" type="gdouble"/>
+				<parameter name="width" type="gdouble"/>
+				<parameter name="height" type="gdouble"/>
+			</parameters>
+		</function>
+		<function name="render_frame_gap" symbol="gtk_render_frame_gap">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="context" type="GtkStyleContext*"/>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="x" type="gdouble"/>
+				<parameter name="y" type="gdouble"/>
+				<parameter name="width" type="gdouble"/>
+				<parameter name="height" type="gdouble"/>
+				<parameter name="gap_side" type="GtkPositionType"/>
+				<parameter name="xy0_gap" type="gdouble"/>
+				<parameter name="xy1_gap" type="gdouble"/>
+			</parameters>
+		</function>
+		<function name="render_handle" symbol="gtk_render_handle">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="context" type="GtkStyleContext*"/>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="x" type="gdouble"/>
+				<parameter name="y" type="gdouble"/>
+				<parameter name="width" type="gdouble"/>
+				<parameter name="height" type="gdouble"/>
+			</parameters>
+		</function>
+		<function name="render_icon_pixbuf" symbol="gtk_render_icon_pixbuf">
+			<return-type type="GdkPixbuf*"/>
+			<parameters>
+				<parameter name="context" type="GtkStyleContext*"/>
+				<parameter name="source" type="GtkIconSource*"/>
+				<parameter name="size" type="GtkIconSize"/>
+			</parameters>
+		</function>
+		<function name="render_layout" symbol="gtk_render_layout">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="context" type="GtkStyleContext*"/>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="x" type="gdouble"/>
+				<parameter name="y" type="gdouble"/>
+				<parameter name="layout" type="PangoLayout*"/>
+			</parameters>
+		</function>
+		<function name="render_line" symbol="gtk_render_line">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="context" type="GtkStyleContext*"/>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="x0" type="gdouble"/>
+				<parameter name="y0" type="gdouble"/>
+				<parameter name="x1" type="gdouble"/>
+				<parameter name="y1" type="gdouble"/>
+			</parameters>
+		</function>
+		<function name="render_option" symbol="gtk_render_option">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="context" type="GtkStyleContext*"/>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="x" type="gdouble"/>
+				<parameter name="y" type="gdouble"/>
+				<parameter name="width" type="gdouble"/>
+				<parameter name="height" type="gdouble"/>
+			</parameters>
+		</function>
+		<function name="render_slider" symbol="gtk_render_slider">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="context" type="GtkStyleContext*"/>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="x" type="gdouble"/>
+				<parameter name="y" type="gdouble"/>
+				<parameter name="width" type="gdouble"/>
+				<parameter name="height" type="gdouble"/>
+				<parameter name="orientation" type="GtkOrientation"/>
+			</parameters>
+		</function>
 		<function name="rgb_to_hsv" symbol="gtk_rgb_to_hsv">
 			<return-type type="void"/>
 			<parameters>
@@ -1134,9 +1253,6 @@
 				<parameter name="flags" type="guint"/>
 			</parameters>
 		</function>
-		<function name="set_locale" symbol="gtk_set_locale">
-			<return-type type="gchar*"/>
-		</function>
 		<function name="show_about_dialog" symbol="gtk_show_about_dialog">
 			<return-type type="void"/>
 			<parameters>
@@ -1421,13 +1537,20 @@
 				<parameter name="data" type="gpointer"/>
 			</parameters>
 		</callback>
-		<callback name="GtkCallbackMarshal">
-			<return-type type="void"/>
+		<callback name="GtkCellAllocCallback">
+			<return-type type="gboolean"/>
 			<parameters>
-				<parameter name="object" type="GObject*"/>
+				<parameter name="renderer" type="GtkCellRenderer*"/>
+				<parameter name="cell_area" type="GdkRectangle*"/>
+				<parameter name="cell_background" type="GdkRectangle*"/>
+				<parameter name="data" type="gpointer"/>
+			</parameters>
+		</callback>
+		<callback name="GtkCellCallback">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="renderer" type="GtkCellRenderer*"/>
 				<parameter name="data" type="gpointer"/>
-				<parameter name="n_args" type="guint"/>
-				<parameter name="args" type="GtkArg*"/>
 			</parameters>
 		</callback>
 		<callback name="GtkCellLayoutDataFunc">
@@ -1538,12 +1661,6 @@
 				<parameter name="data" type="gpointer"/>
 			</parameters>
 		</callback>
-		<callback name="GtkFunction">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</callback>
 		<callback name="GtkIconViewForeachFunc">
 			<return-type type="void"/>
 			<parameters>
@@ -1628,6 +1745,14 @@
 				<parameter name="user_data" type="gpointer"/>
 			</parameters>
 		</callback>
+		<callback name="GtkStylePropertyParser">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="string" type="gchar*"/>
+				<parameter name="value" type="GValue*"/>
+				<parameter name="error" type="GError**"/>
+			</parameters>
+		</callback>
 		<callback name="GtkTextBufferDeserializeFunc">
 			<return-type type="gboolean"/>
 			<parameters>
@@ -1791,16 +1916,6 @@
 				<parameter name="user_data" type="gpointer"/>
 			</parameters>
 		</callback>
-		<callback name="GtkWindowKeysForeachFunc">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="window" type="GtkWindow*"/>
-				<parameter name="keyval" type="guint"/>
-				<parameter name="modifiers" type="GdkModifierType"/>
-				<parameter name="is_mnemonic" type="gboolean"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</callback>
 		<struct name="GtkAccelGroupEntry">
 			<field name="key" type="GtkAccelKey"/>
 			<field name="closure" type="GClosure*"/>
@@ -1823,11 +1938,6 @@
 		</struct>
 		<struct name="GtkAllocation">
 		</struct>
-		<struct name="GtkArg">
-			<field name="type" type="GType"/>
-			<field name="name" type="gchar*"/>
-			<field name="d" type="gpointer"/>
-		</struct>
 		<struct name="GtkBindingArg">
 			<field name="arg_type" type="GType"/>
 			<field name="d" type="gpointer"/>
@@ -2059,15 +2169,6 @@
 			<field name="minimum_size" type="gint"/>
 			<field name="natural_size" type="gint"/>
 		</struct>
-		<struct name="GtkRulerMetric">
-			<field name="metric_name" type="gchar*"/>
-			<field name="abbrev" type="gchar*"/>
-			<field name="pixels_per_unit" type="gdouble"/>
-			<field name="ruler_scale" type="gdouble[]"/>
-			<field name="subdivide" type="gint[]"/>
-		</struct>
-		<struct name="GtkSettingsPropertyValue">
-		</struct>
 		<struct name="GtkSettingsValue">
 			<field name="origin" type="gchar*"/>
 			<field name="value" type="GValue"/>
@@ -2125,16 +2226,12 @@
 			<field name="bg_color" type="GdkColor"/>
 			<field name="fg_color" type="GdkColor"/>
 			<field name="rise" type="gint"/>
-			<field name="padding1" type="gpointer"/>
 			<field name="underline" type="guint"/>
 			<field name="strikethrough" type="guint"/>
 			<field name="draw_bg" type="guint"/>
 			<field name="inside_selection" type="guint"/>
 			<field name="is_text" type="guint"/>
-			<field name="pad1" type="guint"/>
-			<field name="pad2" type="guint"/>
-			<field name="pad3" type="guint"/>
-			<field name="pad4" type="guint"/>
+			<field name="padding" type="guint[]"/>
 		</struct>
 		<struct name="GtkTextBTree">
 		</struct>
@@ -2179,6 +2276,56 @@
 			<field name="top" type="gint16"/>
 			<field name="bottom" type="gint16"/>
 		</boxed>
+		<boxed name="GtkGradient" type-name="GtkGradient" get-type="gtk_gradient_get_type">
+			<method name="add_color_stop" symbol="gtk_gradient_add_color_stop">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="gradient" type="GtkGradient*"/>
+					<parameter name="offset" type="gdouble"/>
+					<parameter name="color" type="GtkSymbolicColor*"/>
+				</parameters>
+			</method>
+			<constructor name="new_linear" symbol="gtk_gradient_new_linear">
+				<return-type type="GtkGradient*"/>
+				<parameters>
+					<parameter name="x0" type="gdouble"/>
+					<parameter name="y0" type="gdouble"/>
+					<parameter name="x1" type="gdouble"/>
+					<parameter name="y1" type="gdouble"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_radial" symbol="gtk_gradient_new_radial">
+				<return-type type="GtkGradient*"/>
+				<parameters>
+					<parameter name="x0" type="gdouble"/>
+					<parameter name="y0" type="gdouble"/>
+					<parameter name="radius0" type="gdouble"/>
+					<parameter name="x1" type="gdouble"/>
+					<parameter name="y1" type="gdouble"/>
+					<parameter name="radius1" type="gdouble"/>
+				</parameters>
+			</constructor>
+			<method name="ref" symbol="gtk_gradient_ref">
+				<return-type type="GtkGradient*"/>
+				<parameters>
+					<parameter name="gradient" type="GtkGradient*"/>
+				</parameters>
+			</method>
+			<method name="resolve" symbol="gtk_gradient_resolve">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="gradient" type="GtkGradient*"/>
+					<parameter name="props" type="GtkStyleProperties*"/>
+					<parameter name="resolved_gradient" type="cairo_pattern_t**"/>
+				</parameters>
+			</method>
+			<method name="unref" symbol="gtk_gradient_unref">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="gradient" type="GtkGradient*"/>
+				</parameters>
+			</method>
+		</boxed>
 		<boxed name="GtkIconInfo" type-name="GtkIconInfo" get-type="gtk_icon_info_get_type">
 			<method name="copy" symbol="gtk_icon_info_copy">
 				<return-type type="GtkIconInfo*"/>
@@ -2250,12 +2397,11 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
-			<method name="load_symbolic_for_style" symbol="gtk_icon_info_load_symbolic_for_style">
+			<method name="load_symbolic_for_context" symbol="gtk_icon_info_load_symbolic_for_context">
 				<return-type type="GdkPixbuf*"/>
 				<parameters>
 					<parameter name="icon_info" type="GtkIconInfo*"/>
-					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="state" type="GtkStateType"/>
+					<parameter name="context" type="GtkStyleContext*"/>
 					<parameter name="was_symbolic" type="gboolean*"/>
 					<parameter name="error" type="GError**"/>
 				</parameters>
@@ -2321,7 +2467,15 @@
 					<parameter name="state" type="GtkStateType"/>
 					<parameter name="size" type="GtkIconSize"/>
 					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="detail" type="char*"/>
+					<parameter name="detail" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="render_icon_pixbuf" symbol="gtk_icon_set_render_icon_pixbuf">
+				<return-type type="GdkPixbuf*"/>
+				<parameters>
+					<parameter name="icon_set" type="GtkIconSet*"/>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="size" type="GtkIconSize"/>
 				</parameters>
 			</method>
 			<method name="unref" symbol="gtk_icon_set_unref">
@@ -2819,6 +2973,13 @@
 					<parameter name="selection_data" type="GtkSelectionData*"/>
 				</parameters>
 			</method>
+			<method name="get_data_with_length" symbol="gtk_selection_data_get_data_with_length">
+				<return-type type="guchar*"/>
+				<parameters>
+					<parameter name="selection_data" type="GtkSelectionData*"/>
+					<parameter name="length" type="gint*"/>
+				</parameters>
+			</method>
 			<method name="get_display" symbol="gtk_selection_data_get_display">
 				<return-type type="GdkDisplay*"/>
 				<parameters>
@@ -2933,13 +3094,62 @@
 					<parameter name="selection_data" type="GtkSelectionData*"/>
 				</parameters>
 			</method>
-			<field name="_g_sealed__selection" type="GdkAtom"/>
-			<field name="_g_sealed__target" type="GdkAtom"/>
-			<field name="_g_sealed__type" type="GdkAtom"/>
-			<field name="_g_sealed__format" type="gint"/>
-			<field name="_g_sealed__data" type="guchar*"/>
-			<field name="_g_sealed__length" type="gint"/>
-			<field name="_g_sealed__display" type="GdkDisplay*"/>
+		</boxed>
+		<boxed name="GtkSymbolicColor" type-name="GtkSymbolicColor" get-type="gtk_symbolic_color_get_type">
+			<constructor name="new_alpha" symbol="gtk_symbolic_color_new_alpha">
+				<return-type type="GtkSymbolicColor*"/>
+				<parameters>
+					<parameter name="color" type="GtkSymbolicColor*"/>
+					<parameter name="factor" type="gdouble"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_literal" symbol="gtk_symbolic_color_new_literal">
+				<return-type type="GtkSymbolicColor*"/>
+				<parameters>
+					<parameter name="color" type="GdkRGBA*"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_mix" symbol="gtk_symbolic_color_new_mix">
+				<return-type type="GtkSymbolicColor*"/>
+				<parameters>
+					<parameter name="color1" type="GtkSymbolicColor*"/>
+					<parameter name="color2" type="GtkSymbolicColor*"/>
+					<parameter name="factor" type="gdouble"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_name" symbol="gtk_symbolic_color_new_name">
+				<return-type type="GtkSymbolicColor*"/>
+				<parameters>
+					<parameter name="name" type="gchar*"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_shade" symbol="gtk_symbolic_color_new_shade">
+				<return-type type="GtkSymbolicColor*"/>
+				<parameters>
+					<parameter name="color" type="GtkSymbolicColor*"/>
+					<parameter name="factor" type="gdouble"/>
+				</parameters>
+			</constructor>
+			<method name="ref" symbol="gtk_symbolic_color_ref">
+				<return-type type="GtkSymbolicColor*"/>
+				<parameters>
+					<parameter name="color" type="GtkSymbolicColor*"/>
+				</parameters>
+			</method>
+			<method name="resolve" symbol="gtk_symbolic_color_resolve">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="color" type="GtkSymbolicColor*"/>
+					<parameter name="props" type="GtkStyleProperties*"/>
+					<parameter name="resolved_color" type="GdkRGBA*"/>
+				</parameters>
+			</method>
+			<method name="unref" symbol="gtk_symbolic_color_unref">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="color" type="GtkSymbolicColor*"/>
+				</parameters>
+			</method>
 		</boxed>
 		<boxed name="GtkTargetEntry" type-name="GtkTargetEntry" get-type="gtk_target_entry_get_type">
 			<method name="copy" symbol="gtk_target_entry_copy">
@@ -3088,8 +3298,8 @@
 			<field name="font" type="PangoFontDescription*"/>
 			<field name="font_scale" type="gdouble"/>
 			<field name="left_margin" type="gint"/>
-			<field name="indent" type="gint"/>
 			<field name="right_margin" type="gint"/>
+			<field name="indent" type="gint"/>
 			<field name="pixels_above_lines" type="gint"/>
 			<field name="pixels_below_lines" type="gint"/>
 			<field name="pixels_inside_wrap" type="gint"/>
@@ -3100,10 +3310,7 @@
 			<field name="invisible" type="guint"/>
 			<field name="bg_full_height" type="guint"/>
 			<field name="editable" type="guint"/>
-			<field name="pad1" type="guint"/>
-			<field name="pad2" type="guint"/>
-			<field name="pad3" type="guint"/>
-			<field name="pad4" type="guint"/>
+			<field name="padding" type="guint[]"/>
 		</boxed>
 		<boxed name="GtkTextIter" type-name="GtkTextIter" get-type="gtk_text_iter_get_type">
 			<method name="backward_char" symbol="gtk_text_iter_backward_char">
@@ -3922,6 +4129,204 @@
 				</parameters>
 			</method>
 		</boxed>
+		<boxed name="GtkWidgetPath" type-name="GtkWidgetPath" get-type="gtk_widget_path_get_type">
+			<method name="append_type" symbol="gtk_widget_path_append_type">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="type" type="GType"/>
+				</parameters>
+			</method>
+			<method name="copy" symbol="gtk_widget_path_copy">
+				<return-type type="GtkWidgetPath*"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+				</parameters>
+			</method>
+			<method name="free" symbol="gtk_widget_path_free">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+				</parameters>
+			</method>
+			<method name="get_object_type" symbol="gtk_widget_path_get_object_type">
+				<return-type type="GType"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+				</parameters>
+			</method>
+			<method name="has_parent" symbol="gtk_widget_path_has_parent">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="type" type="GType"/>
+				</parameters>
+			</method>
+			<method name="is_type" symbol="gtk_widget_path_is_type">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="type" type="GType"/>
+				</parameters>
+			</method>
+			<method name="iter_add_class" symbol="gtk_widget_path_iter_add_class">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+					<parameter name="name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="iter_add_region" symbol="gtk_widget_path_iter_add_region">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+					<parameter name="name" type="gchar*"/>
+					<parameter name="flags" type="GtkRegionFlags"/>
+				</parameters>
+			</method>
+			<method name="iter_clear_classes" symbol="gtk_widget_path_iter_clear_classes">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+				</parameters>
+			</method>
+			<method name="iter_clear_regions" symbol="gtk_widget_path_iter_clear_regions">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+				</parameters>
+			</method>
+			<method name="iter_get_name" symbol="gtk_widget_path_iter_get_name">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+				</parameters>
+			</method>
+			<method name="iter_get_object_type" symbol="gtk_widget_path_iter_get_object_type">
+				<return-type type="GType"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+				</parameters>
+			</method>
+			<method name="iter_has_class" symbol="gtk_widget_path_iter_has_class">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+					<parameter name="name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="iter_has_name" symbol="gtk_widget_path_iter_has_name">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+					<parameter name="name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="iter_has_qclass" symbol="gtk_widget_path_iter_has_qclass">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+					<parameter name="qname" type="GQuark"/>
+				</parameters>
+			</method>
+			<method name="iter_has_qname" symbol="gtk_widget_path_iter_has_qname">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+					<parameter name="qname" type="GQuark"/>
+				</parameters>
+			</method>
+			<method name="iter_has_qregion" symbol="gtk_widget_path_iter_has_qregion">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+					<parameter name="qname" type="GQuark"/>
+					<parameter name="flags" type="GtkRegionFlags*"/>
+				</parameters>
+			</method>
+			<method name="iter_has_region" symbol="gtk_widget_path_iter_has_region">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+					<parameter name="name" type="gchar*"/>
+					<parameter name="flags" type="GtkRegionFlags*"/>
+				</parameters>
+			</method>
+			<method name="iter_list_classes" symbol="gtk_widget_path_iter_list_classes">
+				<return-type type="GSList*"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+				</parameters>
+			</method>
+			<method name="iter_list_regions" symbol="gtk_widget_path_iter_list_regions">
+				<return-type type="GSList*"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+				</parameters>
+			</method>
+			<method name="iter_remove_class" symbol="gtk_widget_path_iter_remove_class">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+					<parameter name="name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="iter_remove_region" symbol="gtk_widget_path_iter_remove_region">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+					<parameter name="name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="iter_set_name" symbol="gtk_widget_path_iter_set_name">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+					<parameter name="name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="iter_set_object_type" symbol="gtk_widget_path_iter_set_object_type">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="pos" type="gint"/>
+					<parameter name="type" type="GType"/>
+				</parameters>
+			</method>
+			<method name="length" symbol="gtk_widget_path_length">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gtk_widget_path_new">
+				<return-type type="GtkWidgetPath*"/>
+			</constructor>
+			<method name="prepend_type" symbol="gtk_widget_path_prepend_type">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="type" type="GType"/>
+				</parameters>
+			</method>
+		</boxed>
 		<enum name="GtkAlign" type-name="GtkAlign" get-type="gtk_align_get_type">
 			<member name="GTK_ALIGN_FILL" value="0"/>
 			<member name="GTK_ALIGN_START" value="1"/>
@@ -3948,6 +4353,12 @@
 			<member name="GTK_ASSISTANT_PAGE_PROGRESS" value="4"/>
 			<member name="GTK_ASSISTANT_PAGE_CUSTOM" value="5"/>
 		</enum>
+		<enum name="GtkBorderStyle" type-name="GtkBorderStyle" get-type="gtk_border_style_get_type">
+			<member name="GTK_BORDER_STYLE_NONE" value="0"/>
+			<member name="GTK_BORDER_STYLE_SOLID" value="1"/>
+			<member name="GTK_BORDER_STYLE_INSET" value="2"/>
+			<member name="GTK_BORDER_STYLE_OUTSET" value="3"/>
+		</enum>
 		<enum name="GtkBuilderError" type-name="GtkBuilderError" get-type="gtk_builder_error_get_type">
 			<member name="GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION" value="0"/>
 			<member name="GTK_BUILDER_ERROR_UNHANDLED_TAG" value="1"/>
@@ -3989,6 +4400,9 @@
 			<member name="GTK_CORNER_TOP_RIGHT" value="2"/>
 			<member name="GTK_CORNER_BOTTOM_RIGHT" value="3"/>
 		</enum>
+		<enum name="GtkCssProviderError" type-name="GtkCssProviderError" get-type="gtk_css_provider_error_get_type">
+			<member name="GTK_CSS_PROVIDER_ERROR_FAILED" value="0"/>
+		</enum>
 		<enum name="GtkDeleteType" type-name="GtkDeleteType" get-type="gtk_delete_type_get_type">
 			<member name="GTK_DELETE_CHARS" value="0"/>
 			<member name="GTK_DELETE_WORD_ENDS" value="1"/>
@@ -4112,11 +4526,6 @@
 			<member name="GTK_MESSAGE_ERROR" value="3"/>
 			<member name="GTK_MESSAGE_OTHER" value="4"/>
 		</enum>
-		<enum name="GtkMetricType" type-name="GtkMetricType" get-type="gtk_metric_type_get_type">
-			<member name="GTK_PIXELS" value="0"/>
-			<member name="GTK_INCHES" value="1"/>
-			<member name="GTK_CENTIMETERS" value="2"/>
-		</enum>
 		<enum name="GtkMovementStep" type-name="GtkMovementStep" get-type="gtk_movement_step_get_type">
 			<member name="GTK_MOVEMENT_LOGICAL_POSITIONS" value="0"/>
 			<member name="GTK_MOVEMENT_VISUAL_POSITIONS" value="1"/>
@@ -4403,6 +4812,8 @@
 			<member name="GTK_STATE_PRELIGHT" value="2"/>
 			<member name="GTK_STATE_SELECTED" value="3"/>
 			<member name="GTK_STATE_INSENSITIVE" value="4"/>
+			<member name="GTK_STATE_INCONSISTENT" value="5"/>
+			<member name="GTK_STATE_FOCUSED" value="6"/>
 		</enum>
 		<enum name="GtkTextBufferTargetInfo" type-name="GtkTextBufferTargetInfo" get-type="gtk_text_buffer_target_info_get_type">
 			<member name="GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS" value="-1"/>
@@ -4456,11 +4867,6 @@
 			<member name="GTK_UNIT_INCH" value="2"/>
 			<member name="GTK_UNIT_MM" value="3"/>
 		</enum>
-		<enum name="GtkUpdateType" type-name="GtkUpdateType" get-type="gtk_update_type_get_type">
-			<member name="GTK_UPDATE_CONTINUOUS" value="0"/>
-			<member name="GTK_UPDATE_DISCONTINUOUS" value="1"/>
-			<member name="GTK_UPDATE_DELAYED" value="2"/>
-		</enum>
 		<enum name="GtkWidgetHelpType" type-name="GtkWidgetHelpType" get-type="gtk_widget_help_type_get_type">
 			<member name="GTK_WIDGET_HELP_TOOLTIP" value="0"/>
 			<member name="GTK_WIDGET_HELP_WHATS_THIS" value="1"/>
@@ -4544,6 +4950,17 @@
 			<member name="GTK_ICON_LOOKUP_GENERIC_FALLBACK" value="8"/>
 			<member name="GTK_ICON_LOOKUP_FORCE_SIZE" value="16"/>
 		</flags>
+		<flags name="GtkJunctionSides" type-name="GtkJunctionSides" get-type="gtk_junction_sides_get_type">
+			<member name="GTK_JUNCTION_NONE" value="0"/>
+			<member name="GTK_JUNCTION_CORNER_TOPLEFT" value="1"/>
+			<member name="GTK_JUNCTION_CORNER_TOPRIGHT" value="2"/>
+			<member name="GTK_JUNCTION_CORNER_BOTTOMLEFT" value="4"/>
+			<member name="GTK_JUNCTION_CORNER_BOTTOMRIGHT" value="8"/>
+			<member name="GTK_JUNCTION_TOP" value="3"/>
+			<member name="GTK_JUNCTION_BOTTOM" value="12"/>
+			<member name="GTK_JUNCTION_LEFT" value="5"/>
+			<member name="GTK_JUNCTION_RIGHT" value="10"/>
+		</flags>
 		<flags name="GtkRcFlags" type-name="GtkRcFlags" get-type="gtk_rc_flags_get_type">
 			<member name="GTK_RC_FG" value="1"/>
 			<member name="GTK_RC_BG" value="2"/>
@@ -4558,6 +4975,22 @@
 			<member name="GTK_RECENT_FILTER_GROUP" value="16"/>
 			<member name="GTK_RECENT_FILTER_AGE" value="32"/>
 		</flags>
+		<flags name="GtkRegionFlags" type-name="GtkRegionFlags" get-type="gtk_region_flags_get_type">
+			<member name="GTK_REGION_EVEN" value="1"/>
+			<member name="GTK_REGION_ODD" value="2"/>
+			<member name="GTK_REGION_FIRST" value="4"/>
+			<member name="GTK_REGION_LAST" value="8"/>
+			<member name="GTK_REGION_SORTED" value="32"/>
+		</flags>
+		<flags name="GtkStateFlags" type-name="GtkStateFlags" get-type="gtk_state_flags_get_type">
+			<member name="GTK_STATE_FLAG_NORMAL" value="0"/>
+			<member name="GTK_STATE_FLAG_ACTIVE" value="1"/>
+			<member name="GTK_STATE_FLAG_PRELIGHT" value="2"/>
+			<member name="GTK_STATE_FLAG_SELECTED" value="4"/>
+			<member name="GTK_STATE_FLAG_INSENSITIVE" value="8"/>
+			<member name="GTK_STATE_FLAG_INCONSISTENT" value="16"/>
+			<member name="GTK_STATE_FLAG_FOCUSED" value="32"/>
+		</flags>
 		<flags name="GtkTargetFlags" type-name="GtkTargetFlags" get-type="gtk_target_flags_get_type">
 			<member name="GTK_TARGET_SAME_APP" value="1"/>
 			<member name="GTK_TARGET_SAME_WIDGET" value="2"/>
@@ -5829,6 +6262,214 @@
 			<property name="yalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="yscale" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
 		</object>
+		<object name="GtkAppChooserButton" parent="GtkComboBox" type-name="GtkAppChooserButton" get-type="gtk_app_chooser_button_get_type">
+			<implements>
+				<interface name="AtkImplementor"/>
+				<interface name="GtkBuildable"/>
+				<interface name="GtkCellLayout"/>
+				<interface name="GtkCellEditable"/>
+				<interface name="GtkAppChooser"/>
+			</implements>
+			<method name="append_custom_item" symbol="gtk_app_chooser_button_append_custom_item">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserButton*"/>
+					<parameter name="name" type="gchar*"/>
+					<parameter name="label" type="gchar*"/>
+					<parameter name="icon" type="GIcon*"/>
+				</parameters>
+			</method>
+			<method name="append_separator" symbol="gtk_app_chooser_button_append_separator">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserButton*"/>
+				</parameters>
+			</method>
+			<method name="get_show_dialog_item" symbol="gtk_app_chooser_button_get_show_dialog_item">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserButton*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gtk_app_chooser_button_new">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="content_type" type="gchar*"/>
+				</parameters>
+			</constructor>
+			<method name="set_active_custom_item" symbol="gtk_app_chooser_button_set_active_custom_item">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserButton*"/>
+					<parameter name="name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="set_show_dialog_item" symbol="gtk_app_chooser_button_set_show_dialog_item">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserButton*"/>
+					<parameter name="setting" type="gboolean"/>
+				</parameters>
+			</method>
+			<property name="show-dialog-item" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+			<signal name="custom-item-activated" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserButton*"/>
+					<parameter name="item_name" type="char*"/>
+				</parameters>
+			</signal>
+		</object>
+		<object name="GtkAppChooserDialog" parent="GtkDialog" type-name="GtkAppChooserDialog" get-type="gtk_app_chooser_dialog_get_type">
+			<implements>
+				<interface name="AtkImplementor"/>
+				<interface name="GtkBuildable"/>
+				<interface name="GtkAppChooser"/>
+			</implements>
+			<method name="get_widget" symbol="gtk_app_chooser_dialog_get_widget">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserDialog*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gtk_app_chooser_dialog_new">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="parent" type="GtkWindow*"/>
+					<parameter name="flags" type="GtkDialogFlags"/>
+					<parameter name="file" type="GFile*"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_for_content_type" symbol="gtk_app_chooser_dialog_new_for_content_type">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="parent" type="GtkWindow*"/>
+					<parameter name="flags" type="GtkDialogFlags"/>
+					<parameter name="content_type" type="gchar*"/>
+				</parameters>
+			</constructor>
+			<property name="gfile" type="GFile*" readable="1" writable="1" construct="0" construct-only="1"/>
+		</object>
+		<object name="GtkAppChooserWidget" parent="GtkBox" type-name="GtkAppChooserWidget" get-type="gtk_app_chooser_widget_get_type">
+			<implements>
+				<interface name="AtkImplementor"/>
+				<interface name="GtkBuildable"/>
+				<interface name="GtkOrientable"/>
+				<interface name="GtkAppChooser"/>
+			</implements>
+			<method name="get_default_text" symbol="gtk_app_chooser_widget_get_default_text">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserWidget*"/>
+				</parameters>
+			</method>
+			<method name="get_show_all" symbol="gtk_app_chooser_widget_get_show_all">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserWidget*"/>
+				</parameters>
+			</method>
+			<method name="get_show_default" symbol="gtk_app_chooser_widget_get_show_default">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserWidget*"/>
+				</parameters>
+			</method>
+			<method name="get_show_fallback" symbol="gtk_app_chooser_widget_get_show_fallback">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserWidget*"/>
+				</parameters>
+			</method>
+			<method name="get_show_other" symbol="gtk_app_chooser_widget_get_show_other">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserWidget*"/>
+				</parameters>
+			</method>
+			<method name="get_show_recommended" symbol="gtk_app_chooser_widget_get_show_recommended">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserWidget*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gtk_app_chooser_widget_new">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="content_type" type="gchar*"/>
+				</parameters>
+			</constructor>
+			<method name="set_default_text" symbol="gtk_app_chooser_widget_set_default_text">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserWidget*"/>
+					<parameter name="text" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="set_show_all" symbol="gtk_app_chooser_widget_set_show_all">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserWidget*"/>
+					<parameter name="setting" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_show_default" symbol="gtk_app_chooser_widget_set_show_default">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserWidget*"/>
+					<parameter name="setting" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_show_fallback" symbol="gtk_app_chooser_widget_set_show_fallback">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserWidget*"/>
+					<parameter name="setting" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_show_other" symbol="gtk_app_chooser_widget_set_show_other">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserWidget*"/>
+					<parameter name="setting" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_show_recommended" symbol="gtk_app_chooser_widget_set_show_recommended">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserWidget*"/>
+					<parameter name="setting" type="gboolean"/>
+				</parameters>
+			</method>
+			<property name="default-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="show-all" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="show-default" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="show-fallback" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="show-other" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="show-recommended" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+			<signal name="application-activated" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserWidget*"/>
+					<parameter name="app_info" type="GAppInfo*"/>
+				</parameters>
+			</signal>
+			<signal name="application-selected" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserWidget*"/>
+					<parameter name="app_info" type="GAppInfo*"/>
+				</parameters>
+			</signal>
+			<signal name="populate-popup" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooserWidget*"/>
+					<parameter name="menu" type="GtkMenu*"/>
+					<parameter name="app_info" type="GAppInfo*"/>
+				</parameters>
+			</signal>
+		</object>
 		<object name="GtkApplication" parent="GApplication" type-name="GtkApplication" get-type="gtk_application_get_type">
 			<implements>
 				<interface name="GActionGroup"/>
@@ -6736,6 +7377,778 @@
 				</parameters>
 			</signal>
 		</object>
+		<object name="GtkCellArea" parent="GInitiallyUnowned" type-name="GtkCellArea" get-type="gtk_cell_area_get_type">
+			<implements>
+				<interface name="GtkCellLayout"/>
+				<interface name="GtkBuildable"/>
+			</implements>
+			<method name="activate" symbol="gtk_cell_area_activate">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="cell_area" type="GdkRectangle*"/>
+					<parameter name="flags" type="GtkCellRendererState"/>
+					<parameter name="edit_only" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="activate_cell" symbol="gtk_cell_area_activate_cell">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="event" type="GdkEvent*"/>
+					<parameter name="cell_area" type="GdkRectangle*"/>
+					<parameter name="flags" type="GtkCellRendererState"/>
+				</parameters>
+			</method>
+			<method name="add" symbol="gtk_cell_area_add">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+				</parameters>
+			</method>
+			<method name="add_focus_sibling" symbol="gtk_cell_area_add_focus_sibling">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="sibling" type="GtkCellRenderer*"/>
+				</parameters>
+			</method>
+			<method name="add_with_properties" symbol="gtk_cell_area_add_with_properties">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="first_prop_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="apply_attributes" symbol="gtk_cell_area_apply_attributes">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="tree_model" type="GtkTreeModel*"/>
+					<parameter name="iter" type="GtkTreeIter*"/>
+					<parameter name="is_expander" type="gboolean"/>
+					<parameter name="is_expanded" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="attribute_connect" symbol="gtk_cell_area_attribute_connect">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="attribute" type="gchar*"/>
+					<parameter name="column" type="gint"/>
+				</parameters>
+			</method>
+			<method name="attribute_disconnect" symbol="gtk_cell_area_attribute_disconnect">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="attribute" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="cell_get" symbol="gtk_cell_area_cell_get">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="first_prop_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="cell_get_property" symbol="gtk_cell_area_cell_get_property">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="property_name" type="gchar*"/>
+					<parameter name="value" type="GValue*"/>
+				</parameters>
+			</method>
+			<method name="cell_get_valist" symbol="gtk_cell_area_cell_get_valist">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="first_property_name" type="gchar*"/>
+					<parameter name="var_args" type="va_list"/>
+				</parameters>
+			</method>
+			<method name="cell_set" symbol="gtk_cell_area_cell_set">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="first_prop_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="cell_set_property" symbol="gtk_cell_area_cell_set_property">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="property_name" type="gchar*"/>
+					<parameter name="value" type="GValue*"/>
+				</parameters>
+			</method>
+			<method name="cell_set_valist" symbol="gtk_cell_area_cell_set_valist">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="first_property_name" type="gchar*"/>
+					<parameter name="var_args" type="va_list"/>
+				</parameters>
+			</method>
+			<method name="class_find_cell_property" symbol="gtk_cell_area_class_find_cell_property">
+				<return-type type="GParamSpec*"/>
+				<parameters>
+					<parameter name="aclass" type="GtkCellAreaClass*"/>
+					<parameter name="property_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="class_install_cell_property" symbol="gtk_cell_area_class_install_cell_property">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="aclass" type="GtkCellAreaClass*"/>
+					<parameter name="property_id" type="guint"/>
+					<parameter name="pspec" type="GParamSpec*"/>
+				</parameters>
+			</method>
+			<method name="class_list_cell_properties" symbol="gtk_cell_area_class_list_cell_properties">
+				<return-type type="GParamSpec**"/>
+				<parameters>
+					<parameter name="aclass" type="GtkCellAreaClass*"/>
+					<parameter name="n_properties" type="guint*"/>
+				</parameters>
+			</method>
+			<method name="copy_context" symbol="gtk_cell_area_copy_context">
+				<return-type type="GtkCellAreaContext*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+				</parameters>
+			</method>
+			<method name="create_context" symbol="gtk_cell_area_create_context">
+				<return-type type="GtkCellAreaContext*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+				</parameters>
+			</method>
+			<method name="event" symbol="gtk_cell_area_event">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="event" type="GdkEvent*"/>
+					<parameter name="cell_area" type="GdkRectangle*"/>
+					<parameter name="flags" type="GtkCellRendererState"/>
+				</parameters>
+			</method>
+			<method name="focus" symbol="gtk_cell_area_focus">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="direction" type="GtkDirectionType"/>
+				</parameters>
+			</method>
+			<method name="foreach" symbol="gtk_cell_area_foreach">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="callback" type="GtkCellCallback"/>
+					<parameter name="callback_data" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="foreach_alloc" symbol="gtk_cell_area_foreach_alloc">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="cell_area" type="GdkRectangle*"/>
+					<parameter name="background_area" type="GdkRectangle*"/>
+					<parameter name="callback" type="GtkCellAllocCallback"/>
+					<parameter name="callback_data" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="get_cell_allocation" symbol="gtk_cell_area_get_cell_allocation">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="cell_area" type="GdkRectangle*"/>
+					<parameter name="allocation" type="GdkRectangle*"/>
+				</parameters>
+			</method>
+			<method name="get_cell_at_position" symbol="gtk_cell_area_get_cell_at_position">
+				<return-type type="GtkCellRenderer*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="cell_area" type="GdkRectangle*"/>
+					<parameter name="x" type="gint"/>
+					<parameter name="y" type="gint"/>
+					<parameter name="alloc_area" type="GdkRectangle*"/>
+				</parameters>
+			</method>
+			<method name="get_current_path_string" symbol="gtk_cell_area_get_current_path_string">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+				</parameters>
+			</method>
+			<method name="get_edit_widget" symbol="gtk_cell_area_get_edit_widget">
+				<return-type type="GtkCellEditable*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+				</parameters>
+			</method>
+			<method name="get_edited_cell" symbol="gtk_cell_area_get_edited_cell">
+				<return-type type="GtkCellRenderer*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+				</parameters>
+			</method>
+			<method name="get_focus_cell" symbol="gtk_cell_area_get_focus_cell">
+				<return-type type="GtkCellRenderer*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+				</parameters>
+			</method>
+			<method name="get_focus_from_sibling" symbol="gtk_cell_area_get_focus_from_sibling">
+				<return-type type="GtkCellRenderer*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+				</parameters>
+			</method>
+			<method name="get_focus_siblings" symbol="gtk_cell_area_get_focus_siblings">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+				</parameters>
+			</method>
+			<method name="get_preferred_height" symbol="gtk_cell_area_get_preferred_height">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="minimum_height" type="gint*"/>
+					<parameter name="natural_height" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_preferred_height_for_width" symbol="gtk_cell_area_get_preferred_height_for_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="minimum_height" type="gint*"/>
+					<parameter name="natural_height" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_preferred_width" symbol="gtk_cell_area_get_preferred_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="minimum_width" type="gint*"/>
+					<parameter name="natural_width" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_preferred_width_for_height" symbol="gtk_cell_area_get_preferred_width_for_height">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="height" type="gint"/>
+					<parameter name="minimum_width" type="gint*"/>
+					<parameter name="natural_width" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_request_mode" symbol="gtk_cell_area_get_request_mode">
+				<return-type type="GtkSizeRequestMode"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+				</parameters>
+			</method>
+			<method name="get_style_detail" symbol="gtk_cell_area_get_style_detail">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+				</parameters>
+			</method>
+			<method name="has_renderer" symbol="gtk_cell_area_has_renderer">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+				</parameters>
+			</method>
+			<method name="inner_cell_area" symbol="gtk_cell_area_inner_cell_area">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="cell_area" type="GdkRectangle*"/>
+					<parameter name="inner_area" type="GdkRectangle*"/>
+				</parameters>
+			</method>
+			<method name="is_activatable" symbol="gtk_cell_area_is_activatable">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+				</parameters>
+			</method>
+			<method name="is_focus_sibling" symbol="gtk_cell_area_is_focus_sibling">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="sibling" type="GtkCellRenderer*"/>
+				</parameters>
+			</method>
+			<method name="remove" symbol="gtk_cell_area_remove">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+				</parameters>
+			</method>
+			<method name="remove_focus_sibling" symbol="gtk_cell_area_remove_focus_sibling">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="sibling" type="GtkCellRenderer*"/>
+				</parameters>
+			</method>
+			<method name="render" symbol="gtk_cell_area_render">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="cr" type="cairo_t*"/>
+					<parameter name="background_area" type="GdkRectangle*"/>
+					<parameter name="cell_area" type="GdkRectangle*"/>
+					<parameter name="flags" type="GtkCellRendererState"/>
+					<parameter name="paint_focus" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="request_renderer" symbol="gtk_cell_area_request_renderer">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="orientation" type="GtkOrientation"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="for_size" type="gint"/>
+					<parameter name="minimum_size" type="gint*"/>
+					<parameter name="natural_size" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="set_focus_cell" symbol="gtk_cell_area_set_focus_cell">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+				</parameters>
+			</method>
+			<method name="set_style_detail" symbol="gtk_cell_area_set_style_detail">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="detail" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="stop_editing" symbol="gtk_cell_area_stop_editing">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="canceled" type="gboolean"/>
+				</parameters>
+			</method>
+			<property name="edit-widget" type="GtkCellEditable*" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="edited-cell" type="GtkCellRenderer*" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="focus-cell" type="GtkCellRenderer*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="add-editable" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="GtkCellArea*"/>
+					<parameter name="p0" type="GtkCellRenderer*"/>
+					<parameter name="p1" type="GtkCellEditable*"/>
+					<parameter name="p2" type="GdkRectangle*"/>
+					<parameter name="p3" type="char*"/>
+				</parameters>
+			</signal>
+			<signal name="apply-attributes" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="tree_model" type="GtkTreeModel*"/>
+					<parameter name="iter" type="GtkTreeIter*"/>
+					<parameter name="is_expander" type="gboolean"/>
+					<parameter name="is_expanded" type="gboolean"/>
+				</parameters>
+			</signal>
+			<signal name="focus-changed" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="GtkCellArea*"/>
+					<parameter name="p0" type="GtkCellRenderer*"/>
+					<parameter name="p1" type="char*"/>
+				</parameters>
+			</signal>
+			<signal name="remove-editable" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="GtkCellArea*"/>
+					<parameter name="p0" type="GtkCellRenderer*"/>
+					<parameter name="p1" type="GtkCellEditable*"/>
+				</parameters>
+			</signal>
+			<vfunc name="activate">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="cell_area" type="GdkRectangle*"/>
+					<parameter name="flags" type="GtkCellRendererState"/>
+					<parameter name="edit_only" type="gboolean"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="add">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="copy_context">
+				<return-type type="GtkCellAreaContext*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="create_context">
+				<return-type type="GtkCellAreaContext*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="event">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="event" type="GdkEvent*"/>
+					<parameter name="cell_area" type="GdkRectangle*"/>
+					<parameter name="flags" type="GtkCellRendererState"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="focus">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="direction" type="GtkDirectionType"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="foreach">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="callback" type="GtkCellCallback"/>
+					<parameter name="callback_data" type="gpointer"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="foreach_alloc">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="cell_area" type="GdkRectangle*"/>
+					<parameter name="background_area" type="GdkRectangle*"/>
+					<parameter name="callback" type="GtkCellAllocCallback"/>
+					<parameter name="callback_data" type="gpointer"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_cell_property">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="property_id" type="guint"/>
+					<parameter name="value" type="GValue*"/>
+					<parameter name="pspec" type="GParamSpec*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_preferred_height">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="minimum_height" type="gint*"/>
+					<parameter name="natural_height" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_preferred_height_for_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="minimum_height" type="gint*"/>
+					<parameter name="natural_height" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_preferred_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="minimum_width" type="gint*"/>
+					<parameter name="natural_width" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_preferred_width_for_height">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="height" type="gint"/>
+					<parameter name="minimum_width" type="gint*"/>
+					<parameter name="natural_width" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_request_mode">
+				<return-type type="GtkSizeRequestMode"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="is_activatable">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="remove">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="render">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="cr" type="cairo_t*"/>
+					<parameter name="background_area" type="GdkRectangle*"/>
+					<parameter name="cell_area" type="GdkRectangle*"/>
+					<parameter name="flags" type="GtkCellRendererState"/>
+					<parameter name="paint_focus" type="gboolean"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="set_cell_property">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="property_id" type="guint"/>
+					<parameter name="value" type="GValue*"/>
+					<parameter name="pspec" type="GParamSpec*"/>
+				</parameters>
+			</vfunc>
+		</object>
+		<object name="GtkCellAreaBox" parent="GtkCellArea" type-name="GtkCellAreaBox" get-type="gtk_cell_area_box_get_type">
+			<implements>
+				<interface name="GtkCellLayout"/>
+				<interface name="GtkBuildable"/>
+				<interface name="GtkOrientable"/>
+			</implements>
+			<method name="get_spacing" symbol="gtk_cell_area_box_get_spacing">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="box" type="GtkCellAreaBox*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gtk_cell_area_box_new">
+				<return-type type="GtkCellArea*"/>
+			</constructor>
+			<method name="pack_end" symbol="gtk_cell_area_box_pack_end">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="box" type="GtkCellAreaBox*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="expand" type="gboolean"/>
+					<parameter name="align" type="gboolean"/>
+					<parameter name="fixed" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="pack_start" symbol="gtk_cell_area_box_pack_start">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="box" type="GtkCellAreaBox*"/>
+					<parameter name="renderer" type="GtkCellRenderer*"/>
+					<parameter name="expand" type="gboolean"/>
+					<parameter name="align" type="gboolean"/>
+					<parameter name="fixed" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_spacing" symbol="gtk_cell_area_box_set_spacing">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="box" type="GtkCellAreaBox*"/>
+					<parameter name="spacing" type="gint"/>
+				</parameters>
+			</method>
+			<property name="spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+		</object>
+		<object name="GtkCellAreaContext" parent="GObject" type-name="GtkCellAreaContext" get-type="gtk_cell_area_context_get_type">
+			<method name="allocate" symbol="gtk_cell_area_context_allocate">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="height" type="gint"/>
+				</parameters>
+			</method>
+			<method name="get_allocation" symbol="gtk_cell_area_context_get_allocation">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="width" type="gint*"/>
+					<parameter name="height" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_area" symbol="gtk_cell_area_context_get_area">
+				<return-type type="GtkCellArea*"/>
+				<parameters>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+				</parameters>
+			</method>
+			<method name="get_preferred_height" symbol="gtk_cell_area_context_get_preferred_height">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="minimum_height" type="gint*"/>
+					<parameter name="natural_height" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_preferred_height_for_width" symbol="gtk_cell_area_context_get_preferred_height_for_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="minimum_height" type="gint*"/>
+					<parameter name="natural_height" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_preferred_width" symbol="gtk_cell_area_context_get_preferred_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="minimum_width" type="gint*"/>
+					<parameter name="natural_width" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_preferred_width_for_height" symbol="gtk_cell_area_context_get_preferred_width_for_height">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="height" type="gint"/>
+					<parameter name="minimum_width" type="gint*"/>
+					<parameter name="natural_width" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="push_preferred_height" symbol="gtk_cell_area_context_push_preferred_height">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="minimum_height" type="gint"/>
+					<parameter name="natural_height" type="gint"/>
+				</parameters>
+			</method>
+			<method name="push_preferred_width" symbol="gtk_cell_area_context_push_preferred_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="minimum_width" type="gint"/>
+					<parameter name="natural_width" type="gint"/>
+				</parameters>
+			</method>
+			<method name="reset" symbol="gtk_cell_area_context_reset">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+				</parameters>
+			</method>
+			<property name="area" type="GtkCellArea*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="minimum-height" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="minimum-width" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="natural-height" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="natural-width" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
+			<vfunc name="allocate">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="height" type="gint"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_preferred_height_for_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="minimum_height" type="gint*"/>
+					<parameter name="natural_height" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_preferred_width_for_height">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+					<parameter name="height" type="gint"/>
+					<parameter name="minimum_width" type="gint*"/>
+					<parameter name="natural_width" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="reset">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+				</parameters>
+			</vfunc>
+		</object>
 		<object name="GtkCellRenderer" parent="GInitiallyUnowned" type-name="GtkCellRenderer" get-type="gtk_cell_renderer_get_type">
 			<method name="activate" symbol="gtk_cell_renderer_activate">
 				<return-type type="gboolean"/>
@@ -6749,6 +8162,16 @@
 					<parameter name="flags" type="GtkCellRendererState"/>
 				</parameters>
 			</method>
+			<method name="get_aligned_area" symbol="gtk_cell_renderer_get_aligned_area">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="flags" type="GtkCellRendererState"/>
+					<parameter name="cell_area" type="GdkRectangle*"/>
+					<parameter name="aligned_area" type="GdkRectangle*"/>
+				</parameters>
+			</method>
 			<method name="get_alignment" symbol="gtk_cell_renderer_get_alignment">
 				<return-type type="void"/>
 				<parameters>
@@ -6838,6 +8261,12 @@
 					<parameter name="cell" type="GtkCellRenderer*"/>
 				</parameters>
 			</method>
+			<method name="is_activatable" symbol="gtk_cell_renderer_is_activatable">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+				</parameters>
+			</method>
 			<method name="render" symbol="gtk_cell_renderer_render">
 				<return-type type="void"/>
 				<parameters>
@@ -6948,6 +8377,16 @@
 					<parameter name="flags" type="GtkCellRendererState"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="get_aligned_area">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="flags" type="GtkCellRendererState"/>
+					<parameter name="cell_area" type="GdkRectangle*"/>
+					<parameter name="aligned_area" type="GdkRectangle*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="get_preferred_height">
 				<return-type type="void"/>
 				<parameters>
@@ -7242,28 +8681,22 @@
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
 				<interface name="GtkCellLayout"/>
+				<interface name="GtkOrientable"/>
 			</implements>
-			<method name="get_desired_height_for_width_of_row" symbol="gtk_cell_view_get_desired_height_for_width_of_row">
-				<return-type type="void"/>
+			<method name="get_displayed_row" symbol="gtk_cell_view_get_displayed_row">
+				<return-type type="GtkTreePath*"/>
 				<parameters>
 					<parameter name="cell_view" type="GtkCellView*"/>
-					<parameter name="path" type="GtkTreePath*"/>
-					<parameter name="avail_size" type="gint"/>
-					<parameter name="minimum_size" type="gint*"/>
-					<parameter name="natural_size" type="gint*"/>
 				</parameters>
 			</method>
-			<method name="get_desired_width_of_row" symbol="gtk_cell_view_get_desired_width_of_row">
-				<return-type type="void"/>
+			<method name="get_draw_sensitive" symbol="gtk_cell_view_get_draw_sensitive">
+				<return-type type="gboolean"/>
 				<parameters>
 					<parameter name="cell_view" type="GtkCellView*"/>
-					<parameter name="path" type="GtkTreePath*"/>
-					<parameter name="minimum_size" type="gint*"/>
-					<parameter name="natural_size" type="gint*"/>
 				</parameters>
 			</method>
-			<method name="get_displayed_row" symbol="gtk_cell_view_get_displayed_row">
-				<return-type type="GtkTreePath*"/>
+			<method name="get_fit_model" symbol="gtk_cell_view_get_fit_model">
+				<return-type type="gboolean"/>
 				<parameters>
 					<parameter name="cell_view" type="GtkCellView*"/>
 				</parameters>
@@ -7277,6 +8710,13 @@
 			<constructor name="new" symbol="gtk_cell_view_new">
 				<return-type type="GtkWidget*"/>
 			</constructor>
+			<constructor name="new_with_context" symbol="gtk_cell_view_new_with_context">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+					<parameter name="context" type="GtkCellAreaContext*"/>
+				</parameters>
+			</constructor>
 			<constructor name="new_with_markup" symbol="gtk_cell_view_new_with_markup">
 				<return-type type="GtkWidget*"/>
 				<parameters>
@@ -7316,6 +8756,20 @@
 					<parameter name="path" type="GtkTreePath*"/>
 				</parameters>
 			</method>
+			<method name="set_draw_sensitive" symbol="gtk_cell_view_set_draw_sensitive">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell_view" type="GtkCellView*"/>
+					<parameter name="draw_sensitive" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_fit_model" symbol="gtk_cell_view_set_fit_model">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell_view" type="GtkCellView*"/>
+					<parameter name="fit_model" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_model" symbol="gtk_cell_view_set_model">
 				<return-type type="void"/>
 				<parameters>
@@ -7327,6 +8781,10 @@
 			<property name="background-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="background-rgba" type="GdkRGBA*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="background-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="cell-area" type="GtkCellArea*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="cell-area-context" type="GtkCellAreaContext*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="draw-sensitive" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="fit-model" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="model" type="GtkTreeModel*" readable="1" writable="1" construct="0" construct-only="0"/>
 		</object>
 		<object name="GtkCheckButton" parent="GtkToggleButton" type-name="GtkCheckButton" get-type="gtk_check_button_get_type">
@@ -7947,6 +9405,12 @@
 					<parameter name="combo_box" type="GtkComboBox*"/>
 				</parameters>
 			</method>
+			<method name="get_active_id" symbol="gtk_combo_box_get_active_id">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="combo_box" type="GtkComboBox*"/>
+				</parameters>
+			</method>
 			<method name="get_active_iter" symbol="gtk_combo_box_get_active_iter">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -7990,6 +9454,12 @@
 					<parameter name="combo_box" type="GtkComboBox*"/>
 				</parameters>
 			</method>
+			<method name="get_id_column" symbol="gtk_combo_box_get_id_column">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="combo_box" type="GtkComboBox*"/>
+				</parameters>
+			</method>
 			<method name="get_model" symbol="gtk_combo_box_get_model">
 				<return-type type="GtkTreeModel*"/>
 				<parameters>
@@ -8035,6 +9505,18 @@
 			<constructor name="new" symbol="gtk_combo_box_new">
 				<return-type type="GtkWidget*"/>
 			</constructor>
+			<constructor name="new_with_area" symbol="gtk_combo_box_new_with_area">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_with_area_and_entry" symbol="gtk_combo_box_new_with_area_and_entry">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+				</parameters>
+			</constructor>
 			<constructor name="new_with_entry" symbol="gtk_combo_box_new_with_entry">
 				<return-type type="GtkWidget*"/>
 			</constructor>
@@ -8076,6 +9558,13 @@
 					<parameter name="index_" type="gint"/>
 				</parameters>
 			</method>
+			<method name="set_active_id" symbol="gtk_combo_box_set_active_id">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="combo_box" type="GtkComboBox*"/>
+					<parameter name="active_id" type="gchar*"/>
+				</parameters>
+			</method>
 			<method name="set_active_iter" symbol="gtk_combo_box_set_active_iter">
 				<return-type type="void"/>
 				<parameters>
@@ -8118,6 +9607,13 @@
 					<parameter name="focus_on_click" type="gboolean"/>
 				</parameters>
 			</method>
+			<method name="set_id_column" symbol="gtk_combo_box_set_id_column">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="combo_box" type="GtkComboBox*"/>
+					<parameter name="id_column" type="gint"/>
+				</parameters>
+			</method>
 			<method name="set_model" symbol="gtk_combo_box_set_model">
 				<return-type type="void"/>
 				<parameters>
@@ -8163,13 +9659,16 @@
 				</parameters>
 			</method>
 			<property name="active" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="active-id" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="add-tearoffs" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="button-sensitivity" type="GtkSensitivityType" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="cell-area" type="GtkCellArea*" readable="1" writable="1" construct="0" construct-only="1"/>
 			<property name="column-span-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="entry-text-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="focus-on-click" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="has-entry" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
 			<property name="has-frame" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="id-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="model" type="GtkTreeModel*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="popup-fixed-width" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="popup-shown" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
@@ -8209,6 +9708,14 @@
 				<interface name="GtkCellLayout"/>
 				<interface name="GtkCellEditable"/>
 			</implements>
+			<method name="append" symbol="gtk_combo_box_text_append">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="combo_box" type="GtkComboBoxText*"/>
+					<parameter name="id" type="gchar*"/>
+					<parameter name="text" type="gchar*"/>
+				</parameters>
+			</method>
 			<method name="append_text" symbol="gtk_combo_box_text_append_text">
 				<return-type type="void"/>
 				<parameters>
@@ -8222,6 +9729,15 @@
 					<parameter name="combo_box" type="GtkComboBoxText*"/>
 				</parameters>
 			</method>
+			<method name="insert" symbol="gtk_combo_box_text_insert">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="combo_box" type="GtkComboBoxText*"/>
+					<parameter name="position" type="gint"/>
+					<parameter name="id" type="gchar*"/>
+					<parameter name="text" type="gchar*"/>
+				</parameters>
+			</method>
 			<method name="insert_text" symbol="gtk_combo_box_text_insert_text">
 				<return-type type="void"/>
 				<parameters>
@@ -8236,6 +9752,14 @@
 			<constructor name="new_with_entry" symbol="gtk_combo_box_text_new_with_entry">
 				<return-type type="GtkWidget*"/>
 			</constructor>
+			<method name="prepend" symbol="gtk_combo_box_text_prepend">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="combo_box" type="GtkComboBoxText*"/>
+					<parameter name="id" type="gchar*"/>
+					<parameter name="text" type="gchar*"/>
+				</parameters>
+			</method>
 			<method name="prepend_text" symbol="gtk_combo_box_text_prepend_text">
 				<return-type type="void"/>
 				<parameters>
@@ -8422,6 +9946,13 @@
 					<parameter name="container" type="GtkContainer*"/>
 				</parameters>
 			</method>
+			<method name="get_path_for_child" symbol="gtk_container_get_path_for_child">
+				<return-type type="GtkWidgetPath*"/>
+				<parameters>
+					<parameter name="container" type="GtkContainer*"/>
+					<parameter name="child" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_resize_mode" symbol="gtk_container_get_resize_mode">
 				<return-type type="GtkResizeMode"/>
 				<parameters>
@@ -8566,6 +10097,13 @@
 					<parameter name="pspec" type="GParamSpec*"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="get_path_for_child">
+				<return-type type="GtkWidgetPath*"/>
+				<parameters>
+					<parameter name="container" type="GtkContainer*"/>
+					<parameter name="child" type="GtkWidget*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="set_child_property">
 				<return-type type="void"/>
 				<parameters>
@@ -8577,6 +10115,52 @@
 				</parameters>
 			</vfunc>
 		</object>
+		<object name="GtkCssProvider" parent="GObject" type-name="GtkCssProvider" get-type="gtk_css_provider_get_type">
+			<implements>
+				<interface name="GtkStyleProvider"/>
+			</implements>
+			<method name="error_quark" symbol="gtk_css_provider_error_quark">
+				<return-type type="GQuark"/>
+			</method>
+			<method name="get_default" symbol="gtk_css_provider_get_default">
+				<return-type type="GtkCssProvider*"/>
+			</method>
+			<method name="get_named" symbol="gtk_css_provider_get_named">
+				<return-type type="GtkCssProvider*"/>
+				<parameters>
+					<parameter name="name" type="gchar*"/>
+					<parameter name="variant" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="load_from_data" symbol="gtk_css_provider_load_from_data">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="css_provider" type="GtkCssProvider*"/>
+					<parameter name="data" type="gchar*"/>
+					<parameter name="length" type="gssize"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="load_from_file" symbol="gtk_css_provider_load_from_file">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="css_provider" type="GtkCssProvider*"/>
+					<parameter name="file" type="GFile*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="load_from_path" symbol="gtk_css_provider_load_from_path">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="css_provider" type="GtkCssProvider*"/>
+					<parameter name="path" type="gchar*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gtk_css_provider_new">
+				<return-type type="GtkCssProvider*"/>
+			</constructor>
+		</object>
 		<object name="GtkDialog" parent="GtkWindow" type-name="GtkDialog" get-type="gtk_dialog_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
@@ -8708,6 +10292,7 @@
 			<constructor name="new" symbol="gtk_drawing_area_new">
 				<return-type type="GtkWidget*"/>
 			</constructor>
+			<field name="dummy" type="gpointer"/>
 		</object>
 		<object name="GtkEntry" parent="GtkWidget" type-name="GtkEntry" get-type="gtk_entry_get_type">
 			<implements>
@@ -9521,6 +11106,12 @@
 			<constructor name="new" symbol="gtk_entry_completion_new">
 				<return-type type="GtkEntryCompletion*"/>
 			</constructor>
+			<constructor name="new_with_area" symbol="gtk_entry_completion_new_with_area">
+				<return-type type="GtkEntryCompletion*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+				</parameters>
+			</constructor>
 			<method name="set_inline_completion" symbol="gtk_entry_completion_set_inline_completion">
 				<return-type type="void"/>
 				<parameters>
@@ -9586,6 +11177,7 @@
 					<parameter name="column" type="gint"/>
 				</parameters>
 			</method>
+			<property name="cell-area" type="GtkCellArea*" readable="1" writable="1" construct="0" construct-only="1"/>
 			<property name="inline-completion" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="inline-selection" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="minimum-key-length" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -10422,16 +12014,6 @@
 				<return-type type="GtkWidget*"/>
 			</constructor>
 		</object>
-		<object name="GtkHRuler" parent="GtkRuler" type-name="GtkHRuler" get-type="gtk_hruler_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-				<interface name="GtkOrientable"/>
-			</implements>
-			<constructor name="new" symbol="gtk_hruler_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-		</object>
 		<object name="GtkHSV" parent="GtkWidget" type-name="GtkHSV" get-type="gtk_hsv_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
@@ -11273,6 +12855,12 @@
 			<constructor name="new" symbol="gtk_icon_view_new">
 				<return-type type="GtkWidget*"/>
 			</constructor>
+			<constructor name="new_with_area" symbol="gtk_icon_view_new_with_area">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+				</parameters>
+			</constructor>
 			<constructor name="new_with_model" symbol="gtk_icon_view_new_with_model">
 				<return-type type="GtkWidget*"/>
 				<parameters>
@@ -11481,6 +13069,7 @@
 					<parameter name="icon_view" type="GtkIconView*"/>
 				</parameters>
 			</method>
+			<property name="cell-area" type="GtkCellArea*" readable="1" writable="1" construct="0" construct-only="1"/>
 			<property name="column-spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="columns" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="item-orientation" type="GtkOrientation" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -12873,6 +14462,12 @@
 					<parameter name="menu_item" type="GtkMenuItem*"/>
 				</parameters>
 			</method>
+			<method name="get_reserve_indicator" symbol="gtk_menu_item_get_reserve_indicator">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="menu_item" type="GtkMenuItem*"/>
+				</parameters>
+			</method>
 			<method name="get_right_justified" symbol="gtk_menu_item_get_right_justified">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -12926,6 +14521,13 @@
 					<parameter name="label" type="gchar*"/>
 				</parameters>
 			</method>
+			<method name="set_reserve_indicator" symbol="gtk_menu_item_set_reserve_indicator">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="menu_item" type="GtkMenuItem*"/>
+					<parameter name="reserve" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_right_justified" symbol="gtk_menu_item_set_right_justified">
 				<return-type type="void"/>
 				<parameters>
@@ -13056,6 +14658,18 @@
 					<parameter name="menu_shell" type="GtkMenuShell*"/>
 				</parameters>
 			</method>
+			<method name="get_parent_shell" symbol="gtk_menu_shell_get_parent_shell">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="menu_shell" type="GtkMenuShell*"/>
+				</parameters>
+			</method>
+			<method name="get_selected_item" symbol="gtk_menu_shell_get_selected_item">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="menu_shell" type="GtkMenuShell*"/>
+				</parameters>
+			</method>
 			<method name="get_take_focus" symbol="gtk_menu_shell_get_take_focus">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -13790,6 +15404,94 @@
 				</parameters>
 			</vfunc>
 		</object>
+		<object name="GtkNumerableIcon" parent="GEmblemedIcon" type-name="GtkNumerableIcon" get-type="gtk_numerable_icon_get_type">
+			<implements>
+				<interface name="GIcon"/>
+			</implements>
+			<method name="get_background_gicon" symbol="gtk_numerable_icon_get_background_gicon">
+				<return-type type="GIcon*"/>
+				<parameters>
+					<parameter name="self" type="GtkNumerableIcon*"/>
+				</parameters>
+			</method>
+			<method name="get_background_icon_name" symbol="gtk_numerable_icon_get_background_icon_name">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="self" type="GtkNumerableIcon*"/>
+				</parameters>
+			</method>
+			<method name="get_count" symbol="gtk_numerable_icon_get_count">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="self" type="GtkNumerableIcon*"/>
+				</parameters>
+			</method>
+			<method name="get_label" symbol="gtk_numerable_icon_get_label">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="self" type="GtkNumerableIcon*"/>
+				</parameters>
+			</method>
+			<method name="get_style_context" symbol="gtk_numerable_icon_get_style_context">
+				<return-type type="GtkStyleContext*"/>
+				<parameters>
+					<parameter name="self" type="GtkNumerableIcon*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gtk_numerable_icon_new">
+				<return-type type="GIcon*"/>
+				<parameters>
+					<parameter name="base_icon" type="GIcon*"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_with_style_context" symbol="gtk_numerable_icon_new_with_style_context">
+				<return-type type="GIcon*"/>
+				<parameters>
+					<parameter name="base_icon" type="GIcon*"/>
+					<parameter name="context" type="GtkStyleContext*"/>
+				</parameters>
+			</constructor>
+			<method name="set_background_gicon" symbol="gtk_numerable_icon_set_background_gicon">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkNumerableIcon*"/>
+					<parameter name="icon" type="GIcon*"/>
+				</parameters>
+			</method>
+			<method name="set_background_icon_name" symbol="gtk_numerable_icon_set_background_icon_name">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkNumerableIcon*"/>
+					<parameter name="icon_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="set_count" symbol="gtk_numerable_icon_set_count">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkNumerableIcon*"/>
+					<parameter name="count" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_label" symbol="gtk_numerable_icon_set_label">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkNumerableIcon*"/>
+					<parameter name="label" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="set_style_context" symbol="gtk_numerable_icon_set_style_context">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkNumerableIcon*"/>
+					<parameter name="style" type="GtkStyleContext*"/>
+				</parameters>
+			</method>
+			<property name="background-icon" type="GIcon*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="background-icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="count" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="label" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="style-context" type="GtkStyleContext*" readable="1" writable="1" construct="0" construct-only="0"/>
+		</object>
 		<object name="GtkOffscreenWindow" parent="GtkWindow" type-name="GtkOffscreenWindow" get-type="gtk_offscreen_window_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
@@ -15479,12 +17181,6 @@
 					<parameter name="range" type="GtkRange*"/>
 				</parameters>
 			</method>
-			<method name="get_update_policy" symbol="gtk_range_get_update_policy">
-				<return-type type="GtkUpdateType"/>
-				<parameters>
-					<parameter name="range" type="GtkRange*"/>
-				</parameters>
-			</method>
 			<method name="get_upper_stepper_sensitivity" symbol="gtk_range_get_upper_stepper_sensitivity">
 				<return-type type="GtkSensitivityType"/>
 				<parameters>
@@ -15576,13 +17272,6 @@
 					<parameter name="size_fixed" type="gboolean"/>
 				</parameters>
 			</method>
-			<method name="set_update_policy" symbol="gtk_range_set_update_policy">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="range" type="GtkRange*"/>
-					<parameter name="policy" type="GtkUpdateType"/>
-				</parameters>
-			</method>
 			<method name="set_upper_stepper_sensitivity" symbol="gtk_range_set_upper_stepper_sensitivity">
 				<return-type type="void"/>
 				<parameters>
@@ -15603,7 +17292,6 @@
 			<property name="lower-stepper-sensitivity" type="GtkSensitivityType" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="restrict-to-fill-level" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="show-fill-level" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="update-policy" type="GtkUpdateType" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="upper-stepper-sensitivity" type="GtkSensitivityType" readable="1" writable="1" construct="0" construct-only="0"/>
 			<signal name="adjust-bounds" when="LAST">
 				<return-type type="void"/>
@@ -15977,71 +17665,6 @@
 				</parameters>
 			</signal>
 		</object>
-		<object name="GtkRuler" parent="GtkWidget" type-name="GtkRuler" get-type="gtk_ruler_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-				<interface name="GtkOrientable"/>
-			</implements>
-			<method name="get_metric" symbol="gtk_ruler_get_metric">
-				<return-type type="GtkMetricType"/>
-				<parameters>
-					<parameter name="ruler" type="GtkRuler*"/>
-				</parameters>
-			</method>
-			<method name="get_range" symbol="gtk_ruler_get_range">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="ruler" type="GtkRuler*"/>
-					<parameter name="lower" type="gdouble*"/>
-					<parameter name="upper" type="gdouble*"/>
-					<parameter name="position" type="gdouble*"/>
-					<parameter name="max_size" type="gdouble*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="gtk_ruler_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="orientation" type="GtkOrientation"/>
-				</parameters>
-			</constructor>
-			<method name="set_metric" symbol="gtk_ruler_set_metric">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="ruler" type="GtkRuler*"/>
-					<parameter name="metric" type="GtkMetricType"/>
-				</parameters>
-			</method>
-			<method name="set_range" symbol="gtk_ruler_set_range">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="ruler" type="GtkRuler*"/>
-					<parameter name="lower" type="gdouble"/>
-					<parameter name="upper" type="gdouble"/>
-					<parameter name="position" type="gdouble"/>
-					<parameter name="max_size" type="gdouble"/>
-				</parameters>
-			</method>
-			<property name="lower" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="max-size" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="metric" type="GtkMetricType" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="position" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="upper" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-			<vfunc name="draw_pos">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="ruler" type="GtkRuler*"/>
-					<parameter name="cr" type="cairo_t*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="draw_ticks">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="ruler" type="GtkRuler*"/>
-					<parameter name="cr" type="cairo_t*"/>
-				</parameters>
-			</vfunc>
-		</object>
 		<object name="GtkScale" parent="GtkRange" type-name="GtkScale" get-type="gtk_scale_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
@@ -16467,6 +18090,9 @@
 			<property name="draw" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 		</object>
 		<object name="GtkSettings" parent="GObject" type-name="GtkSettings" get-type="gtk_settings_get_type">
+			<implements>
+				<interface name="GtkStyleProvider"/>
+			</implements>
 			<method name="get_default" symbol="gtk_settings_get_default">
 				<return-type type="GtkSettings*"/>
 			</method>
@@ -17348,6 +18974,12 @@
 					<parameter name="var_args" type="va_list"/>
 				</parameters>
 			</method>
+			<method name="has_context" symbol="gtk_style_has_context">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="style" type="GtkStyle*"/>
+				</parameters>
+			</method>
 			<method name="lookup_color" symbol="gtk_style_lookup_color">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -17386,6 +19018,7 @@
 					<parameter name="state_type" type="GtkStateType"/>
 				</parameters>
 			</method>
+			<property name="context" type="GtkStyleContext*" readable="1" writable="1" construct="0" construct-only="1"/>
 			<signal name="realize" when="FIRST">
 				<return-type type="void"/>
 				<parameters>
@@ -17762,6 +19395,495 @@
 			<field name="property_cache" type="GArray*"/>
 			<field name="icon_factories" type="GSList*"/>
 		</object>
+		<object name="GtkStyleContext" parent="GObject" type-name="GtkStyleContext" get-type="gtk_style_context_get_type">
+			<method name="add_class" symbol="gtk_style_context_add_class">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="class_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="add_provider" symbol="gtk_style_context_add_provider">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="provider" type="GtkStyleProvider*"/>
+					<parameter name="priority" type="guint"/>
+				</parameters>
+			</method>
+			<method name="add_provider_for_screen" symbol="gtk_style_context_add_provider_for_screen">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="screen" type="GdkScreen*"/>
+					<parameter name="provider" type="GtkStyleProvider*"/>
+					<parameter name="priority" type="guint"/>
+				</parameters>
+			</method>
+			<method name="add_region" symbol="gtk_style_context_add_region">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="region_name" type="gchar*"/>
+					<parameter name="flags" type="GtkRegionFlags"/>
+				</parameters>
+			</method>
+			<method name="cancel_animations" symbol="gtk_style_context_cancel_animations">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="region_id" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="get" symbol="gtk_style_context_get">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+				</parameters>
+			</method>
+			<method name="get_background_color" symbol="gtk_style_context_get_background_color">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="color" type="GdkRGBA*"/>
+				</parameters>
+			</method>
+			<method name="get_border" symbol="gtk_style_context_get_border">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="border" type="GtkBorder*"/>
+				</parameters>
+			</method>
+			<method name="get_border_color" symbol="gtk_style_context_get_border_color">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="color" type="GdkRGBA*"/>
+				</parameters>
+			</method>
+			<method name="get_color" symbol="gtk_style_context_get_color">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="color" type="GdkRGBA*"/>
+				</parameters>
+			</method>
+			<method name="get_direction" symbol="gtk_style_context_get_direction">
+				<return-type type="GtkTextDirection"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+				</parameters>
+			</method>
+			<method name="get_font" symbol="gtk_style_context_get_font">
+				<return-type type="PangoFontDescription*"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+				</parameters>
+			</method>
+			<method name="get_junction_sides" symbol="gtk_style_context_get_junction_sides">
+				<return-type type="GtkJunctionSides"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+				</parameters>
+			</method>
+			<method name="get_margin" symbol="gtk_style_context_get_margin">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="margin" type="GtkBorder*"/>
+				</parameters>
+			</method>
+			<method name="get_padding" symbol="gtk_style_context_get_padding">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="padding" type="GtkBorder*"/>
+				</parameters>
+			</method>
+			<method name="get_path" symbol="gtk_style_context_get_path">
+				<return-type type="GtkWidgetPath*"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+				</parameters>
+			</method>
+			<method name="get_property" symbol="gtk_style_context_get_property">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="property" type="gchar*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="value" type="GValue*"/>
+				</parameters>
+			</method>
+			<method name="get_screen" symbol="gtk_style_context_get_screen">
+				<return-type type="GdkScreen*"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+				</parameters>
+			</method>
+			<method name="get_state" symbol="gtk_style_context_get_state">
+				<return-type type="GtkStateFlags"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+				</parameters>
+			</method>
+			<method name="get_style" symbol="gtk_style_context_get_style">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+				</parameters>
+			</method>
+			<method name="get_style_property" symbol="gtk_style_context_get_style_property">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="property_name" type="gchar*"/>
+					<parameter name="value" type="GValue*"/>
+				</parameters>
+			</method>
+			<method name="get_style_valist" symbol="gtk_style_context_get_style_valist">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="args" type="va_list"/>
+				</parameters>
+			</method>
+			<method name="get_valist" symbol="gtk_style_context_get_valist">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="args" type="va_list"/>
+				</parameters>
+			</method>
+			<method name="has_class" symbol="gtk_style_context_has_class">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="class_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="has_region" symbol="gtk_style_context_has_region">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="region_name" type="gchar*"/>
+					<parameter name="flags_return" type="GtkRegionFlags*"/>
+				</parameters>
+			</method>
+			<method name="invalidate" symbol="gtk_style_context_invalidate">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+				</parameters>
+			</method>
+			<method name="list_classes" symbol="gtk_style_context_list_classes">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+				</parameters>
+			</method>
+			<method name="list_regions" symbol="gtk_style_context_list_regions">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+				</parameters>
+			</method>
+			<method name="lookup_color" symbol="gtk_style_context_lookup_color">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="color_name" type="gchar*"/>
+					<parameter name="color" type="GdkRGBA*"/>
+				</parameters>
+			</method>
+			<method name="lookup_icon_set" symbol="gtk_style_context_lookup_icon_set">
+				<return-type type="GtkIconSet*"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="stock_id" type="gchar*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gtk_style_context_new">
+				<return-type type="GtkStyleContext*"/>
+			</constructor>
+			<method name="notify_state_change" symbol="gtk_style_context_notify_state_change">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="region_id" type="gpointer"/>
+					<parameter name="state" type="GtkStateType"/>
+					<parameter name="state_value" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="pop_animatable_region" symbol="gtk_style_context_pop_animatable_region">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+				</parameters>
+			</method>
+			<method name="push_animatable_region" symbol="gtk_style_context_push_animatable_region">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="region_id" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="remove_class" symbol="gtk_style_context_remove_class">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="class_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="remove_provider" symbol="gtk_style_context_remove_provider">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="provider" type="GtkStyleProvider*"/>
+				</parameters>
+			</method>
+			<method name="remove_provider_for_screen" symbol="gtk_style_context_remove_provider_for_screen">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="screen" type="GdkScreen*"/>
+					<parameter name="provider" type="GtkStyleProvider*"/>
+				</parameters>
+			</method>
+			<method name="remove_region" symbol="gtk_style_context_remove_region">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="region_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="reset_widgets" symbol="gtk_style_context_reset_widgets">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="screen" type="GdkScreen*"/>
+				</parameters>
+			</method>
+			<method name="restore" symbol="gtk_style_context_restore">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+				</parameters>
+			</method>
+			<method name="save" symbol="gtk_style_context_save">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+				</parameters>
+			</method>
+			<method name="scroll_animations" symbol="gtk_style_context_scroll_animations">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="dx" type="gint"/>
+					<parameter name="dy" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_background" symbol="gtk_style_context_set_background">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
+			<method name="set_direction" symbol="gtk_style_context_set_direction">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="direction" type="GtkTextDirection"/>
+				</parameters>
+			</method>
+			<method name="set_junction_sides" symbol="gtk_style_context_set_junction_sides">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="sides" type="GtkJunctionSides"/>
+				</parameters>
+			</method>
+			<method name="set_path" symbol="gtk_style_context_set_path">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="path" type="GtkWidgetPath*"/>
+				</parameters>
+			</method>
+			<method name="set_screen" symbol="gtk_style_context_set_screen">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="screen" type="GdkScreen*"/>
+				</parameters>
+			</method>
+			<method name="set_state" symbol="gtk_style_context_set_state">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="flags" type="GtkStateFlags"/>
+				</parameters>
+			</method>
+			<method name="state_is_running" symbol="gtk_style_context_state_is_running">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+					<parameter name="state" type="GtkStateType"/>
+					<parameter name="progress" type="gdouble*"/>
+				</parameters>
+			</method>
+			<property name="direction" type="GtkTextDirection" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="screen" type="GdkScreen*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="changed" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GtkStyleContext*"/>
+				</parameters>
+			</signal>
+		</object>
+		<object name="GtkStyleProperties" parent="GObject" type-name="GtkStyleProperties" get-type="gtk_style_properties_get_type">
+			<implements>
+				<interface name="GtkStyleProvider"/>
+			</implements>
+			<method name="clear" symbol="gtk_style_properties_clear">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="props" type="GtkStyleProperties*"/>
+				</parameters>
+			</method>
+			<method name="get" symbol="gtk_style_properties_get">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="props" type="GtkStyleProperties*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+				</parameters>
+			</method>
+			<method name="get_property" symbol="gtk_style_properties_get_property">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="props" type="GtkStyleProperties*"/>
+					<parameter name="property" type="gchar*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="value" type="GValue*"/>
+				</parameters>
+			</method>
+			<method name="get_valist" symbol="gtk_style_properties_get_valist">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="props" type="GtkStyleProperties*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="args" type="va_list"/>
+				</parameters>
+			</method>
+			<method name="lookup_color" symbol="gtk_style_properties_lookup_color">
+				<return-type type="GtkSymbolicColor*"/>
+				<parameters>
+					<parameter name="props" type="GtkStyleProperties*"/>
+					<parameter name="name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="lookup_property" symbol="gtk_style_properties_lookup_property">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="property_name" type="gchar*"/>
+					<parameter name="parse_func" type="GtkStylePropertyParser*"/>
+					<parameter name="pspec" type="GParamSpec**"/>
+				</parameters>
+			</method>
+			<method name="map_color" symbol="gtk_style_properties_map_color">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="props" type="GtkStyleProperties*"/>
+					<parameter name="name" type="gchar*"/>
+					<parameter name="color" type="GtkSymbolicColor*"/>
+				</parameters>
+			</method>
+			<method name="merge" symbol="gtk_style_properties_merge">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="props" type="GtkStyleProperties*"/>
+					<parameter name="props_to_merge" type="GtkStyleProperties*"/>
+					<parameter name="replace" type="gboolean"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gtk_style_properties_new">
+				<return-type type="GtkStyleProperties*"/>
+			</constructor>
+			<method name="register_property" symbol="gtk_style_properties_register_property">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="parse_func" type="GtkStylePropertyParser"/>
+					<parameter name="pspec" type="GParamSpec*"/>
+				</parameters>
+			</method>
+			<method name="set" symbol="gtk_style_properties_set">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="props" type="GtkStyleProperties*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+				</parameters>
+			</method>
+			<method name="set_property" symbol="gtk_style_properties_set_property">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="props" type="GtkStyleProperties*"/>
+					<parameter name="property" type="gchar*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="value" type="GValue*"/>
+				</parameters>
+			</method>
+			<method name="set_valist" symbol="gtk_style_properties_set_valist">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="props" type="GtkStyleProperties*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="args" type="va_list"/>
+				</parameters>
+			</method>
+			<method name="unset_property" symbol="gtk_style_properties_unset_property">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="props" type="GtkStyleProperties*"/>
+					<parameter name="property" type="gchar*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+				</parameters>
+			</method>
+		</object>
+		<object name="GtkSwitch" parent="GtkWidget" type-name="GtkSwitch" get-type="gtk_switch_get_type">
+			<implements>
+				<interface name="AtkImplementor"/>
+				<interface name="GtkBuildable"/>
+				<interface name="GtkActivatable"/>
+			</implements>
+			<method name="get_active" symbol="gtk_switch_get_active">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="sw" type="GtkSwitch*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gtk_switch_new">
+				<return-type type="GtkWidget*"/>
+			</constructor>
+			<method name="set_active" symbol="gtk_switch_set_active">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="sw" type="GtkSwitch*"/>
+					<parameter name="is_active" type="gboolean"/>
+				</parameters>
+			</method>
+			<property name="active" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+		</object>
 		<object name="GtkTable" parent="GtkContainer" type-name="GtkTable" get-type="gtk_table_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
@@ -18599,6 +20721,7 @@
 			<constructor name="new" symbol="gtk_text_child_anchor_new">
 				<return-type type="GtkTextChildAnchor*"/>
 			</constructor>
+			<field name="segment" type="gpointer"/>
 		</object>
 		<object name="GtkTextMark" parent="GObject" type-name="GtkTextMark" get-type="gtk_text_mark_get_type">
 			<method name="get_buffer" symbol="gtk_text_mark_get_buffer">
@@ -18647,6 +20770,7 @@
 			</method>
 			<property name="left-gravity" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
 			<property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<field name="segment" type="gpointer"/>
 		</object>
 		<object name="GtkTextTag" parent="GObject" type-name="GtkTextTag" get-type="gtk_text_tag_get_type">
 			<method name="event" symbol="gtk_text_tag_event">
@@ -18749,6 +20873,9 @@
 			</signal>
 		</object>
 		<object name="GtkTextTagTable" parent="GObject" type-name="GtkTextTagTable" get-type="gtk_text_tag_table_get_type">
+			<implements>
+				<interface name="GtkBuildable"/>
+			</implements>
 			<method name="add" symbol="gtk_text_tag_table_add">
 				<return-type type="void"/>
 				<parameters>
@@ -19352,6 +21479,350 @@
 				</parameters>
 			</signal>
 		</object>
+		<object name="GtkThemingEngine" parent="GObject" type-name="GtkThemingEngine" get-type="gtk_theming_engine_get_type">
+			<method name="get" symbol="gtk_theming_engine_get">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+				</parameters>
+			</method>
+			<method name="get_background_color" symbol="gtk_theming_engine_get_background_color">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="color" type="GdkRGBA*"/>
+				</parameters>
+			</method>
+			<method name="get_border" symbol="gtk_theming_engine_get_border">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="border" type="GtkBorder*"/>
+				</parameters>
+			</method>
+			<method name="get_border_color" symbol="gtk_theming_engine_get_border_color">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="color" type="GdkRGBA*"/>
+				</parameters>
+			</method>
+			<method name="get_color" symbol="gtk_theming_engine_get_color">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="color" type="GdkRGBA*"/>
+				</parameters>
+			</method>
+			<method name="get_direction" symbol="gtk_theming_engine_get_direction">
+				<return-type type="GtkTextDirection"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+				</parameters>
+			</method>
+			<method name="get_font" symbol="gtk_theming_engine_get_font">
+				<return-type type="PangoFontDescription*"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+				</parameters>
+			</method>
+			<method name="get_junction_sides" symbol="gtk_theming_engine_get_junction_sides">
+				<return-type type="GtkJunctionSides"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+				</parameters>
+			</method>
+			<method name="get_margin" symbol="gtk_theming_engine_get_margin">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="margin" type="GtkBorder*"/>
+				</parameters>
+			</method>
+			<method name="get_padding" symbol="gtk_theming_engine_get_padding">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="padding" type="GtkBorder*"/>
+				</parameters>
+			</method>
+			<method name="get_path" symbol="gtk_theming_engine_get_path">
+				<return-type type="GtkWidgetPath*"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+				</parameters>
+			</method>
+			<method name="get_property" symbol="gtk_theming_engine_get_property">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="property" type="gchar*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="value" type="GValue*"/>
+				</parameters>
+			</method>
+			<method name="get_screen" symbol="gtk_theming_engine_get_screen">
+				<return-type type="GdkScreen*"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+				</parameters>
+			</method>
+			<method name="get_state" symbol="gtk_theming_engine_get_state">
+				<return-type type="GtkStateFlags"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+				</parameters>
+			</method>
+			<method name="get_style" symbol="gtk_theming_engine_get_style">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+				</parameters>
+			</method>
+			<method name="get_style_property" symbol="gtk_theming_engine_get_style_property">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="property_name" type="gchar*"/>
+					<parameter name="value" type="GValue*"/>
+				</parameters>
+			</method>
+			<method name="get_style_valist" symbol="gtk_theming_engine_get_style_valist">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="args" type="va_list"/>
+				</parameters>
+			</method>
+			<method name="get_valist" symbol="gtk_theming_engine_get_valist">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="args" type="va_list"/>
+				</parameters>
+			</method>
+			<method name="has_class" symbol="gtk_theming_engine_has_class">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="style_class" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="has_region" symbol="gtk_theming_engine_has_region">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="style_region" type="gchar*"/>
+					<parameter name="flags" type="GtkRegionFlags*"/>
+				</parameters>
+			</method>
+			<method name="load" symbol="gtk_theming_engine_load">
+				<return-type type="GtkThemingEngine*"/>
+				<parameters>
+					<parameter name="name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="lookup_color" symbol="gtk_theming_engine_lookup_color">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="color_name" type="gchar*"/>
+					<parameter name="color" type="GdkRGBA*"/>
+				</parameters>
+			</method>
+			<method name="register_property" symbol="gtk_theming_engine_register_property">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="name_space" type="gchar*"/>
+					<parameter name="parse_func" type="GtkStylePropertyParser"/>
+					<parameter name="pspec" type="GParamSpec*"/>
+				</parameters>
+			</method>
+			<method name="state_is_running" symbol="gtk_theming_engine_state_is_running">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="state" type="GtkStateType"/>
+					<parameter name="progress" type="gdouble*"/>
+				</parameters>
+			</method>
+			<property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<vfunc name="render_activity">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="cr" type="cairo_t*"/>
+					<parameter name="x" type="gdouble"/>
+					<parameter name="y" type="gdouble"/>
+					<parameter name="width" type="gdouble"/>
+					<parameter name="height" type="gdouble"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="render_arrow">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="cr" type="cairo_t*"/>
+					<parameter name="angle" type="gdouble"/>
+					<parameter name="x" type="gdouble"/>
+					<parameter name="y" type="gdouble"/>
+					<parameter name="size" type="gdouble"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="render_background">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="cr" type="cairo_t*"/>
+					<parameter name="x" type="gdouble"/>
+					<parameter name="y" type="gdouble"/>
+					<parameter name="width" type="gdouble"/>
+					<parameter name="height" type="gdouble"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="render_check">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="cr" type="cairo_t*"/>
+					<parameter name="x" type="gdouble"/>
+					<parameter name="y" type="gdouble"/>
+					<parameter name="width" type="gdouble"/>
+					<parameter name="height" type="gdouble"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="render_expander">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="cr" type="cairo_t*"/>
+					<parameter name="x" type="gdouble"/>
+					<parameter name="y" type="gdouble"/>
+					<parameter name="width" type="gdouble"/>
+					<parameter name="height" type="gdouble"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="render_extension">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="cr" type="cairo_t*"/>
+					<parameter name="x" type="gdouble"/>
+					<parameter name="y" type="gdouble"/>
+					<parameter name="width" type="gdouble"/>
+					<parameter name="height" type="gdouble"/>
+					<parameter name="gap_side" type="GtkPositionType"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="render_focus">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="cr" type="cairo_t*"/>
+					<parameter name="x" type="gdouble"/>
+					<parameter name="y" type="gdouble"/>
+					<parameter name="width" type="gdouble"/>
+					<parameter name="height" type="gdouble"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="render_frame">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="cr" type="cairo_t*"/>
+					<parameter name="x" type="gdouble"/>
+					<parameter name="y" type="gdouble"/>
+					<parameter name="width" type="gdouble"/>
+					<parameter name="height" type="gdouble"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="render_frame_gap">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="cr" type="cairo_t*"/>
+					<parameter name="x" type="gdouble"/>
+					<parameter name="y" type="gdouble"/>
+					<parameter name="width" type="gdouble"/>
+					<parameter name="height" type="gdouble"/>
+					<parameter name="gap_side" type="GtkPositionType"/>
+					<parameter name="xy0_gap" type="gdouble"/>
+					<parameter name="xy1_gap" type="gdouble"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="render_handle">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="cr" type="cairo_t*"/>
+					<parameter name="x" type="gdouble"/>
+					<parameter name="y" type="gdouble"/>
+					<parameter name="width" type="gdouble"/>
+					<parameter name="height" type="gdouble"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="render_icon_pixbuf">
+				<return-type type="GdkPixbuf*"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="source" type="GtkIconSource*"/>
+					<parameter name="size" type="GtkIconSize"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="render_layout">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="cr" type="cairo_t*"/>
+					<parameter name="x" type="gdouble"/>
+					<parameter name="y" type="gdouble"/>
+					<parameter name="layout" type="PangoLayout*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="render_line">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="cr" type="cairo_t*"/>
+					<parameter name="x0" type="gdouble"/>
+					<parameter name="y0" type="gdouble"/>
+					<parameter name="x1" type="gdouble"/>
+					<parameter name="y1" type="gdouble"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="render_option">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="cr" type="cairo_t*"/>
+					<parameter name="x" type="gdouble"/>
+					<parameter name="y" type="gdouble"/>
+					<parameter name="width" type="gdouble"/>
+					<parameter name="height" type="gdouble"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="render_slider">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="engine" type="GtkThemingEngine*"/>
+					<parameter name="cr" type="cairo_t*"/>
+					<parameter name="x" type="gdouble"/>
+					<parameter name="y" type="gdouble"/>
+					<parameter name="width" type="gdouble"/>
+					<parameter name="height" type="gdouble"/>
+					<parameter name="orientation" type="GtkOrientation"/>
+				</parameters>
+			</vfunc>
+		</object>
 		<object name="GtkToggleAction" parent="GtkAction" type-name="GtkToggleAction" get-type="gtk_toggle_action_get_type">
 			<implements>
 				<interface name="GtkBuildable"/>
@@ -21177,6 +23648,18 @@
 					<parameter name="dnotify" type="GDestroyNotify"/>
 				</parameters>
 			</method>
+			<method name="is_blank_at_pos" symbol="gtk_tree_view_is_blank_at_pos">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="tree_view" type="GtkTreeView*"/>
+					<parameter name="x" type="gint"/>
+					<parameter name="y" type="gint"/>
+					<parameter name="path" type="GtkTreePath**"/>
+					<parameter name="column" type="GtkTreeViewColumn**"/>
+					<parameter name="cell_x" type="gint*"/>
+					<parameter name="cell_y" type="gint*"/>
+				</parameters>
+			</method>
 			<method name="is_rubber_banding_active" symbol="gtk_tree_view_is_rubber_banding_active">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -21620,7 +24103,7 @@
 				<parameters>
 					<parameter name="tree_column" type="GtkTreeViewColumn*"/>
 					<parameter name="cell_renderer" type="GtkCellRenderer*"/>
-					<parameter name="start_pos" type="gint*"/>
+					<parameter name="x_offset" type="gint*"/>
 					<parameter name="width" type="gint*"/>
 				</parameters>
 			</method>
@@ -21683,6 +24166,12 @@
 					<parameter name="tree_column" type="GtkTreeViewColumn*"/>
 				</parameters>
 			</method>
+			<method name="get_button" symbol="gtk_tree_view_column_get_button">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="tree_column" type="GtkTreeViewColumn*"/>
+				</parameters>
+			</method>
 			<method name="get_clickable" symbol="gtk_tree_view_column_get_clickable">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -21788,6 +24277,12 @@
 			<constructor name="new" symbol="gtk_tree_view_column_new">
 				<return-type type="GtkTreeViewColumn*"/>
 			</constructor>
+			<constructor name="new_with_area" symbol="gtk_tree_view_column_new_with_area">
+				<return-type type="GtkTreeViewColumn*"/>
+				<parameters>
+					<parameter name="area" type="GtkCellArea*"/>
+				</parameters>
+			</constructor>
 			<constructor name="new_with_attributes" symbol="gtk_tree_view_column_new_with_attributes">
 				<return-type type="GtkTreeViewColumn*"/>
 				<parameters>
@@ -21947,6 +24442,7 @@
 				</parameters>
 			</method>
 			<property name="alignment" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="cell-area" type="GtkCellArea*" readable="1" writable="1" construct="0" construct-only="1"/>
 			<property name="clickable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="expand" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="fixed-width" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -22186,16 +24682,6 @@
 				<return-type type="GtkWidget*"/>
 			</constructor>
 		</object>
-		<object name="GtkVRuler" parent="GtkRuler" type-name="GtkVRuler" get-type="gtk_vruler_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-				<interface name="GtkOrientable"/>
-			</implements>
-			<constructor name="new" symbol="gtk_vruler_new">
-				<return-type type="GtkWidget*"/>
-			</constructor>
-		</object>
 		<object name="GtkVScale" parent="GtkScale" type-name="GtkVScale" get-type="gtk_vscale_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
@@ -22316,6 +24802,7 @@
 			<constructor name="new" symbol="gtk_volume_button_new">
 				<return-type type="GtkWidget*"/>
 			</constructor>
+			<property name="use-symbolic" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 		</object>
 		<object name="GtkWidget" parent="GInitiallyUnowned" type-name="GtkWidget" get-type="gtk_widget_get_type">
 			<implements>
@@ -22567,6 +25054,13 @@
 			<method name="get_default_style" symbol="gtk_widget_get_default_style">
 				<return-type type="GtkStyle*"/>
 			</method>
+			<method name="get_device_enabled" symbol="gtk_widget_get_device_enabled">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="device" type="GdkDevice*"/>
+				</parameters>
+			</method>
 			<method name="get_device_events" symbol="gtk_widget_get_device_events">
 				<return-type type="GdkEventMask"/>
 				<parameters>
@@ -22598,12 +25092,6 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
-			<method name="get_extension_events" symbol="gtk_widget_get_extension_events">
-				<return-type type="GdkExtensionMode"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-				</parameters>
-			</method>
 			<method name="get_halign" symbol="gtk_widget_get_halign">
 				<return-type type="GtkAlign"/>
 				<parameters>
@@ -22700,6 +25188,12 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="get_path" symbol="gtk_widget_get_path">
+				<return-type type="GtkWidgetPath*"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_pointer" symbol="gtk_widget_get_pointer">
 				<return-type type="void"/>
 				<parameters>
@@ -22813,12 +25307,24 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="get_state_flags" symbol="gtk_widget_get_state_flags">
+				<return-type type="GtkStateFlags"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_style" symbol="gtk_widget_get_style">
 				<return-type type="GtkStyle*"/>
 				<parameters>
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="get_style_context" symbol="gtk_widget_get_style_context">
+				<return-type type="GtkStyleContext*"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_support_multidevice" symbol="gtk_widget_get_support_multidevice">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -23075,14 +25581,6 @@
 					<parameter name="style" type="GtkRcStyle*"/>
 				</parameters>
 			</method>
-			<method name="modify_symbolic_color" symbol="gtk_widget_modify_symbolic_color">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="name" type="gchar*"/>
-					<parameter name="color" type="GdkColor*"/>
-				</parameters>
-			</method>
 			<method name="modify_text" symbol="gtk_widget_modify_text">
 				<return-type type="void"/>
 				<parameters>
@@ -23098,6 +25596,45 @@
 					<parameter name="first_property_name" type="gchar*"/>
 				</parameters>
 			</constructor>
+			<method name="override_background_color" symbol="gtk_widget_override_background_color">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="color" type="GdkRGBA*"/>
+				</parameters>
+			</method>
+			<method name="override_color" symbol="gtk_widget_override_color">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="color" type="GdkRGBA*"/>
+				</parameters>
+			</method>
+			<method name="override_cursor" symbol="gtk_widget_override_cursor">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="cursor" type="GdkRGBA*"/>
+					<parameter name="secondary_cursor" type="GdkRGBA*"/>
+				</parameters>
+			</method>
+			<method name="override_font" symbol="gtk_widget_override_font">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="font_desc" type="PangoFontDescription*"/>
+				</parameters>
+			</method>
+			<method name="override_symbolic_color" symbol="gtk_widget_override_symbolic_color">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="name" type="gchar*"/>
+					<parameter name="color" type="GdkRGBA*"/>
+				</parameters>
+			</method>
 			<method name="path" symbol="gtk_widget_path">
 				<return-type type="void"/>
 				<parameters>
@@ -23192,6 +25729,14 @@
 					<parameter name="detail" type="gchar*"/>
 				</parameters>
 			</method>
+			<method name="render_icon_pixbuf" symbol="gtk_widget_render_icon_pixbuf">
+				<return-type type="GdkPixbuf*"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="stock_id" type="gchar*"/>
+					<parameter name="size" type="GtkIconSize"/>
+				</parameters>
+			</method>
 			<method name="reparent" symbol="gtk_widget_reparent">
 				<return-type type="void"/>
 				<parameters>
@@ -23205,7 +25750,7 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
-			<method name="reset_shapes" symbol="gtk_widget_reset_shapes">
+			<method name="reset_style" symbol="gtk_widget_reset_style">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="widget" type="GtkWidget*"/>
@@ -23281,6 +25826,14 @@
 					<parameter name="dir" type="GtkTextDirection"/>
 				</parameters>
 			</method>
+			<method name="set_device_enabled" symbol="gtk_widget_set_device_enabled">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="device" type="GdkDevice*"/>
+					<parameter name="enabled" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_device_events" symbol="gtk_widget_set_device_events">
 				<return-type type="void"/>
 				<parameters>
@@ -23310,13 +25863,6 @@
 					<parameter name="events" type="gint"/>
 				</parameters>
 			</method>
-			<method name="set_extension_events" symbol="gtk_widget_set_extension_events">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="mode" type="GdkExtensionMode"/>
-				</parameters>
-			</method>
 			<method name="set_halign" symbol="gtk_widget_set_halign">
 				<return-type type="void"/>
 				<parameters>
@@ -23458,6 +26004,14 @@
 					<parameter name="state" type="GtkStateType"/>
 				</parameters>
 			</method>
+			<method name="set_state_flags" symbol="gtk_widget_set_state_flags">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="flags" type="GtkStateFlags"/>
+					<parameter name="clear" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_style" symbol="gtk_widget_set_style">
 				<return-type type="void"/>
 				<parameters>
@@ -23637,6 +26191,13 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="unset_state_flags" symbol="gtk_widget_unset_state_flags">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="flags" type="GtkStateFlags"/>
+				</parameters>
+			</method>
 			<property name="app-paintable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="can-default" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="can-focus" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -23644,7 +26205,6 @@
 			<property name="double-buffered" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="events" type="GdkEventMask" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="expand" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="extension-events" type="GdkExtensionMode" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="halign" type="GtkAlign" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="has-default" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="has-focus" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -23816,9 +26376,9 @@
 			<signal name="drag-failed" when="LAST">
 				<return-type type="gboolean"/>
 				<parameters>
-					<parameter name="object" type="GtkWidget*"/>
-					<parameter name="p0" type="GdkDragContext*"/>
-					<parameter name="p1" type="GtkDragResult"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="context" type="GdkDragContext*"/>
+					<parameter name="result" type="GtkDragResult"/>
 				</parameters>
 			</signal>
 			<signal name="drag-leave" when="LAST">
@@ -23983,13 +26543,6 @@
 					<parameter name="direction" type="GtkDirectionType"/>
 				</parameters>
 			</signal>
-			<signal name="no-expose-event" when="LAST">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="event" type="GdkEvent*"/>
-				</parameters>
-			</signal>
 			<signal name="parent-set" when="FIRST">
 				<return-type type="void"/>
 				<parameters>
@@ -24112,18 +26665,18 @@
 					<parameter name="allocation" type="GdkRectangle*"/>
 				</parameters>
 			</signal>
-			<signal name="size-request" when="FIRST">
+			<signal name="state-changed" when="FIRST">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="requisition" type="GtkRequisition*"/>
+					<parameter name="previous_state" type="GtkStateType"/>
 				</parameters>
 			</signal>
-			<signal name="state-changed" when="FIRST">
+			<signal name="state-flags-changed" when="FIRST">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="previous_state" type="GtkStateType"/>
+					<parameter name="previous_state_flags" type="GtkStateFlags"/>
 				</parameters>
 			</signal>
 			<signal name="style-set" when="FIRST">
@@ -24133,6 +26686,12 @@
 					<parameter name="previous_style" type="GtkStyle*"/>
 				</parameters>
 			</signal>
+			<signal name="style-updated" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</signal>
 			<signal name="unmap" when="FIRST">
 				<return-type type="void"/>
 				<parameters>
@@ -24171,6 +26730,7 @@
 				<parameters>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="orientation" type="GtkOrientation"/>
+					<parameter name="minimum_size" type="gint*"/>
 					<parameter name="natural_size" type="gint*"/>
 					<parameter name="allocated_pos" type="gint*"/>
 					<parameter name="allocated_size" type="gint*"/>
@@ -24285,13 +26845,6 @@
 					<parameter name="accel_group" type="GtkAccelGroup*"/>
 				</parameters>
 			</method>
-			<method name="add_embedded_xid" symbol="gtk_window_add_embedded_xid">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GtkWindow*"/>
-					<parameter name="xid" type="GdkNativeWindow"/>
-				</parameters>
-			</method>
 			<method name="add_mnemonic" symbol="gtk_window_add_mnemonic">
 				<return-type type="void"/>
 				<parameters>
@@ -24395,16 +26948,6 @@
 					<parameter name="window" type="GtkWindow*"/>
 				</parameters>
 			</method>
-			<method name="get_frame_dimensions" symbol="gtk_window_get_frame_dimensions">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GtkWindow*"/>
-					<parameter name="left" type="gint*"/>
-					<parameter name="top" type="gint*"/>
-					<parameter name="right" type="gint*"/>
-					<parameter name="bottom" type="gint*"/>
-				</parameters>
-			</method>
 			<method name="get_gravity" symbol="gtk_window_get_gravity">
 				<return-type type="GdkGravity"/>
 				<parameters>
@@ -24417,12 +26960,6 @@
 					<parameter name="window" type="GtkWindow*"/>
 				</parameters>
 			</method>
-			<method name="get_has_frame" symbol="gtk_window_get_has_frame">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="window" type="GtkWindow*"/>
-				</parameters>
-			</method>
 			<method name="get_has_resize_grip" symbol="gtk_window_get_has_resize_grip">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -24643,13 +27180,6 @@
 					<parameter name="accel_group" type="GtkAccelGroup*"/>
 				</parameters>
 			</method>
-			<method name="remove_embedded_xid" symbol="gtk_window_remove_embedded_xid">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GtkWindow*"/>
-					<parameter name="xid" type="GdkNativeWindow"/>
-				</parameters>
-			</method>
 			<method name="remove_mnemonic" symbol="gtk_window_remove_mnemonic">
 				<return-type type="void"/>
 				<parameters>
@@ -24789,16 +27319,6 @@
 					<parameter name="setting" type="gboolean"/>
 				</parameters>
 			</method>
-			<method name="set_frame_dimensions" symbol="gtk_window_set_frame_dimensions">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GtkWindow*"/>
-					<parameter name="left" type="gint"/>
-					<parameter name="top" type="gint"/>
-					<parameter name="right" type="gint"/>
-					<parameter name="bottom" type="gint"/>
-				</parameters>
-			</method>
 			<method name="set_geometry_hints" symbol="gtk_window_set_geometry_hints">
 				<return-type type="void"/>
 				<parameters>
@@ -24815,18 +27335,18 @@
 					<parameter name="gravity" type="GdkGravity"/>
 				</parameters>
 			</method>
-			<method name="set_has_frame" symbol="gtk_window_set_has_frame">
+			<method name="set_has_resize_grip" symbol="gtk_window_set_has_resize_grip">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="window" type="GtkWindow*"/>
-					<parameter name="setting" type="gboolean"/>
+					<parameter name="value" type="gboolean"/>
 				</parameters>
 			</method>
-			<method name="set_has_resize_grip" symbol="gtk_window_set_has_resize_grip">
+			<method name="set_has_user_ref_count" symbol="gtk_window_set_has_user_ref_count">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="window" type="GtkWindow*"/>
-					<parameter name="value" type="gboolean"/>
+					<parameter name="setting" type="gboolean"/>
 				</parameters>
 			</method>
 			<method name="set_icon" symbol="gtk_window_set_icon">
@@ -25051,13 +27571,6 @@
 					<parameter name="window" type="GtkWindow*"/>
 				</parameters>
 			</signal>
-			<signal name="frame-event" when="LAST">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="window" type="GtkWindow*"/>
-					<parameter name="event" type="GdkEvent*"/>
-				</parameters>
-			</signal>
 			<signal name="keys-changed" when="FIRST">
 				<return-type type="void"/>
 				<parameters>
@@ -25172,6 +27685,30 @@
 				</parameters>
 			</vfunc>
 		</interface>
+		<interface name="GtkAppChooser" type-name="GtkAppChooser" get-type="gtk_app_chooser_get_type">
+			<requires>
+				<interface name="GtkWidget"/>
+			</requires>
+			<method name="get_app_info" symbol="gtk_app_chooser_get_app_info">
+				<return-type type="GAppInfo*"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooser*"/>
+				</parameters>
+			</method>
+			<method name="get_content_type" symbol="gtk_app_chooser_get_content_type">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooser*"/>
+				</parameters>
+			</method>
+			<method name="refresh" symbol="gtk_app_chooser_refresh">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GtkAppChooser*"/>
+				</parameters>
+			</method>
+			<property name="content-type" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+		</interface>
 		<interface name="GtkBuildable" type-name="GtkBuildable" get-type="gtk_buildable_get_type">
 			<requires>
 				<interface name="GObject"/>
@@ -25417,6 +27954,12 @@
 					<parameter name="cell" type="GtkCellRenderer*"/>
 				</parameters>
 			</method>
+			<method name="get_area" symbol="gtk_cell_layout_get_area">
+				<return-type type="GtkCellArea*"/>
+				<parameters>
+					<parameter name="cell_layout" type="GtkCellLayout*"/>
+				</parameters>
+			</method>
 			<method name="get_cells" symbol="gtk_cell_layout_get_cells">
 				<return-type type="GList*"/>
 				<parameters>
@@ -25486,6 +28029,12 @@
 					<parameter name="cell" type="GtkCellRenderer*"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="get_area">
+				<return-type type="GtkCellArea*"/>
+				<parameters>
+					<parameter name="cell_layout" type="GtkCellLayout*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="get_cells">
 				<return-type type="GList*"/>
 				<parameters>
@@ -26589,6 +29138,56 @@
 			<property name="vadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="vscroll-policy" type="GtkScrollablePolicy" readable="1" writable="1" construct="0" construct-only="0"/>
 		</interface>
+		<interface name="GtkStyleProvider" type-name="GtkStyleProvider" get-type="gtk_style_provider_get_type">
+			<method name="get_icon_factory" symbol="gtk_style_provider_get_icon_factory">
+				<return-type type="GtkIconFactory*"/>
+				<parameters>
+					<parameter name="provider" type="GtkStyleProvider*"/>
+					<parameter name="path" type="GtkWidgetPath*"/>
+				</parameters>
+			</method>
+			<method name="get_style" symbol="gtk_style_provider_get_style">
+				<return-type type="GtkStyleProperties*"/>
+				<parameters>
+					<parameter name="provider" type="GtkStyleProvider*"/>
+					<parameter name="path" type="GtkWidgetPath*"/>
+				</parameters>
+			</method>
+			<method name="get_style_property" symbol="gtk_style_provider_get_style_property">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="provider" type="GtkStyleProvider*"/>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="pspec" type="GParamSpec*"/>
+					<parameter name="value" type="GValue*"/>
+				</parameters>
+			</method>
+			<vfunc name="get_icon_factory">
+				<return-type type="GtkIconFactory*"/>
+				<parameters>
+					<parameter name="provider" type="GtkStyleProvider*"/>
+					<parameter name="path" type="GtkWidgetPath*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_style">
+				<return-type type="GtkStyleProperties*"/>
+				<parameters>
+					<parameter name="provider" type="GtkStyleProvider*"/>
+					<parameter name="path" type="GtkWidgetPath*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_style_property">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="provider" type="GtkStyleProvider*"/>
+					<parameter name="path" type="GtkWidgetPath*"/>
+					<parameter name="state" type="GtkStateFlags"/>
+					<parameter name="pspec" type="GParamSpec*"/>
+					<parameter name="value" type="GValue*"/>
+				</parameters>
+			</vfunc>
+		</interface>
 		<interface name="GtkToolShell" type-name="GtkToolShell" get-type="gtk_tool_shell_get_type">
 			<requires>
 				<interface name="GtkWidget"/>
@@ -26920,6 +29519,13 @@
 					<parameter name="child" type="GtkTreeIter*"/>
 				</parameters>
 			</method>
+			<method name="iter_previous" symbol="gtk_tree_model_iter_previous">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="tree_model" type="GtkTreeModel*"/>
+					<parameter name="iter" type="GtkTreeIter*"/>
+				</parameters>
+			</method>
 			<method name="ref_node" symbol="gtk_tree_model_ref_node">
 				<return-type type="void"/>
 				<parameters>
@@ -27103,6 +29709,13 @@
 					<parameter name="child" type="GtkTreeIter*"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="iter_previous">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="tree_model" type="GtkTreeModel*"/>
+					<parameter name="iter" type="GtkTreeIter*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="ref_node">
 				<return-type type="void"/>
 				<parameters>
@@ -27218,13 +29831,13 @@
 				</parameters>
 			</vfunc>
 		</interface>
-		<constant name="GTK_BINARY_AGE" type="int" value="9103"/>
+		<constant name="GTK_BINARY_AGE" type="int" value="9902"/>
 		<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_MINOR_VERSION" type="int" value="91"/>
+		<constant name="GTK_MICRO_VERSION" type="int" value="2"/>
+		<constant name="GTK_MINOR_VERSION" type="int" value="99"/>
 		<constant name="GTK_PAPER_NAME_A3" type="char*" value="iso_a3"/>
 		<constant name="GTK_PAPER_NAME_A4" type="char*" value="iso_a4"/>
 		<constant name="GTK_PAPER_NAME_A5" type="char*" value="iso_a5"/>
@@ -27369,6 +29982,64 @@
 		<constant name="GTK_STOCK_ZOOM_FIT" type="char*" value="gtk-zoom-fit"/>
 		<constant name="GTK_STOCK_ZOOM_IN" type="char*" value="gtk-zoom-in"/>
 		<constant name="GTK_STOCK_ZOOM_OUT" type="char*" value="gtk-zoom-out"/>
+		<constant name="GTK_STYLE_CLASS_ACCELERATOR" type="char*" value="accelerator"/>
+		<constant name="GTK_STYLE_CLASS_BACKGROUND" type="char*" value="background"/>
+		<constant name="GTK_STYLE_CLASS_BUTTON" type="char*" value="button"/>
+		<constant name="GTK_STYLE_CLASS_CALENDAR" type="char*" value="calendar"/>
+		<constant name="GTK_STYLE_CLASS_CELL" type="char*" value="cell"/>
+		<constant name="GTK_STYLE_CLASS_CHECK" type="char*" value="check"/>
+		<constant name="GTK_STYLE_CLASS_DEFAULT" type="char*" value="default"/>
+		<constant name="GTK_STYLE_CLASS_DND" type="char*" value="dnd"/>
+		<constant name="GTK_STYLE_CLASS_DOCK" type="char*" value="dock"/>
+		<constant name="GTK_STYLE_CLASS_ENTRY" type="char*" value="entry"/>
+		<constant name="GTK_STYLE_CLASS_ERROR" type="char*" value="error"/>
+		<constant name="GTK_STYLE_CLASS_EXPANDER" type="char*" value="expander"/>
+		<constant name="GTK_STYLE_CLASS_FRAME" type="char*" value="frame"/>
+		<constant name="GTK_STYLE_CLASS_GRIP" type="char*" value="grip"/>
+		<constant name="GTK_STYLE_CLASS_HEADER" type="char*" value="header"/>
+		<constant name="GTK_STYLE_CLASS_HIGHLIGHT" type="char*" value="highlight"/>
+		<constant name="GTK_STYLE_CLASS_HORIZONTAL" type="char*" value="horizontal"/>
+		<constant name="GTK_STYLE_CLASS_INFO" type="char*" value="info"/>
+		<constant name="GTK_STYLE_CLASS_MARK" type="char*" value="mark"/>
+		<constant name="GTK_STYLE_CLASS_MENU" type="char*" value="menu"/>
+		<constant name="GTK_STYLE_CLASS_MENUBAR" type="char*" value="menubar"/>
+		<constant name="GTK_STYLE_CLASS_MENUITEM" type="char*" value="menuitem"/>
+		<constant name="GTK_STYLE_CLASS_NOTEBOOK" type="char*" value="notebook"/>
+		<constant name="GTK_STYLE_CLASS_PANE_SEPARATOR" type="char*" value="pane-separator"/>
+		<constant name="GTK_STYLE_CLASS_PROGRESSBAR" type="char*" value="progressbar"/>
+		<constant name="GTK_STYLE_CLASS_QUESTION" type="char*" value="question"/>
+		<constant name="GTK_STYLE_CLASS_RADIO" type="char*" value="radio"/>
+		<constant name="GTK_STYLE_CLASS_RUBBERBAND" type="char*" value="rubberband"/>
+		<constant name="GTK_STYLE_CLASS_SCALE" type="char*" value="scale"/>
+		<constant name="GTK_STYLE_CLASS_SCROLLBAR" type="char*" value="scrollbar"/>
+		<constant name="GTK_STYLE_CLASS_SLIDER" type="char*" value="slider"/>
+		<constant name="GTK_STYLE_CLASS_SPINBUTTON" type="char*" value="spinbutton"/>
+		<constant name="GTK_STYLE_CLASS_SPINNER" type="char*" value="spinner"/>
+		<constant name="GTK_STYLE_CLASS_TOOLBAR" type="char*" value="toolbar"/>
+		<constant name="GTK_STYLE_CLASS_TOOLTIP" type="char*" value="tooltip"/>
+		<constant name="GTK_STYLE_CLASS_TROUGH" type="char*" value="trough"/>
+		<constant name="GTK_STYLE_CLASS_VERTICAL" type="char*" value="vertical"/>
+		<constant name="GTK_STYLE_CLASS_VIEW" type="char*" value="view"/>
+		<constant name="GTK_STYLE_CLASS_WARNING" type="char*" value="warning"/>
+		<constant name="GTK_STYLE_PROPERTY_BACKGROUND_COLOR" type="char*" value="background-color"/>
+		<constant name="GTK_STYLE_PROPERTY_BACKGROUND_IMAGE" type="char*" value="background-image"/>
+		<constant name="GTK_STYLE_PROPERTY_BORDER_COLOR" type="char*" value="border-color"/>
+		<constant name="GTK_STYLE_PROPERTY_BORDER_RADIUS" type="char*" value="border-radius"/>
+		<constant name="GTK_STYLE_PROPERTY_BORDER_STYLE" type="char*" value="border-style"/>
+		<constant name="GTK_STYLE_PROPERTY_BORDER_WIDTH" type="char*" value="border-width"/>
+		<constant name="GTK_STYLE_PROPERTY_COLOR" type="char*" value="color"/>
+		<constant name="GTK_STYLE_PROPERTY_FONT" type="char*" value="font"/>
+		<constant name="GTK_STYLE_PROPERTY_MARGIN" type="char*" value="margin"/>
+		<constant name="GTK_STYLE_PROPERTY_PADDING" type="char*" value="padding"/>
+		<constant name="GTK_STYLE_PROVIDER_PRIORITY_APPLICATION" type="int" value="600"/>
+		<constant name="GTK_STYLE_PROVIDER_PRIORITY_FALLBACK" type="int" value="1"/>
+		<constant name="GTK_STYLE_PROVIDER_PRIORITY_SETTINGS" type="int" value="400"/>
+		<constant name="GTK_STYLE_PROVIDER_PRIORITY_THEME" type="int" value="200"/>
+		<constant name="GTK_STYLE_PROVIDER_PRIORITY_USER" type="int" value="800"/>
+		<constant name="GTK_STYLE_REGION_COLUMN" type="char*" value="column"/>
+		<constant name="GTK_STYLE_REGION_COLUMN_HEADER" type="char*" value="column-header"/>
+		<constant name="GTK_STYLE_REGION_ROW" type="char*" value="row"/>
+		<constant name="GTK_STYLE_REGION_TAB" type="char*" value="tab"/>
 		<constant name="GTK_TEXT_VIEW_PRIORITY_VALIDATE" type="int" value="5"/>
 	</namespace>
 </api>
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index 7f3999a..2de6e72 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -100,6 +100,9 @@ gtk_calendar_set_detail_func.destroy hidden="1"
 GtkCalendarDetailFunc hidden="1"
 GtkCallbackMarshal hidden="1"
 GtkCell.u hidden="1"
+GtkCellArea::apply_attributes has_emitter="1"
+gtk_cell_area_box_pack_start hidden="1"
+gtk_cell_area_box_pack_end hidden="1"
 GtkCellEditable::editing_done has_emitter="1"
 GtkCellEditable::remove_widget has_emitter="1"
 gtk_cell_layout_get_cells transfer_ownership="1" type_arguments="unowned CellRenderer"



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