[vala] gtk+-3.0: Update to GTK+ master



commit f774233bebd9a1fca8fc225d84638f4bc882ce99
Author: Jürg Billeter <j bitron ch>
Date:   Mon Oct 25 16:27:29 2010 +0200

    gtk+-3.0: Update to GTK+ master

 vapi/gdk-3.0.vapi                         |  530 +-------
 vapi/gdk-x11-3.0.vapi                     |   24 +-
 vapi/gtk+-3.0.vapi                        |  313 +++---
 vapi/packages/gdk-3.0/gdk-3.0-custom.vala |   31 -
 vapi/packages/gdk-3.0/gdk-3.0.excludes    |    1 +
 vapi/packages/gdk-3.0/gdk-3.0.gi          | 2016 +++--------------------------
 vapi/packages/gdk-3.0/gdk-3.0.metadata    |    2 +
 vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi  |   72 +-
 vapi/packages/gtk+-3.0/gtk+-3.0.gi        | 1061 ++++++++--------
 vapi/packages/gtk+-3.0/gtk+-3.0.metadata  |    4 +-
 10 files changed, 982 insertions(+), 3072 deletions(-)
---
diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi
index c580793..b8c845d 100644
--- a/vapi/gdk-3.0.vapi
+++ b/vapi/gdk-3.0.vapi
@@ -34,20 +34,6 @@ namespace Gdk {
 	}
 	[CCode (ref_function = "g_object_ref", unref_function = "g_object_unref", cheader_filename = "gdk/gdk.h")]
 	public class Bitmap {
-		public weak GLib.Object parent_instance;
-		public static Gdk.Bitmap create_from_data (Gdk.Drawable drawable, string data, int width, int height);
-	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Colormap : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public Colormap (Gdk.Visual visual, bool allocate);
-		public bool alloc_color (Gdk.Color color, bool writeable, bool best_match);
-		public int alloc_colors (Gdk.Color[] colors, bool writeable, bool best_match, bool success);
-		public void free_colors (Gdk.Color[] colors);
-		public unowned Gdk.Screen get_screen ();
-		public static unowned Gdk.Colormap get_system ();
-		public unowned Gdk.Visual get_visual ();
-		public void query_color (ulong pixel, out Gdk.Color _result);
 	}
 	[Compact]
 	[CCode (ref_function = "gdk_cursor_ref", unref_function = "gdk_cursor_unref", type_id = "GDK_TYPE_CURSOR", cheader_filename = "gdk/gdk.h")]
@@ -60,8 +46,7 @@ namespace Gdk {
 		public Cursor.from_name (Gdk.Display display, string name);
 		[CCode (has_construct_function = false)]
 		public Cursor.from_pixbuf (Gdk.Display display, Gdk.Pixbuf pixbuf, int x, int y);
-		[CCode (has_construct_function = false)]
-		public Cursor.from_pixmap (Gdk.Pixmap source, Gdk.Pixmap mask, Gdk.Color fg, Gdk.Color bg, int x, int y);
+		public Gdk.CursorType get_cursor_type ();
 		public unowned Gdk.Display get_display ();
 		public unowned Gdk.Pixbuf get_image ();
 	}
@@ -110,6 +95,7 @@ namespace Gdk {
 	public class DeviceManager : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected DeviceManager ();
+		public virtual unowned Gdk.Device get_client_pointer ();
 		public unowned Gdk.Display get_display ();
 		public virtual unowned GLib.List list_devices (Gdk.DeviceType type);
 		public Gdk.Display display { get; construct; }
@@ -142,6 +128,7 @@ namespace Gdk {
 		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 bool is_closed ();
 		public void keyboard_ungrab (uint32 time_);
 		public static unowned Gdk.Display open (string display_name);
 		public static unowned Gdk.Display open_default_libgtk_only ();
@@ -209,57 +196,14 @@ namespace Gdk {
 	public class Drawable : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected Drawable ();
-		public unowned Gdk.Image copy_to_image (Gdk.Image image, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
 		[NoWrapper]
 		public virtual unowned Cairo.Surface create_cairo_surface (int width, int height);
-		[NoWrapper]
-		public virtual unowned Gdk.GC create_gc (Gdk.GCValues values, Gdk.GCValuesMask mask);
-		[CCode (cname = "gdk_draw_arc")]
-		public virtual void draw_arc (Gdk.GC gc, bool filled, int x, int y, int width, int height, int angle1, int angle2);
-		[CCode (cname = "gdk_draw_drawable")]
-		public virtual void draw_drawable (Gdk.GC gc, Gdk.Drawable src, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
-		[CCode (cname = "gdk_draw_glyphs")]
-		public virtual void draw_glyphs (Gdk.GC gc, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
-		[CCode (cname = "gdk_draw_glyphs_transformed")]
-		public virtual void draw_glyphs_transformed (Gdk.GC gc, Pango.Matrix matrix, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
-		[CCode (cname = "gdk_draw_image")]
-		public virtual void draw_image (Gdk.GC gc, Gdk.Image image, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
-		[CCode (cname = "gdk_draw_lines")]
-		public virtual void draw_lines (Gdk.GC gc, Gdk.Point[] points);
-		[CCode (cname = "gdk_draw_pixbuf")]
-		public virtual void draw_pixbuf (Gdk.GC? gc, Gdk.Pixbuf pixbuf, int src_x, int src_y, int dest_x, int dest_y, int width, int height, Gdk.RgbDither dither, int x_dither, int y_dither);
-		[CCode (cname = "gdk_draw_points")]
-		public virtual void draw_points (Gdk.GC gc, Gdk.Point[] points);
-		[CCode (cname = "gdk_draw_polygon")]
-		public virtual void draw_polygon (Gdk.GC gc, bool filled, Gdk.Point[] points);
-		[CCode (cname = "gdk_draw_rectangle")]
-		public virtual void draw_rectangle (Gdk.GC gc, bool filled, int x, int y, int width, int height);
-		[CCode (cname = "gdk_draw_segments")]
-		public virtual void draw_segments (Gdk.GC gc, Gdk.Segment[] segs);
-		[CCode (cname = "gdk_draw_text")]
-		public virtual void draw_text (Gdk.Font font, Gdk.GC gc, int x, int y, string text, int text_length);
-		[CCode (cname = "gdk_draw_text_wc")]
-		public virtual void draw_text_wc (Gdk.Font font, Gdk.GC gc, int x, int y, Gdk.WChar text, int text_length);
-		[CCode (cname = "gdk_draw_trapezoids")]
-		public virtual void draw_trapezoids (Gdk.GC gc, Gdk.Trapezoid[] trapezoids);
-		public virtual unowned Gdk.Region get_clip_region ();
-		public virtual unowned Gdk.Colormap get_colormap ();
-		[NoWrapper]
-		public virtual unowned Gdk.Drawable get_composite_drawable (int x, int y, int width, int height, int composite_x_offset, int composite_y_offset);
-		public virtual int get_depth ();
-		public unowned Gdk.Display get_display ();
-		public virtual unowned Gdk.Image get_image (int x, int y, int width, int height);
-		public virtual unowned Gdk.Screen get_screen ();
-		public virtual void get_size (out int width, out int height);
-		[NoWrapper]
-		public virtual unowned Gdk.Drawable get_source_drawable ();
-		public virtual unowned Gdk.Region get_visible_region ();
-		public virtual unowned Gdk.Visual get_visual ();
+		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);
-		public virtual void set_colormap (Gdk.Colormap colormap);
 	}
 	[Compact]
 	[CCode (copy_function = "gdk_event_copy", type_id = "GDK_TYPE_EVENT", cheader_filename = "gdk/gdk.h")]
@@ -307,66 +251,6 @@ namespace Gdk {
 		public void set_screen (Gdk.Screen screen);
 	}
 	[Compact]
-	[CCode (ref_function = "gdk_font_ref", unref_function = "gdk_font_unref", type_id = "GDK_TYPE_FONT", cheader_filename = "gdk/gdk.h")]
-	public class Font {
-		public int ascent;
-		public int descent;
-		public Gdk.FontType type;
-		public bool equal (Gdk.Font fontb);
-		public static unowned Gdk.Font from_description_for_display (Gdk.Display display, Pango.FontDescription font_desc);
-		public int id ();
-		public static unowned Gdk.Font load_for_display (Gdk.Display display, string font_name);
-	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class GC : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public GC (Gdk.Drawable drawable);
-		public void copy (Gdk.GC src_gc);
-		public unowned Gdk.Colormap get_colormap ();
-		public unowned Gdk.Screen get_screen ();
-		public virtual void get_values (out Gdk.GCValues values);
-		public void offset (int x_offset, int y_offset);
-		public void set_background (Gdk.Color color);
-		public void set_clip_mask (Gdk.Bitmap mask);
-		public void set_clip_origin (int x, int y);
-		public void set_clip_rectangle (Gdk.Rectangle rectangle);
-		public void set_clip_region (Gdk.Region region);
-		public void set_colormap (Gdk.Colormap colormap);
-		public virtual void set_dashes (int dash_offset, char[] dash_list, int n);
-		public void set_exposures (bool exposures);
-		public void set_fill (Gdk.Fill fill);
-		public void set_foreground (Gdk.Color color);
-		public void set_function (Gdk.Function function);
-		public void set_line_attributes (int line_width, Gdk.LineStyle line_style, Gdk.CapStyle cap_style, Gdk.JoinStyle join_style);
-		public void set_rgb_bg_color (Gdk.Color color);
-		public void set_rgb_fg_color (Gdk.Color color);
-		public void set_stipple (Gdk.Pixmap stipple);
-		public void set_subwindow (Gdk.SubwindowMode mode);
-		public void set_tile (Gdk.Pixmap tile);
-		public void set_ts_origin (int x, int y);
-		public virtual void set_values (Gdk.GCValues values, Gdk.GCValuesMask values_mask);
-		[CCode (has_construct_function = false)]
-		public GC.with_values (Gdk.Drawable drawable, Gdk.GCValues values, Gdk.GCValuesMask values_mask);
-	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Image : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public Image (Gdk.ImageType type, Gdk.Visual visual, int width, int height);
-		public uint16 get_bits_per_pixel ();
-		public Gdk.ByteOrder get_byte_order ();
-		public uint16 get_bytes_per_line ();
-		public uint16 get_bytes_per_pixel ();
-		public unowned Gdk.Colormap get_colormap ();
-		public uint16 get_depth ();
-		public int get_height ();
-		public Gdk.ImageType get_image_type ();
-		public uint32 get_pixel (int x, int y);
-		public unowned Gdk.Visual get_visual ();
-		public int get_width ();
-		public void put_pixel (int x, int y, uint32 pixel);
-		public void set_colormap (Gdk.Colormap colormap);
-	}
-	[Compact]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class KeyboardGrabInfo {
 		public weak Gdk.Window native_window;
@@ -386,6 +270,7 @@ namespace Gdk {
 		public bool get_entries_for_keycode (uint hardware_keycode, out unowned Gdk.KeymapKey[] keys, out unowned uint[] keyvals, int n_entries);
 		public bool get_entries_for_keyval (uint keyval, out unowned Gdk.KeymapKey[] keys);
 		public static unowned Gdk.Keymap get_for_display (Gdk.Display display);
+		public bool get_num_lock_state ();
 		public bool have_bidi_layouts ();
 		public uint lookup_key (Gdk.KeymapKey key);
 		public bool map_virtual_modifiers (Gdk.ModifierType state);
@@ -408,33 +293,6 @@ namespace Gdk {
 		[CCode (array_length = false)]
 		public weak int[] button_y;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class PangoRenderer : Pango.Renderer {
-		[CCode (type = "PangoRenderer*", has_construct_function = false)]
-		public PangoRenderer (Gdk.Screen screen);
-		public static unowned Pango.Renderer get_default (Gdk.Screen screen);
-		public void set_drawable (Gdk.Drawable drawable);
-		public void set_gc (Gdk.GC gc);
-		public void set_override_color (Pango.RenderPart part, Gdk.Color color);
-		public void set_stipple (Pango.RenderPart part, Gdk.Bitmap stipple);
-		[NoAccessorMethod]
-		public Gdk.Screen screen { owned get; construct; }
-	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Pixmap : Gdk.Drawable {
-		[CCode (has_construct_function = false)]
-		public Pixmap (Gdk.Drawable? drawable, int width, int height, int depth);
-		public static unowned Gdk.Pixmap colormap_create_from_xpm (Gdk.Drawable drawable, Gdk.Colormap colormap, out unowned Gdk.Bitmap mask, Gdk.Color transparent_color, string filename);
-		public static unowned Gdk.Pixmap colormap_create_from_xpm_d (Gdk.Drawable drawable, Gdk.Colormap colormap, out unowned Gdk.Bitmap mask, Gdk.Color transparent_color, string data);
-		public static unowned Gdk.Pixmap create_from_data (Gdk.Drawable drawable, string data, int width, int height, int depth, Gdk.Color fg, Gdk.Color bg);
-		public static unowned Gdk.Pixmap create_from_xpm (Gdk.Drawable drawable, out unowned Gdk.Bitmap mask, Gdk.Color transparent_color, string filename);
-		public static unowned Gdk.Pixmap create_from_xpm_d (Gdk.Drawable drawable, out unowned Gdk.Bitmap mask, Gdk.Color transparent_color, string data);
-		public static unowned Gdk.Pixmap foreign_new (Gdk.NativeWindow anid);
-		public static unowned Gdk.Pixmap foreign_new_for_display (Gdk.Display display, Gdk.NativeWindow anid);
-		public static unowned Gdk.Pixmap foreign_new_for_screen (Gdk.Screen screen, Gdk.NativeWindow anid, int width, int height, int depth);
-		public static unowned Gdk.Pixmap lookup (Gdk.NativeWindow anid);
-		public static unowned Gdk.Pixmap lookup_for_display (Gdk.Display display, Gdk.NativeWindow anid);
-	}
 	[Compact]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class PointerHooks {
@@ -451,30 +309,6 @@ namespace Gdk {
 		public double toplevel_y;
 		public weak Gdk.Window window_under_pointer;
 	}
-	[Compact]
-	[CCode (copy_function = "gdk_region_copy", free_function = "gdk_region_destroy", cheader_filename = "gdk/gdk.h")]
-	public class Region {
-		[CCode (has_construct_function = false)]
-		public Region ();
-		public Gdk.Region copy ();
-		public bool empty ();
-		public bool equal (Gdk.Region region2);
-		public void get_clipbox (out Gdk.Rectangle rectangle);
-		public void get_rectangles (out Gdk.Rectangle[] rectangles);
-		public void intersect (Gdk.Region source2);
-		public void offset (int dx, int dy);
-		public bool point_in (int x, int y);
-		public static Gdk.Region polygon (Gdk.Point[] points, Gdk.FillRule fill_rule);
-		public bool rect_equal (Gdk.Rectangle rectangle);
-		public Gdk.OverlapType rect_in (Gdk.Rectangle rectangle);
-		public static Gdk.Region rectangle (Gdk.Rectangle rectangle);
-		public void shrink (int dx, int dy);
-		public void spans_intersect_foreach (Gdk.Span[] spans, bool sorted, Gdk.SpanFunc function, void* data);
-		public void subtract (Gdk.Region source2);
-		public void union (Gdk.Region source2);
-		public void union_with_rect (Gdk.Rectangle rect);
-		public void xor (Gdk.Region source2);
-	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Screen : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -482,7 +316,6 @@ namespace Gdk {
 		public void broadcast_client_message (Gdk.Event event);
 		public unowned Gdk.Window get_active_window ();
 		public static unowned Gdk.Screen get_default ();
-		public unowned Gdk.Colormap get_default_colormap ();
 		public unowned Gdk.Display get_display ();
 		public unowned Cairo.FontOptions get_font_options ();
 		public int get_height ();
@@ -497,13 +330,9 @@ namespace Gdk {
 		public int get_number ();
 		public int get_primary_monitor ();
 		public double get_resolution ();
-		public unowned Gdk.Colormap get_rgb_colormap ();
-		public unowned Gdk.Visual get_rgb_visual ();
-		public unowned Gdk.Colormap get_rgba_colormap ();
 		public unowned Gdk.Visual get_rgba_visual ();
 		public unowned Gdk.Window get_root_window ();
 		public bool get_setting (string name, GLib.Value value);
-		public unowned Gdk.Colormap get_system_colormap ();
 		public unowned Gdk.Visual get_system_visual ();
 		public GLib.List<weak Gdk.Window> get_toplevel_windows ();
 		public int get_width ();
@@ -514,7 +343,6 @@ namespace Gdk {
 		public bool is_composited ();
 		public GLib.List<weak Gdk.Visual> list_visuals ();
 		public unowned string make_display_name ();
-		public void set_default_colormap (Gdk.Colormap colormap);
 		public void set_font_options (Cairo.FontOptions options);
 		public void set_resolution (double dpi);
 		public static int width ();
@@ -555,15 +383,13 @@ namespace Gdk {
 		public void beep ();
 		public void begin_move_drag (int button, int root_x, int root_y, uint32 timestamp);
 		public void begin_paint_rect (Gdk.Rectangle rectangle);
-		public void begin_paint_region (Gdk.Region region);
+		public void begin_paint_region (Cairo.Region region);
 		public void begin_resize_drag (Gdk.WindowEdge edge, int button, int root_x, int root_y, uint32 timestamp);
-		public void clear ();
-		public void clear_area (int x, int y, int width, int height);
-		public void clear_area_e (int x, int y, int width, int height);
 		public void configure_finished ();
 		public static void constrain_size (Gdk.Geometry geometry, uint flags, int width, int height, out int new_width, out int new_height);
 		public void coords_from_parent (double parent_x, double parent_y, double x, double y);
 		public void coords_to_parent (double x, double y, double parent_x, double parent_y);
+		public unowned Cairo.Surface create_similar_surface (Cairo.Content content, int width, int height);
 		public void deiconify ();
 		public void destroy ();
 		public void enable_synchronized_configure ();
@@ -578,16 +404,15 @@ namespace Gdk {
 		public void fullscreen ();
 		public void geometry_changed ();
 		public bool get_accept_focus ();
-		public void get_back_pixmap (out unowned Gdk.Pixmap pixmap, bool parent_relative);
-		public void get_background (Gdk.Color color);
+		public unowned Cairo.Pattern get_background_pattern ();
 		public GLib.List<weak Gdk.Window> get_children ();
 		public bool get_composited ();
 		public unowned Gdk.Cursor? get_cursor ();
 		public bool get_decorations (out Gdk.WMDecoration decorations);
-		public bool get_deskrelative_origin (out int x, out int y);
 		public unowned Gdk.Cursor get_device_cursor (Gdk.Device device);
 		public Gdk.EventMask get_device_events (Gdk.Device device);
 		public unowned Gdk.Window get_device_position (Gdk.Device device, int x, int y, Gdk.ModifierType mask);
+		public unowned Gdk.Display get_display ();
 		public unowned Gdk.Window get_effective_parent ();
 		public unowned Gdk.Window get_effective_toplevel ();
 		public Gdk.EventMask get_events ();
@@ -595,7 +420,7 @@ namespace Gdk {
 		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 unowned Gdk.Window get_group ();
-		public void get_internal_paint_info (out unowned Gdk.Drawable real_drawable, out int x_offset, out int y_offset);
+		public int get_height ();
 		public bool get_modal_hint ();
 		public int get_origin (out int x, out int y);
 		public unowned Gdk.Window get_parent ();
@@ -603,20 +428,23 @@ namespace Gdk {
 		public void get_position (out int x, out int y);
 		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.WindowState get_state ();
 		public bool get_support_multidevice ();
 		public unowned Gdk.Window get_toplevel ();
 		public Gdk.WindowTypeHint get_type_hint ();
-		public unowned Gdk.Region get_update_area ();
+		public unowned Cairo.Region get_update_area ();
 		public void get_user_data (void* data);
+		public unowned Gdk.Visual get_visual ();
+		public int get_width ();
 		public Gdk.WindowType get_window_type ();
+		public bool has_native ();
 		public void hide ();
 		public void iconify ();
-		public void input_shape_combine_mask (Gdk.Bitmap? mask, int x, int y);
-		public void input_shape_combine_region (Gdk.Region shape_region, int offset_x, int offset_y);
-		public void invalidate_maybe_recurse (Gdk.Region region, GLib.Callback child_func);
+		public void input_shape_combine_region (Cairo.Region shape_region, int offset_x, int offset_y);
+		public void invalidate_maybe_recurse (Cairo.Region region, Gdk.WindowChildFunc child_func);
 		public void invalidate_rect (Gdk.Rectangle? rect, bool invalidate_children);
-		public void invalidate_region (Gdk.Region region, bool invalidate_children);
+		public void invalidate_region (Cairo.Region region, bool invalidate_children);
 		public bool is_destroyed ();
 		public bool is_input_only ();
 		public bool is_shaped ();
@@ -629,7 +457,7 @@ namespace Gdk {
 		public void merge_child_input_shapes ();
 		public void merge_child_shapes ();
 		public void move (int x, int y);
-		public void move_region (Gdk.Region region, int dx, int dy);
+		public void move_region (Cairo.Region region, int dx, int dy);
 		public void move_resize (int x, int y, int width, int height);
 		public unowned GLib.List<Gdk.Window> peek_children ();
 		public static void process_all_updates ();
@@ -637,14 +465,14 @@ namespace Gdk {
 		public void raise ();
 		public void register_dnd ();
 		public void remove_filter (Gdk.FilterFunc function);
-		public void remove_redirection ();
 		public void reparent (Gdk.Window new_parent, int x, int y);
 		public void resize (int width, int height);
 		public void restack (Gdk.Window sibling, bool above);
 		public void scroll (int dx, int dy);
 		public void set_accept_focus (bool accept_focus);
-		public void set_back_pixmap (Gdk.Pixmap? pixmap, bool parent_relative);
 		public void set_background (Gdk.Color color);
+		public void set_background_pattern (Cairo.Pattern pattern);
+		public void set_background_rgba (Gdk.RGBA rgba);
 		public void set_child_input_shapes ();
 		public void set_child_shapes ();
 		public void set_composited (bool composited);
@@ -658,7 +486,6 @@ namespace Gdk {
 		public void set_functions (Gdk.WMFunction functions);
 		public void set_geometry_hints (Gdk.Geometry geometry, Gdk.WindowHints geom_mask);
 		public void set_group (Gdk.Window leader);
-		public void set_icon (Gdk.Window icon_window, Gdk.Pixmap pixmap, Gdk.Bitmap mask);
 		public void set_icon_list (GLib.List<Gdk.Pixbuf> pixbufs);
 		public void set_icon_name (string name);
 		public void set_keep_above (bool setting);
@@ -677,8 +504,7 @@ namespace Gdk {
 		public void set_type_hint (Gdk.WindowTypeHint hint);
 		public void set_urgency_hint (bool urgent);
 		public void set_user_data (void* user_data);
-		public void shape_combine_mask (Gdk.Bitmap mask, int x, int y);
-		public void shape_combine_region (Gdk.Region shape_region, int offset_x, int offset_y);
+		public void shape_combine_region (Cairo.Region shape_region, int offset_x, int offset_y);
 		public void show ();
 		public void show_unraised ();
 		public void stick ();
@@ -689,6 +515,7 @@ 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);
@@ -796,7 +623,7 @@ namespace Gdk {
 		public weak Gdk.Window window;
 		public char send_event;
 		public Gdk.Rectangle area;
-		public weak Gdk.Region region;
+		public weak Cairo.Region region;
 		public int count;
 	}
 	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
@@ -927,27 +754,6 @@ namespace Gdk {
 		public Gdk.WindowState changed_mask;
 		public Gdk.WindowState new_window_state;
 	}
-	[CCode (type_id = "GDK_TYPE_GC_VALUES", cheader_filename = "gdk/gdk.h")]
-	public struct GCValues {
-		public Gdk.Color foreground;
-		public Gdk.Color background;
-		public weak Gdk.Font font;
-		public Gdk.Function function;
-		public Gdk.Fill fill;
-		public weak Gdk.Pixmap tile;
-		public weak Gdk.Pixmap stipple;
-		public weak Gdk.Pixmap clip_mask;
-		public Gdk.SubwindowMode subwindow_mode;
-		public int ts_x_origin;
-		public int ts_y_origin;
-		public int clip_x_origin;
-		public int clip_y_origin;
-		public int graphics_exposures;
-		public int line_width;
-		public Gdk.LineStyle line_style;
-		public Gdk.CapStyle cap_style;
-		public Gdk.JoinStyle join_style;
-	}
 	[CCode (type_id = "GDK_TYPE_GEOMETRY", cheader_filename = "gdk/gdk.h")]
 	public struct Geometry {
 		public int min_width;
@@ -972,82 +778,35 @@ namespace Gdk {
 	[SimpleType]
 	public struct NativeWindow {
 	}
-	[CCode (type_id = "GDK_TYPE_PANGO_ATTR_EMBOSS_COLOR", cheader_filename = "gdk/gdk.h")]
-	public struct PangoAttrEmbossColor {
-		public weak Pango.Attribute attr;
-		public Pango.Color color;
-		[CCode (cname = "gdk_pango_attr_emboss_color_new", has_construct_function = false)]
-		public PangoAttrEmbossColor (Gdk.Color color);
-	}
-	[CCode (type_id = "GDK_TYPE_PANGO_ATTR_EMBOSSED", cheader_filename = "gdk/gdk.h")]
-	public struct PangoAttrEmbossed {
-		public weak Pango.Attribute attr;
-		public bool embossed;
-		[CCode (cname = "gdk_pango_attr_embossed_new", has_construct_function = false)]
-		public PangoAttrEmbossed (bool embossed);
-	}
-	[CCode (type_id = "GDK_TYPE_PANGO_ATTR_STIPPLE", cheader_filename = "gdk/gdk.h")]
-	public struct PangoAttrStipple {
-		public weak Pango.Attribute attr;
-		public weak Gdk.Bitmap stipple;
-		[CCode (cname = "gdk_pango_attr_stipple_new", has_construct_function = false)]
-		public PangoAttrStipple (Gdk.Bitmap stipple);
-	}
 	[CCode (type_id = "GDK_TYPE_POINT", cheader_filename = "gdk/gdk.h")]
 	public struct Point {
 		public int x;
 		public int y;
 	}
+	[CCode (type_id = "GDK_TYPE_RGBA", cheader_filename = "gdk/gdk.h")]
+	public struct RGBA {
+		public double red;
+		public double green;
+		public double blue;
+		public double alpha;
+		public Gdk.RGBA copy ();
+		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 unowned string to_string ();
+	}
 	[CCode (type_id = "GDK_TYPE_RECTANGLE", cheader_filename = "gdk/gdk.h")]
 	public struct Rectangle {
-		public int x;
-		public int y;
-		public int width;
-		public int height;
 		public bool intersect (Gdk.Rectangle src2, Gdk.Rectangle dest);
 		public void union (Gdk.Rectangle src2, out Gdk.Rectangle dest);
 	}
-	[CCode (type_id = "GDK_TYPE_RGB_CMAP", cheader_filename = "gdk/gdk.h")]
-	public struct RgbCmap {
-		[CCode (array_length = false)]
-		public weak uint32[] colors;
-		public int n_colors;
-		public weak GLib.SList info_list;
-		[CCode (cname = "gdk_rgb_cmap_new", has_construct_function = false)]
-		public RgbCmap (uint32[] colors);
-		public void free ();
-	}
-	[CCode (type_id = "GDK_TYPE_SEGMENT", cheader_filename = "gdk/gdk.h")]
-	public struct Segment {
-		public int x1;
-		public int y1;
-		public int x2;
-		public int y2;
-	}
-	[CCode (type_id = "GDK_TYPE_SPAN", cheader_filename = "gdk/gdk.h")]
-	public struct Span {
-		public int x;
-		public int y;
-		public int width;
-	}
 	[CCode (type_id = "GDK_TYPE_TIME_COORD", cheader_filename = "gdk/gdk.h")]
 	public struct TimeCoord {
 		public uint32 time;
 		[CCode (array_length = false)]
 		public weak double[] axes;
 	}
-	[CCode (type_id = "GDK_TYPE_TRAPEZOID", cheader_filename = "gdk/gdk.h")]
-	public struct Trapezoid {
-		public double y1;
-		public double x11;
-		public double x21;
-		public double y2;
-		public double x12;
-		public double x22;
-	}
-	[CCode (type_id = "GDK_TYPE_WCHAR", cheader_filename = "gdk/gdk.h")]
-	public struct WChar {
-	}
 	[CCode (type_id = "GDK_TYPE_WINDOW_ATTR", cheader_filename = "gdk/gdk.h")]
 	public struct WindowAttr {
 		public weak string title;
@@ -1058,7 +817,6 @@ namespace Gdk {
 		public int height;
 		public Gdk.WindowClass wclass;
 		public weak Gdk.Visual visual;
-		public weak Gdk.Colormap colormap;
 		public Gdk.WindowType window_type;
 		public weak Gdk.Cursor cursor;
 		public weak string wmclass_name;
@@ -1068,7 +826,6 @@ namespace Gdk {
 	}
 	[CCode (type_id = "GDK_TYPE_WINDOW_REDIRECT", cheader_filename = "gdk/gdk.h")]
 	public struct WindowRedirect {
-		public static void to_drawable (Gdk.Window window, Gdk.Drawable drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
 	}
 	[CCode (type_id = "GDK_TYPE_XEVENT", cheader_filename = "gdk/gdk.h")]
 	public struct XEvent {
@@ -1089,13 +846,6 @@ namespace Gdk {
 		LSB_FIRST,
 		MSB_FIRST
 	}
-	[CCode (cprefix = "GDK_CAP_", cheader_filename = "gdk/gdk.h")]
-	public enum CapStyle {
-		NOT_LAST,
-		BUTT,
-		ROUND,
-		PROJECTING
-	}
 	[CCode (cprefix = "GDK_CROSSING_", cheader_filename = "gdk/gdk.h")]
 	public enum CrossingMode {
 		NORMAL,
@@ -1288,70 +1038,12 @@ namespace Gdk {
 		ALL,
 		CURSOR
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
-	public enum Fill {
-		SOLID,
-		TILED,
-		STIPPLED,
-		OPAQUE_STIPPLED
-	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
-	public enum FillRule {
-		EVEN_ODD_RULE,
-		WINDING_RULE
-	}
 	[CCode (cprefix = "GDK_FILTER_", cheader_filename = "gdk/gdk.h")]
 	public enum FilterReturn {
 		CONTINUE,
 		TRANSLATE,
 		REMOVE
 	}
-	[CCode (cprefix = "GDK_FONT_", cheader_filename = "gdk/gdk.h")]
-	public enum FontType {
-		FONT,
-		FONTSET
-	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
-	public enum Function {
-		COPY,
-		INVERT,
-		XOR,
-		CLEAR,
-		AND,
-		AND_REVERSE,
-		AND_INVERT,
-		NOOP,
-		OR,
-		EQUIV,
-		OR_REVERSE,
-		COPY_INVERT,
-		OR_INVERT,
-		NAND,
-		NOR,
-		SET
-	}
-	[CCode (cprefix = "GDK_GC_", cheader_filename = "gdk/gdk.h")]
-	[Flags]
-	public enum GCValuesMask {
-		FOREGROUND,
-		BACKGROUND,
-		FONT,
-		FUNCTION,
-		FILL,
-		TILE,
-		STIPPLE,
-		CLIP_MASK,
-		SUBWINDOW,
-		TS_X_ORIGIN,
-		TS_Y_ORIGIN,
-		CLIP_X_ORIGIN,
-		CLIP_Y_ORIGIN,
-		EXPOSURES,
-		LINE_WIDTH,
-		LINE_STYLE,
-		CAP_STYLE,
-		JOIN_STYLE
-	}
 	[CCode (cprefix = "GDK_OWNERSHIP_", cheader_filename = "gdk/gdk.h")]
 	public enum GrabOwnership {
 		NONE,
@@ -1379,19 +1071,6 @@ namespace Gdk {
 		SOUTH_EAST,
 		STATIC
 	}
-	[CCode (cprefix = "GDK_IMAGE_", cheader_filename = "gdk/gdk.h")]
-	public enum ImageType {
-		NORMAL,
-		SHARED,
-		FASTEST
-	}
-	[CCode (cprefix = "GDK_INPUT_", cheader_filename = "gdk/gdk.h")]
-	[Flags]
-	public enum InputCondition {
-		READ,
-		WRITE,
-		EXCEPTION
-	}
 	[CCode (cprefix = "GDK_MODE_", cheader_filename = "gdk/gdk.h")]
 	public enum InputMode {
 		DISABLED,
@@ -1406,18 +1085,6 @@ namespace Gdk {
 		CURSOR,
 		KEYBOARD
 	}
-	[CCode (cprefix = "GDK_JOIN_", cheader_filename = "gdk/gdk.h")]
-	public enum JoinStyle {
-		MITER,
-		ROUND,
-		BEVEL
-	}
-	[CCode (cprefix = "GDK_LINE_", cheader_filename = "gdk/gdk.h")]
-	public enum LineStyle {
-		SOLID,
-		ON_OFF_DASH,
-		DOUBLE_DASH
-	}
 	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
 	[Flags]
 	public enum ModifierType {
@@ -1449,12 +1116,6 @@ namespace Gdk {
 		NONLINEAR_VIRTUAL,
 		UNKNOWN
 	}
-	[CCode (cprefix = "GDK_OVERLAP_RECTANGLE_", cheader_filename = "gdk/gdk.h")]
-	public enum OverlapType {
-		IN,
-		OUT,
-		PART
-	}
 	[CCode (cprefix = "GDK_OWNER_CHANGE_", cheader_filename = "gdk/gdk.h")]
 	public enum OwnerChange {
 		NEW_OWNER,
@@ -1472,12 +1133,6 @@ namespace Gdk {
 		NEW_VALUE,
 		DELETE
 	}
-	[CCode (cprefix = "GDK_RGB_DITHER_", cheader_filename = "gdk/gdk.h")]
-	public enum RgbDither {
-		NONE,
-		NORMAL,
-		MAX
-	}
 	[CCode (cprefix = "GDK_SCROLL_", cheader_filename = "gdk/gdk.h")]
 	public enum ScrollDirection {
 		UP,
@@ -1499,11 +1154,6 @@ namespace Gdk {
 		ERROR_FILE,
 		ERROR_MEM
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
-	public enum SubwindowMode {
-		CLIP_BY_CHILDREN,
-		INCLUDE_INFERIORS
-	}
 	[CCode (cprefix = "GDK_VISIBILITY_", cheader_filename = "gdk/gdk.h")]
 	public enum VisibilityState {
 		UNOBSCURED,
@@ -1547,7 +1197,6 @@ namespace Gdk {
 		X,
 		Y,
 		CURSOR,
-		COLORMAP,
 		VISUAL,
 		WMCLASS,
 		NOREDIR,
@@ -1598,7 +1247,6 @@ namespace Gdk {
 		ROOT,
 		TOPLEVEL,
 		CHILD,
-		DIALOG,
 		TEMP,
 		FOREIGN,
 		OFFSCREEN
@@ -1624,10 +1272,8 @@ namespace Gdk {
 	public delegate void EventFunc (Gdk.Event event);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public delegate Gdk.FilterReturn FilterFunc (Gdk.XEvent xevent, Gdk.Event event);
-	[CCode (cheader_filename = "gdk/gdk.h", has_target = false)]
-	public delegate void InputFunction (void* data, int source, Gdk.InputCondition condition);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public delegate void SpanFunc (Gdk.Span span);
+	public delegate bool WindowChildFunc (Gdk.Window window);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public const int CURRENT_TIME;
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1651,9 +1297,13 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static Cairo.Context cairo_create (Gdk.Drawable drawable);
 	[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")]
 	public static void cairo_rectangle (Cairo.Context cr, Gdk.Rectangle rectangle);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void cairo_region (Cairo.Context cr, Gdk.Region region);
+	public static void cairo_region (Cairo.Context cr, Cairo.Region region);
+	[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")]
@@ -1661,7 +1311,9 @@ namespace Gdk {
 	[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);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void cairo_set_source_pixmap (Cairo.Context cr, Gdk.Pixmap pixmap, double pixmap_x, double pixmap_y);
+	public static void cairo_set_source_rgba (Cairo.Context cr, Gdk.RGBA rgba);
+	[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 drag_abort (Gdk.DragContext context, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1685,58 +1337,6 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void drag_status (Gdk.DragContext context, Gdk.DragAction action, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_arc (Gdk.Drawable drawable, Gdk.GC gc, bool filled, int x, int y, int width, int height, int angle1, int angle2);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_drawable (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Drawable src, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_glyphs (Gdk.Drawable drawable, Gdk.GC gc, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_glyphs_transformed (Gdk.Drawable drawable, Gdk.GC gc, Pango.Matrix matrix, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_gray_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] buf, int rowstride);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_image (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Image image, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_indexed_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] buf, int rowstride, Gdk.RgbCmap cmap);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_layout (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.Layout layout);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_layout_line (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.LayoutLine line);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_layout_line_with_colors (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.LayoutLine line, Gdk.Color foreground, Gdk.Color background);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_layout_with_colors (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.Layout layout, Gdk.Color foreground, Gdk.Color background);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_line (Gdk.Drawable drawable, Gdk.GC gc, int x1_, int y1_, int x2_, int y2_);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_lines (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Point[] points);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_pixbuf (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Pixbuf pixbuf, int src_x, int src_y, int dest_x, int dest_y, int width, int height, Gdk.RgbDither dither, int x_dither, int y_dither);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_point (Gdk.Drawable drawable, Gdk.GC gc, int x, int y);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_points (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Point[] points);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_polygon (Gdk.Drawable drawable, Gdk.GC gc, bool filled, Gdk.Point[] points);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_rectangle (Gdk.Drawable drawable, Gdk.GC gc, bool filled, int x, int y, int width, int height);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_rgb_32_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] buf, int rowstride);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_rgb_32_image_dithalign (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] buf, int rowstride, int xdith, int ydith);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_rgb_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] rgb_buf, int rowstride);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_rgb_image_dithalign (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] rgb_buf, int rowstride, int xdith, int ydith);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_segments (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Segment[] segs);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_text (Gdk.Drawable drawable, Gdk.Font font, Gdk.GC gc, int x, int y, string text, int text_length);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_text_wc (Gdk.Drawable drawable, Gdk.Font font, Gdk.GC gc, int x, int y, Gdk.WChar text, int text_length);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_trapezoids (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Trapezoid[] trapezoids);
-	[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_);
@@ -1745,6 +1345,8 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static int error_trap_pop ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static void error_trap_pop_ignored ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void error_trap_push ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool events_get_angle (Gdk.Event event1, Gdk.Event event2, double angle);
@@ -1757,8 +1359,6 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void flush ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static unowned Gdk.Font fontset_load_for_display (Gdk.Display display, string fontset_name);
-	[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);
@@ -1805,7 +1405,7 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static unowned Gdk.Window? offscreen_window_get_embedder (Gdk.Window window);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static unowned Gdk.Pixmap? offscreen_window_get_pixmap (Gdk.Window window);
+	public static unowned Cairo.Surface offscreen_window_get_surface (Gdk.Window window);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void offscreen_window_set_embedder (Gdk.Window window, Gdk.Window embedder);
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1813,21 +1413,15 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static unowned Pango.Context pango_context_get_for_screen (Gdk.Screen screen);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static unowned Gdk.Region pango_layout_get_clip_region (Pango.Layout layout, int x_origin, int y_origin, int index_ranges, int n_ranges);
+	public static unowned Cairo.Region pango_layout_get_clip_region (Pango.Layout layout, int x_origin, int y_origin, int index_ranges, int n_ranges);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static unowned Gdk.Region pango_layout_line_get_clip_region (Pango.LayoutLine line, int x_origin, int y_origin, int index_ranges, int n_ranges);
+	public static unowned Cairo.Region pango_layout_line_get_clip_region (Pango.LayoutLine line, int x_origin, int y_origin, int index_ranges, int n_ranges);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void parse_args (int argc, string argv);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static unowned Gdk.Pixbuf pixbuf_get_from_drawable (Gdk.Pixbuf? dest, Gdk.Drawable src, Gdk.Colormap? cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
+	public static unowned Gdk.Pixbuf pixbuf_get_from_surface (Cairo.Surface surface, int src_x, int src_y, int width, int height);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static unowned Gdk.Pixbuf pixbuf_get_from_image (Gdk.Pixbuf? dest, Gdk.Image src, Gdk.Colormap? cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void pixbuf_render_pixmap_and_mask (Gdk.Pixbuf pixbuf, out unowned Gdk.Pixmap pixmap_return, out unowned Gdk.Bitmap mask_return, int alpha_threshold);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void pixbuf_render_pixmap_and_mask_for_colormap (Gdk.Pixbuf pixbuf, Gdk.Colormap colormap, out unowned Gdk.Pixmap pixmap_return, out unowned Gdk.Bitmap mask_return, int alpha_threshold);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void pixbuf_render_threshold_alpha (Gdk.Pixbuf pixbuf, Gdk.Bitmap bitmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_threshold);
+	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")]
@@ -1846,22 +1440,6 @@ namespace Gdk {
 	public static void query_depths (int depths, int count);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void query_visual_types (out Gdk.VisualType visual_types, int count);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static bool rgb_colormap_ditherable (Gdk.Colormap cmap);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static bool rgb_ditherable ();
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void rgb_find_color (Gdk.Colormap colormap, ref Gdk.Color color);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static unowned Gdk.Colormap rgb_get_colormap ();
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static unowned Gdk.Visual rgb_get_visual ();
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void rgb_set_install (bool install);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void rgb_set_min_colors (int min_colors);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void rgb_set_verbose (bool verbose);
 	[Deprecated (since = "vala-0.12", replacement = "Selection.convert")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void selection_convert (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, uint32 time_);
diff --git a/vapi/gdk-x11-3.0.vapi b/vapi/gdk-x11-3.0.vapi
index 100661d..1c3d3a1 100644
--- a/vapi/gdk-x11-3.0.vapi
+++ b/vapi/gdk-x11-3.0.vapi
@@ -7,18 +7,18 @@ namespace Gdk {
 	[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.Colormap x11_colormap_foreign_new (Gdk.Visual visual, X.Colormap xcolormap);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static X.Colormap x11_colormap_get_xcolormap (Gdk.Colormap colormap);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static unowned X.Display x11_colormap_get_xdisplay (Gdk.Colormap colormap);
-	[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);
@@ -29,16 +29,14 @@ namespace Gdk {
 	[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);
+	[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);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static unowned X.Display x11_gc_get_xdisplay (Gdk.GC gc);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static X.GC x11_gc_get_xgc (Gdk.GC gc);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static X.Window x11_get_default_root_xwindow ();
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static int x11_get_default_screen ();
@@ -57,16 +55,10 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void x11_grab_server ();
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static unowned X.Display x11_image_get_xdisplay (Gdk.Image image);
-	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static void* x11_image_get_ximage (Gdk.Image image);
-	[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 unowned Gdk.Drawable x11_pixmap_get_drawable_impl (Gdk.Pixmap pixmap);
-	[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);
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index d94686d..33811ad 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -503,19 +503,12 @@ namespace Gtk {
 		public float yscale { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Application : GLib.Application, GLib.Initable {
+	public class Application : GLib.Application, GLib.ActionGroup {
 		[CCode (has_construct_function = false)]
-		public Application (string appid, [CCode (array_length_pos = 1.9)] ref unowned string[]? argv = null);
+		public Application (string application_id, GLib.ApplicationFlags flags);
 		public void add_window (Gtk.Window window);
-		public virtual unowned Gtk.Window create_window ();
-		public unowned Gtk.Window get_window ();
-		public unowned GLib.SList get_windows ();
-		public void run ();
-		public void set_action_group (Gtk.ActionGroup group);
-		public virtual signal void action (string action_name);
-		public virtual signal void activated (GLib.Variant args);
-		[HasEmitter]
-		public virtual signal bool quit ();
+		public unowned GLib.List<weak Gtk.Window> get_windows ();
+		public void remove_window (Gtk.Window window);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -812,6 +805,8 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public Gdk.Color cell_background_gdk { get; set; }
 		[NoAccessorMethod]
+		public Gdk.RGBA cell_background_rgba { get; set; }
+		[NoAccessorMethod]
 		public bool cell_background_set { get; set; }
 		[NoAccessorMethod]
 		public bool editing { get; }
@@ -944,6 +939,8 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public Gdk.Color background_gdk { get; set; }
 		[NoAccessorMethod]
+		public Gdk.RGBA background_rgba { get; set; }
+		[NoAccessorMethod]
 		public bool background_set { get; set; }
 		[NoAccessorMethod]
 		public bool editable { get; set; }
@@ -966,6 +963,8 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public Gdk.Color foreground_gdk { get; set; }
 		[NoAccessorMethod]
+		public Gdk.RGBA foreground_rgba { get; set; }
+		[NoAccessorMethod]
 		public bool foreground_set { get; set; }
 		[NoAccessorMethod]
 		public string language { owned get; set; }
@@ -1053,6 +1052,7 @@ namespace Gtk {
 		public unowned Gtk.TreePath get_displayed_row ();
 		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_model (Gtk.TreeModel? model);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -1066,6 +1066,8 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public Gdk.Color background_gdk { get; set; }
 		[NoAccessorMethod]
+		public Gdk.RGBA background_rgba { get; set; }
+		[NoAccessorMethod]
 		public bool background_set { get; set; }
 		public Gtk.TreeModel model { get; set; }
 	}
@@ -1142,16 +1144,21 @@ namespace Gtk {
 		public ColorButton ();
 		public uint16 get_alpha ();
 		public void get_color (out Gdk.Color color);
+		public void get_rgba (Gdk.RGBA rgba);
 		public unowned string get_title ();
 		public bool get_use_alpha ();
 		public void set_alpha (uint16 alpha);
 		public void set_color (Gdk.Color color);
+		public void set_rgba (Gdk.RGBA rgba);
 		public void set_title (string title);
 		public void set_use_alpha (bool use_alpha);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ColorButton.with_color (Gdk.Color color);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ColorButton.with_rgba (Gdk.RGBA rgba);
 		public uint alpha { get; set; }
 		public Gdk.Color color { get; set; }
+		public Gdk.RGBA rgba { get; set; }
 		public string title { get; set; }
 		public bool use_alpha { get; set; }
 		public virtual signal void color_set ();
@@ -1162,22 +1169,27 @@ namespace Gtk {
 		public ColorSelection ();
 		public uint16 get_current_alpha ();
 		public void get_current_color (out Gdk.Color color);
+		public void get_current_rgba (Gdk.RGBA rgba);
 		public bool get_has_opacity_control ();
 		public bool get_has_palette ();
 		public uint16 get_previous_alpha ();
 		public void get_previous_color (out Gdk.Color color);
+		public void get_previous_rgba (Gdk.RGBA rgba);
 		public bool is_adjusting ();
 		public static bool palette_from_string (string str, Gdk.Color[] colors);
 		public static unowned string palette_to_string (Gdk.Color[] colors);
 		public static unowned Gtk.ColorSelectionChangePaletteWithScreenFunc set_change_palette_with_screen_hook (Gtk.ColorSelectionChangePaletteWithScreenFunc func);
 		public void set_current_alpha (uint16 alpha);
 		public void set_current_color (Gdk.Color color);
+		public void set_current_rgba (Gdk.RGBA rgba);
 		public void set_has_opacity_control (bool has_opacity);
 		public void set_has_palette (bool has_palette);
 		public void set_previous_alpha (uint16 alpha);
 		public void set_previous_color (Gdk.Color color);
+		public void set_previous_rgba (Gdk.RGBA rgba);
 		public uint current_alpha { get; set; }
 		public Gdk.Color current_color { get; set; }
+		public Gdk.RGBA current_rgba { get; set; }
 		public bool has_opacity_control { get; set; }
 		public bool has_palette { get; set; }
 		public virtual signal void color_changed ();
@@ -1199,47 +1211,50 @@ namespace Gtk {
 	public class ComboBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.CellEditable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ComboBox ();
-		public void append_text (string text);
 		public int get_active ();
 		public bool get_active_iter (out Gtk.TreeIter iter);
-		public virtual unowned string get_active_text ();
 		public bool get_add_tearoffs ();
 		public Gtk.SensitivityType get_button_sensitivity ();
 		public int get_column_span_column ();
+		public int get_entry_text_column ();
 		public bool get_focus_on_click ();
+		public bool get_has_entry ();
 		public unowned Gtk.TreeModel get_model ();
 		public unowned Atk.Object get_popup_accessible ();
+		public bool get_popup_fixed_width ();
 		public unowned Gtk.TreeViewRowSeparatorFunc get_row_separator_func ();
 		public int get_row_span_column ();
 		public unowned string get_title ();
 		public int get_wrap_width ();
-		public void insert_text (int position, string text);
 		public void popup_for_device (Gdk.Device device);
-		public void prepend_text (string text);
-		public void remove_text (int position);
 		public void set_active (int index_);
 		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_model (Gtk.TreeModel? model);
+		public void set_popup_fixed_width (bool fixed);
 		public void set_row_separator_func (owned Gtk.TreeViewRowSeparatorFunc func);
 		public void set_row_span_column (int row_span);
 		public void set_title (string title);
 		public void set_wrap_width (int width);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ComboBox.text ();
+		public ComboBox.with_entry ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ComboBox.with_model (Gtk.TreeModel model);
 		public int active { get; set; }
 		public bool add_tearoffs { get; set; }
 		public Gtk.SensitivityType button_sensitivity { get; set; }
 		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 Gtk.TreeModel model { get; set; }
+		public bool popup_fixed_width { get; set; }
 		[NoAccessorMethod]
 		public bool popup_shown { get; }
 		public int row_span_column { get; set; }
@@ -1254,16 +1269,17 @@ namespace Gtk {
 		public virtual signal void popup ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ComboBoxEntry : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.CellEditable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ComboBoxEntry ();
-		public int get_text_column ();
-		public void set_text_column (int text_column);
+	public class ComboBoxText : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.CellEditable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ComboBoxEntry.text ();
+		public ComboBoxText ();
+		public void append_text (string text);
+		public unowned string get_active_text ();
+		public void insert_text (int position, string text);
+		public void prepend_text (string text);
+		public void remove (int position);
+		public void remove_all ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ComboBoxEntry.with_model (Gtk.TreeModel model, int text_column);
-		public int text_column { get; set; }
+		public ComboBoxText.with_entry ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Container : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
@@ -1362,6 +1378,7 @@ namespace Gtk {
 		public unowned Gtk.Adjustment get_cursor_hadjustment ();
 		public bool get_has_frame ();
 		public bool get_icon_activatable (Gtk.EntryIconPosition icon_pos);
+		public void get_icon_area (Gtk.EntryIconPosition icon_pos, Gdk.Rectangle icon_area);
 		public int get_icon_at_pos (int x, int y);
 		public unowned GLib.Icon get_icon_gicon (Gtk.EntryIconPosition icon_pos);
 		public unowned string get_icon_name (Gtk.EntryIconPosition icon_pos);
@@ -1371,7 +1388,6 @@ namespace Gtk {
 		public Gtk.ImageType get_icon_storage_type (Gtk.EntryIconPosition icon_pos);
 		public unowned string get_icon_tooltip_markup (Gtk.EntryIconPosition icon_pos);
 		public unowned string get_icon_tooltip_text (Gtk.EntryIconPosition icon_pos);
-		public unowned Gdk.Window get_icon_window (Gtk.EntryIconPosition icon_pos);
 		public unowned Gtk.Border get_inner_border ();
 		public unichar get_invisible_char ();
 		public unowned Pango.Layout get_layout ();
@@ -1381,10 +1397,10 @@ namespace Gtk {
 		public double get_progress_fraction ();
 		public double get_progress_pulse_step ();
 		public unowned string get_text ();
+		public void get_text_area (Gdk.Rectangle text_area);
 		[NoWrapper]
 		public virtual void get_text_area_size (int x, int y, int width, int height);
 		public uint16 get_text_length ();
-		public unowned Gdk.Window get_text_window ();
 		public bool get_visibility ();
 		public int get_width_chars ();
 		public bool im_context_filter_keypress (Gdk.EventKey event);
@@ -1747,6 +1763,25 @@ namespace Gtk {
 		public Gtk.ShadowType shadow_type { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Grid : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Grid ();
+		public void attach (Gtk.Widget child, int left, int top, int width, int height);
+		public void attach_next_to (Gtk.Widget child, Gtk.Widget sibling, Gtk.PositionType side, int width, int height);
+		public bool get_column_homogeneous ();
+		public uint get_column_spacing ();
+		public bool get_row_homogeneous ();
+		public uint get_row_spacing ();
+		public void set_column_homogeneous (bool homogeneous);
+		public void set_column_spacing (uint spacing);
+		public void set_row_homogeneous (bool homogeneous);
+		public void set_row_spacing (uint spacing);
+		public bool column_homogeneous { get; set; }
+		public int column_spacing { get; set; }
+		public bool row_homogeneous { get; set; }
+		public int row_spacing { get; set; }
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public HBox (bool homogeneous, int spacing);
@@ -1874,7 +1909,7 @@ namespace Gtk {
 		public bool get_embedded_rect (out Gdk.Rectangle rectangle);
 		public unowned string get_filename ();
 		public Gdk.Pixbuf load_icon () throws GLib.Error;
-		public unowned Gdk.Pixbuf load_symbolic (Gdk.Color fg, Gdk.Color success_color, Gdk.Color warning_color, Gdk.Color error_color, bool was_symbolic) throws GLib.Error;
+		public unowned Gdk.Pixbuf load_symbolic (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 void set_raw_coordinates (bool raw_coordinates);
 	}
@@ -1942,7 +1977,7 @@ namespace Gtk {
 		public virtual signal void changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class IconView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout {
+	public class IconView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.Scrollable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public IconView ();
 		public void convert_widget_to_bin_window_coords (int wx, int wy, int bx, int by);
@@ -2024,7 +2059,6 @@ namespace Gtk {
 		public virtual signal void select_all ();
 		public virtual signal void select_cursor_item ();
 		public virtual signal void selection_changed ();
-		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
 		public virtual signal void toggle_cursor_item ();
 		public virtual signal void unselect_all ();
 	}
@@ -2252,25 +2286,18 @@ namespace Gtk {
 	public class LabelSelectionInfo {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Layout : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+	public class Layout : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Layout (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
 		public unowned Gdk.Window get_bin_window ();
-		public unowned Gtk.Adjustment get_hadjustment ();
 		public void get_size (out uint width, out uint height);
-		public unowned Gtk.Adjustment get_vadjustment ();
 		public void move (Gtk.Widget child_widget, int x, int y);
 		public void put (Gtk.Widget child_widget, int x, int y);
-		public void set_hadjustment (Gtk.Adjustment adjustment);
 		public void set_size (uint width, uint height);
-		public void set_vadjustment (Gtk.Adjustment adjustment);
-		public Gtk.Adjustment hadjustment { get; set; }
 		[NoAccessorMethod]
 		public uint height { get; set; }
-		public Gtk.Adjustment vadjustment { get; set; }
 		[NoAccessorMethod]
 		public uint width { get; set; }
-		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class LinkButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
@@ -2284,6 +2311,7 @@ namespace Gtk {
 		public LinkButton.with_label (string uri, string label);
 		public string uri { get; set; }
 		public bool visited { get; set; }
+		public virtual signal bool activate_link ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ListStore : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource, Gtk.TreeDragDest, Gtk.TreeSortable, Gtk.Buildable {
@@ -2556,9 +2584,9 @@ namespace Gtk {
 		public virtual signal unowned Gtk.Notebook create_window (Gtk.Widget page, int x, int y);
 		public virtual signal bool focus_tab (Gtk.NotebookTab type);
 		public virtual signal void move_focus_out (Gtk.DirectionType direction);
-		public virtual signal void page_added (Gtk.Widget p0, uint p1);
-		public virtual signal void page_removed (Gtk.Widget p0, uint p1);
-		public virtual signal void page_reordered (Gtk.Widget p0, uint p1);
+		public virtual signal void page_added (Gtk.Widget child, uint page_num);
+		public virtual signal void page_removed (Gtk.Widget child, uint page_num);
+		public virtual signal void page_reordered (Gtk.Widget child, uint page_num);
 		public virtual signal bool reorder_tab (Gtk.DirectionType direction, bool move_to_last);
 		public virtual signal bool select_page (bool move_focus);
 		public virtual signal void switch_page (Gtk.Widget page, uint page_num);
@@ -3109,6 +3137,7 @@ namespace Gtk {
 	[Compact]
 	[CCode (ref_function = "gtk_recent_info_ref", unref_function = "gtk_recent_info_unref", type_id = "GTK_TYPE_RECENT_INFO", cheader_filename = "gtk/gtk.h")]
 	public class RecentInfo {
+		public unowned GLib.AppInfo create_app_info (string app_name) throws GLib.Error;
 		public bool exists ();
 		public ulong get_added ();
 		public int get_age ();
@@ -3117,6 +3146,7 @@ namespace Gtk {
 		public string[] get_applications ();
 		public unowned string get_description ();
 		public unowned string get_display_name ();
+		public unowned GLib.Icon get_gicon ();
 		[CCode (array_length_type = "gsize")]
 		public string[] get_groups ();
 		public Gdk.Pixbuf? get_icon (int size);
@@ -3249,12 +3279,16 @@ namespace Gtk {
 		public void add_with_viewport (Gtk.Widget child);
 		public unowned Gtk.Adjustment get_hadjustment ();
 		public unowned Gtk.Widget get_hscrollbar ();
+		public int get_min_content_height ();
+		public int get_min_content_width ();
 		public Gtk.CornerType get_placement ();
 		public void get_policy (Gtk.PolicyType hscrollbar_policy, Gtk.PolicyType vscrollbar_policy);
 		public Gtk.ShadowType get_shadow_type ();
 		public unowned Gtk.Adjustment get_vadjustment ();
 		public unowned Gtk.Widget get_vscrollbar ();
 		public void set_hadjustment (Gtk.Adjustment hadjustment);
+		public void set_min_content_height (int height);
+		public void set_min_content_width (int width);
 		public void set_placement (Gtk.CornerType window_placement);
 		public void set_policy (Gtk.PolicyType hscrollbar_policy, Gtk.PolicyType vscrollbar_policy);
 		public void set_shadow_type (Gtk.ShadowType type);
@@ -3263,6 +3297,8 @@ namespace Gtk {
 		public Gtk.Adjustment hadjustment { get; set construct; }
 		[NoAccessorMethod]
 		public Gtk.PolicyType hscrollbar_policy { get; set; }
+		public int min_content_height { get; set; }
+		public int min_content_width { get; set; }
 		public Gtk.ShadowType shadow_type { get; set; }
 		public Gtk.Adjustment vadjustment { get; set construct; }
 		[NoAccessorMethod]
@@ -3341,6 +3377,12 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public bool gtk_auto_mnemonics { get; set; }
 		[NoAccessorMethod]
+		public bool gtk_button_images { get; set; }
+		[NoAccessorMethod]
+		public bool gtk_can_change_accels { get; set; }
+		[NoAccessorMethod]
+		public string gtk_color_palette { owned get; set; }
+		[NoAccessorMethod]
 		public string gtk_color_scheme { owned get; set; }
 		[NoAccessorMethod]
 		public bool gtk_cursor_blink { get; set; }
@@ -3371,6 +3413,10 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public bool gtk_enable_tooltips { get; set; }
 		[NoAccessorMethod]
+		public uint gtk_entry_password_hint_timeout { get; set; }
+		[NoAccessorMethod]
+		public bool gtk_entry_select_on_focus { get; set; }
+		[NoAccessorMethod]
 		public bool gtk_error_bell { get; set; }
 		[NoAccessorMethod]
 		public string gtk_fallback_icon_theme { owned get; set; }
@@ -3387,14 +3433,28 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public string gtk_im_module { owned get; set; }
 		[NoAccessorMethod]
+		public Gtk.IMPreeditStyle gtk_im_preedit_style { get; set; }
+		[NoAccessorMethod]
+		public Gtk.IMStatusStyle gtk_im_status_style { get; set; }
+		[NoAccessorMethod]
 		public string gtk_key_theme_name { owned get; set; }
 		[NoAccessorMethod]
 		public bool gtk_keynav_cursor_only { get; set; }
 		[NoAccessorMethod]
 		public bool gtk_keynav_wrap_around { get; set; }
 		[NoAccessorMethod]
+		public bool gtk_label_select_on_focus { get; set; }
+		[NoAccessorMethod]
 		public string gtk_menu_bar_accel { owned get; set; }
 		[NoAccessorMethod]
+		public int gtk_menu_bar_popup_delay { get; set; }
+		[NoAccessorMethod]
+		public bool gtk_menu_images { get; set; }
+		[NoAccessorMethod]
+		public int gtk_menu_popdown_delay { get; set; }
+		[NoAccessorMethod]
+		public int gtk_menu_popup_delay { get; set; }
+		[NoAccessorMethod]
 		public string gtk_modules { owned get; set; }
 		[NoAccessorMethod]
 		public string gtk_print_backends { owned get; set; }
@@ -3405,6 +3465,8 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public int gtk_recent_files_max_age { get; set; }
 		[NoAccessorMethod]
+		public Gtk.CornerType gtk_scrolled_window_placement { get; set; }
+		[NoAccessorMethod]
 		public bool gtk_show_input_method_menu { get; set; }
 		[NoAccessorMethod]
 		public bool gtk_show_unicode_menu { get; set; }
@@ -3467,25 +3529,6 @@ namespace Gtk {
 		public bool ignore_hidden { get; set; }
 		public Gtk.SizeGroupMode mode { get; set; }
 	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class SizeRequest {
-		public int for_size;
-		public int minimum_size;
-		public int natural_size;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class SizeRequestCache {
-		public uint cached_heights;
-		public uint cached_widths;
-		[CCode (array_length = false)]
-		public weak Gtk.SizeRequest[] heights;
-		public uint last_cached_height;
-		public uint last_cached_width;
-		[CCode (array_length = false)]
-		public weak Gtk.SizeRequest[] widths;
-	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Socket : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -3626,14 +3669,11 @@ namespace Gtk {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Statusbar ();
 		public uint get_context_id (string context_description);
-		public bool get_has_resize_grip ();
 		public unowned Gtk.Widget get_message_area ();
 		public void pop (uint context_id);
 		public uint push (uint context_id, string text);
 		public void remove (uint context_id, uint message_id);
 		public void remove_all (uint context_id);
-		public void set_has_resize_grip (bool setting);
-		public bool has_resize_grip { get; set; }
 		public virtual signal void text_popped (uint context_id, string text);
 		public virtual signal void text_pushed (uint context_id, string text);
 	}
@@ -4128,7 +4168,7 @@ namespace Gtk {
 		public virtual signal void tag_removed (Gtk.TextTag tag);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TextView : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+	public class TextView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public TextView ();
 		public void add_child_at_anchor (Gtk.Widget child, Gtk.TextChildAnchor anchor);
@@ -4144,7 +4184,6 @@ namespace Gtk {
 		public bool get_cursor_visible ();
 		public unowned Gtk.TextAttributes get_default_attributes ();
 		public bool get_editable ();
-		public unowned Gtk.Adjustment get_hadjustment ();
 		public int get_indent ();
 		public void get_iter_at_location (out Gtk.TextIter iter, int x, int y);
 		public void get_iter_at_position (out Gtk.TextIter iter, out int trailing, int x, int y);
@@ -4159,15 +4198,12 @@ namespace Gtk {
 		public int get_pixels_inside_wrap ();
 		public int get_right_margin ();
 		public unowned Pango.TabArray get_tabs ();
-		public unowned Gtk.Adjustment get_vadjustment ();
 		public void get_visible_rect (out Gdk.Rectangle visible_rect);
 		public unowned Gdk.Window get_window (Gtk.TextWindowType win);
 		public Gtk.TextWindowType get_window_type (Gdk.Window window);
 		public Gtk.WrapMode get_wrap_mode ();
 		public bool im_context_filter_keypress (Gdk.EventKey event);
 		public void move_child (Gtk.Widget child, int xpos, int ypos);
-		[NoWrapper]
-		public virtual void move_focus (Gtk.DirectionType direction);
 		public bool move_mark_onscreen (Gtk.TextMark mark);
 		public bool move_visually (Gtk.TextIter iter, int count);
 		public bool place_cursor_onscreen ();
@@ -4222,7 +4258,6 @@ namespace Gtk {
 		public virtual signal void preedit_changed (string p0);
 		public virtual signal void select_all (bool p0);
 		public virtual signal void set_anchor ();
-		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
 		public virtual signal void toggle_cursor_visible ();
 		public virtual signal void toggle_overwrite ();
 	}
@@ -4364,7 +4399,7 @@ namespace Gtk {
 		public Gtk.Widget label_widget { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToolPalette : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
+	public class ToolPalette : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.Scrollable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ToolPalette ();
 		public void add_drag_dest (Gtk.Widget widget, Gtk.DestDefaults flags, Gtk.ToolPaletteDragTargets targets, Gdk.DragAction actions);
@@ -4372,10 +4407,8 @@ namespace Gtk {
 		public static Gtk.TargetEntry get_drag_target_group ();
 		public static Gtk.TargetEntry get_drag_target_item ();
 		public unowned Gtk.ToolItem get_drop_item (int x, int y);
-		public unowned Gtk.Adjustment get_hadjustment ();
 		public Gtk.IconSize get_icon_size ();
 		public Gtk.ToolbarStyle get_style ();
-		public unowned Gtk.Adjustment get_vadjustment ();
 		public void set_drag_source (Gtk.ToolPaletteDragTargets targets);
 		public void set_icon_size (Gtk.IconSize icon_size);
 		public void set_style (Gtk.ToolbarStyle style);
@@ -4386,7 +4419,6 @@ namespace Gtk {
 		public bool icon_size_set { get; set; }
 		[NoAccessorMethod]
 		public Gtk.ToolbarStyle toolbar_style { get; set; }
-		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Toolbar : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ToolShell, Gtk.Orientable {
@@ -4568,7 +4600,7 @@ namespace Gtk {
 		public void swap (Gtk.TreeIter a, Gtk.TreeIter b);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TreeView : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+	public class TreeView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public TreeView ();
 		public int append_column (Gtk.TreeViewColumn column);
@@ -4600,7 +4632,6 @@ namespace Gtk {
 		public unowned Gtk.TreeViewColumn get_expander_column ();
 		public bool get_fixed_height_mode ();
 		public Gtk.TreeViewGridLines get_grid_lines ();
-		public unowned Gtk.Adjustment get_hadjustment ();
 		public bool get_headers_clickable ();
 		public bool get_headers_visible ();
 		public bool get_hover_expand ();
@@ -4620,7 +4651,6 @@ namespace Gtk {
 		public bool get_show_expanders ();
 		public int get_tooltip_column ();
 		public bool get_tooltip_context (out int x, out int y, bool keyboard_tip, out unowned Gtk.TreeModel model, out unowned Gtk.TreePath path, out Gtk.TreeIter iter);
-		public unowned Gtk.Adjustment get_vadjustment ();
 		public bool get_visible_range (out unowned Gtk.TreePath start_path, out unowned Gtk.TreePath end_path);
 		public void get_visible_rect (out Gdk.Rectangle visible_rect);
 		public int insert_column (Gtk.TreeViewColumn column, int position);
@@ -4644,7 +4674,6 @@ namespace Gtk {
 		public void set_expander_column (Gtk.TreeViewColumn column);
 		public void set_fixed_height_mode (bool enable);
 		public void set_grid_lines (Gtk.TreeViewGridLines grid_lines);
-		public void set_hadjustment (Gtk.Adjustment adjustment);
 		public void set_headers_clickable (bool setting);
 		public void set_headers_visible (bool headers_visible);
 		public void set_hover_expand (bool expand);
@@ -4663,7 +4692,6 @@ namespace Gtk {
 		public void set_tooltip_cell (Gtk.Tooltip tooltip, Gtk.TreePath path, Gtk.TreeViewColumn column, Gtk.CellRenderer cell);
 		public void set_tooltip_column (int column);
 		public void set_tooltip_row (Gtk.Tooltip tooltip, Gtk.TreePath path);
-		public void set_vadjustment (Gtk.Adjustment adjustment);
 		public void unset_rows_drag_dest ();
 		public void unset_rows_drag_source ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -4674,7 +4702,6 @@ namespace Gtk {
 		public bool enable_tree_lines { get; set; }
 		public Gtk.TreeViewColumn expander_column { get; set; }
 		public bool fixed_height_mode { get; set; }
-		public Gtk.Adjustment hadjustment { get; set; }
 		public bool headers_clickable { get; set; }
 		public bool headers_visible { get; set; }
 		public bool hover_expand { get; set; }
@@ -4687,7 +4714,6 @@ namespace Gtk {
 		public int search_column { get; set; }
 		public bool show_expanders { get; set; }
 		public int tooltip_column { get; set; }
-		public Gtk.Adjustment vadjustment { get; set; }
 		public virtual signal void columns_changed ();
 		public virtual signal void cursor_changed ();
 		public virtual signal bool expand_collapse_cursor_row (bool logical, bool expand, bool open_all);
@@ -4699,7 +4725,6 @@ namespace Gtk {
 		public virtual signal bool select_all ();
 		public virtual signal bool select_cursor_parent ();
 		public virtual signal bool select_cursor_row (bool start_editing);
-		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
 		public virtual signal bool start_interactive_search ();
 		public virtual signal bool test_collapse_row (Gtk.TreeIter iter, Gtk.TreePath path);
 		public virtual signal bool test_expand_row (Gtk.TreeIter iter, Gtk.TreePath path);
@@ -4840,21 +4865,14 @@ namespace Gtk {
 		public VSeparator ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Viewport : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
+	public class Viewport : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Viewport (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
 		public unowned Gdk.Window get_bin_window ();
-		public unowned Gtk.Adjustment get_hadjustment ();
 		public Gtk.ShadowType get_shadow_type ();
-		public unowned Gtk.Adjustment get_vadjustment ();
 		public unowned Gdk.Window get_view_window ();
-		public void set_hadjustment (Gtk.Adjustment adjustment);
 		public void set_shadow_type (Gtk.ShadowType type);
-		public void set_vadjustment (Gtk.Adjustment adjustment);
-		public Gtk.Adjustment hadjustment { get; set construct; }
 		public Gtk.ShadowType shadow_type { get; set; }
-		public Gtk.Adjustment vadjustment { get; set construct; }
-		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class VolumeButton : Gtk.ScaleButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Orientable {
@@ -4871,11 +4889,12 @@ namespace Gtk {
 		public void add_events (int events);
 		public void add_mnemonic_label (Gtk.Widget label);
 		[NoWrapper]
-		public virtual void adjust_size_allocation (Gtk.Allocation allocation);
+		public virtual void adjust_size_allocation (Gtk.Orientation orientation, int natural_size, int allocated_pos, int allocated_size);
 		[NoWrapper]
-		public virtual void adjust_size_request (Gtk.Orientation orientation, int for_size, int minimum_size, int natural_size);
+		public virtual void adjust_size_request (Gtk.Orientation orientation, int minimum_size, int natural_size);
 		public bool child_focus (Gtk.DirectionType direction);
 		public void class_path (out uint path_length, out unowned string path, out unowned string path_reversed);
+		public virtual void compute_expand (Gtk.Orientation orientation);
 		public Pango.Context create_pango_context ();
 		public Pango.Layout create_pango_layout (string? text);
 		public void destroyed (out unowned Gtk.Widget widget_pointer);
@@ -4909,6 +4928,8 @@ namespace Gtk {
 		public Gtk.Align get_halign ();
 		public bool get_has_tooltip ();
 		public bool get_has_window ();
+		public bool get_hexpand ();
+		public bool get_hexpand_set ();
 		public bool get_mapped ();
 		public int get_margin_bottom ();
 		public int get_margin_left ();
@@ -4942,13 +4963,14 @@ namespace Gtk {
 		public unowned Gtk.Window get_tooltip_window ();
 		public unowned Gtk.Widget get_toplevel ();
 		public Gtk.Align get_valign ();
+		public bool get_vexpand ();
+		public bool get_vexpand_set ();
 		public bool get_visible ();
 		public unowned Gdk.Visual get_visual ();
 		public unowned Gdk.Window get_window ();
 		public void grab_default ();
 		public bool has_rc_style ();
 		public bool has_screen ();
-		public virtual void hide_all ();
 		public bool hide_on_delete ();
 		public bool in_destruction ();
 		public void input_shape_combine_region (Cairo.Region region);
@@ -4976,8 +4998,10 @@ namespace Gtk {
 		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 ();
+		public void queue_compute_expand ();
 		public void queue_draw ();
 		public void queue_draw_area (int x, int y, int width, int height);
+		public void queue_draw_region (Cairo.Region region);
 		public void queue_resize ();
 		public void queue_resize_no_redraw ();
 		public unowned Cairo.Region region_intersect (Cairo.Region region);
@@ -5005,6 +5029,8 @@ namespace Gtk {
 		public void set_halign (Gtk.Align align);
 		public void set_has_tooltip (bool has_tooltip);
 		public void set_has_window (bool has_window);
+		public void set_hexpand (bool expand);
+		public void set_hexpand_set (bool @set);
 		public void set_mapped (bool mapped);
 		public void set_margin_bottom (int margin);
 		public void set_margin_left (int margin);
@@ -5016,7 +5042,6 @@ namespace Gtk {
 		public void set_realized (bool realized);
 		public void set_receives_default (bool receives_default);
 		public void set_redraw_on_allocate (bool redraw_on_allocate);
-		public bool set_scroll_adjustments (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
 		public void set_sensitive (bool sensitive);
 		public void set_size_request (int width, int height);
 		public void set_state (Gtk.StateType state);
@@ -5026,6 +5051,8 @@ namespace Gtk {
 		public void set_tooltip_text (string text);
 		public void set_tooltip_window (Gtk.Window custom_window);
 		public void set_valign (Gtk.Align align);
+		public void set_vexpand (bool expand);
+		public void set_vexpand_set (bool @set);
 		public void set_visible (bool visible);
 		public void set_visual (Gdk.Visual visual);
 		public void set_window (Gdk.Window window);
@@ -5048,6 +5075,8 @@ namespace Gtk {
 		public bool composite_child { get; }
 		public bool double_buffered { get; set; }
 		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]
@@ -5057,6 +5086,8 @@ namespace Gtk {
 		public bool has_tooltip { get; set; }
 		[NoAccessorMethod]
 		public int height_request { get; set; }
+		public bool hexpand { get; set; }
+		public bool hexpand_set { get; set; }
 		[NoAccessorMethod]
 		public bool is_focus { get; set; }
 		[NoAccessorMethod]
@@ -5074,6 +5105,8 @@ namespace Gtk {
 		public string tooltip_markup { get; set; }
 		public string tooltip_text { get; set; }
 		public Gtk.Align valign { get; set; }
+		public bool vexpand { get; set; }
+		public bool vexpand_set { get; set; }
 		public bool visible { get; set; }
 		[NoAccessorMethod]
 		public int width_request { get; set; }
@@ -5087,7 +5120,7 @@ namespace Gtk {
 		public virtual signal bool client_event (Gdk.EventClient event);
 		public virtual signal void composited_changed ();
 		public virtual signal bool configure_event (Gdk.EventConfigure event);
-		public virtual signal bool damage_event (Gdk.Event p0);
+		public virtual signal bool damage_event (Gdk.Event event);
 		public virtual signal bool delete_event (Gdk.Event event);
 		public virtual signal void destroy ();
 		public virtual signal bool destroy_event (Gdk.Event event);
@@ -5120,7 +5153,7 @@ namespace Gtk {
 		public virtual signal bool key_press_event (Gdk.EventKey event);
 		public virtual signal bool key_release_event (Gdk.EventKey event);
 		[HasEmitter]
-		public virtual signal bool keynav_failed (Gtk.DirectionType p0);
+		public virtual signal bool keynav_failed (Gtk.DirectionType direction);
 		public virtual signal bool leave_notify_event (Gdk.EventCrossing event);
 		[HasEmitter]
 		public virtual signal void map ();
@@ -5128,7 +5161,7 @@ namespace Gtk {
 		[HasEmitter]
 		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 p0);
+		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 ();
@@ -5186,6 +5219,7 @@ namespace Gtk {
 		public void deiconify ();
 		public void fullscreen ();
 		public bool get_accept_focus ();
+		public unowned Gtk.Application get_application ();
 		public bool get_decorated ();
 		public static GLib.List<weak Gdk.Pixbuf> get_default_icon_list ();
 		public static unowned string get_default_icon_name ();
@@ -5199,6 +5233,7 @@ namespace Gtk {
 		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 ();
 		public unowned string get_icon_name ();
@@ -5208,6 +5243,7 @@ namespace Gtk {
 		public double get_opacity ();
 		public void get_position (out int root_x, out int root_y);
 		public bool get_resizable ();
+		public bool get_resize_grip_area (Gdk.Rectangle rect);
 		public unowned string get_role ();
 		public unowned Gdk.Screen get_screen ();
 		public void get_size (out int width, out int height);
@@ -5224,8 +5260,6 @@ namespace Gtk {
 		public void maximize ();
 		public bool mnemonic_activate (uint keyval, Gdk.ModifierType modifier);
 		public void move (int x, int y);
-		[NoWrapper]
-		public virtual void move_focus (Gtk.DirectionType direction);
 		public bool parse_geometry (string geometry);
 		public void present ();
 		public void present_with_time (uint32 timestamp);
@@ -5235,10 +5269,14 @@ namespace Gtk {
 		public void remove_mnemonic (uint keyval, Gtk.Widget target);
 		public void reshow_with_initial_size ();
 		public void resize (int width, int height);
+		public bool resize_grip_is_visible ();
+		public void resize_to_geometry (int width, int height);
 		public void set_accept_focus (bool setting);
+		public void set_application (Gtk.Application application);
 		public static void set_auto_startup_notification (bool setting);
 		public void set_decorated (bool setting);
 		public void set_default (Gtk.Widget default_widget);
+		public void set_default_geometry (int width, int height);
 		public static void set_default_icon (Gdk.Pixbuf icon);
 		public static bool set_default_icon_from_file (string filename) throws GLib.Error;
 		public static void set_default_icon_list (GLib.List<Gdk.Pixbuf> list);
@@ -5251,6 +5289,7 @@ namespace Gtk {
 		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_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);
@@ -5278,6 +5317,7 @@ namespace Gtk {
 		public void unmaximize ();
 		public void unstick ();
 		public bool accept_focus { get; set; }
+		public Gtk.Application application { get; set; }
 		public bool decorated { get; set; }
 		[NoAccessorMethod]
 		public int default_height { get; set; }
@@ -5287,6 +5327,7 @@ namespace Gtk {
 		public bool destroy_with_parent { get; set; }
 		public bool focus_on_map { get; set; }
 		public Gdk.Gravity gravity { get; set; }
+		public bool has_resize_grip { get; set; }
 		[NoAccessorMethod]
 		public bool has_toplevel_focus { get; }
 		public Gdk.Pixbuf icon { get; set; }
@@ -5297,6 +5338,8 @@ namespace Gtk {
 		public bool modal { get; set; }
 		public double opacity { get; set; }
 		public bool resizable { get; set; }
+		[NoAccessorMethod]
+		public bool resize_grip_visible { get; }
 		public string role { get; set; }
 		public Gdk.Screen screen { get; set; }
 		public bool skip_pager_hint { get; set; }
@@ -5332,34 +5375,6 @@ namespace Gtk {
 		public void remove_window (Gtk.Window window);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class WrapBox : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public WrapBox (Gtk.WrapAllocationMode mode, Gtk.WrapBoxSpreading horizontal_spreading, Gtk.WrapBoxSpreading vertical_spreading, uint horizontal_spacing, uint vertical_spacing);
-		public Gtk.WrapAllocationMode get_allocation_mode ();
-		public uint get_horizontal_spacing ();
-		public Gtk.WrapBoxSpreading get_horizontal_spreading ();
-		public uint get_minimum_line_children ();
-		public uint get_natural_line_children ();
-		public uint get_vertical_spacing ();
-		public Gtk.WrapBoxSpreading get_vertical_spreading ();
-		public void insert_child (Gtk.Widget widget, int index, Gtk.WrapBoxPacking packing);
-		public void reorder_child (Gtk.Widget widget, uint index);
-		public void set_allocation_mode (Gtk.WrapAllocationMode mode);
-		public void set_horizontal_spacing (uint spacing);
-		public void set_horizontal_spreading (Gtk.WrapBoxSpreading spreading);
-		public void set_minimum_line_children (uint n_children);
-		public void set_natural_line_children (uint n_children);
-		public void set_vertical_spacing (uint spacing);
-		public void set_vertical_spreading (Gtk.WrapBoxSpreading spreading);
-		public Gtk.WrapAllocationMode allocation_mode { get; set; }
-		public uint horizontal_spacing { get; set; }
-		public Gtk.WrapBoxSpreading horizontal_spreading { get; set; }
-		public uint minimum_line_children { get; set; }
-		public uint natural_line_children { get; set; }
-		public uint vertical_spacing { get; set; }
-		public Gtk.WrapBoxSpreading vertical_spreading { get; set; }
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public interface Activatable : GLib.Object {
 		public void do_set_related_action (Gtk.Action action);
 		public unowned Gtk.Action get_related_action ();
@@ -5575,6 +5590,15 @@ namespace Gtk {
 		public signal void selection_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public interface Scrollable : GLib.Object {
+		public unowned Gtk.Adjustment get_hadjustment ();
+		public unowned Gtk.Adjustment get_vadjustment ();
+		public void set_hadjustment (Gtk.Adjustment hadjustment);
+		public void set_vadjustment (Gtk.Adjustment vadjustment);
+		public Gtk.Adjustment hadjustment { get; set construct; }
+		public Gtk.Adjustment vadjustment { get; set construct; }
+	}
+	[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 ();
@@ -5655,7 +5679,7 @@ namespace Gtk {
 		public weak string accelerator;
 		public weak string tooltip;
 		[CCode (type = "GCallback")]
-		public weak Gtk.ActionCallback callback;
+		public Gtk.ActionCallback callback;
 	}
 	[CCode (type_id = "GTK_TYPE_ALLOCATION", cheader_filename = "gtk/gtk.h")]
 	public struct Allocation {
@@ -5716,6 +5740,10 @@ namespace Gtk {
 		public weak string target;
 		public uint flags;
 		public uint info;
+		[CCode (cname = "gtk_target_entry_new", has_construct_function = false)]
+		public TargetEntry (string target, uint flags, uint info);
+		public Gtk.TargetEntry copy ();
+		public void free ();
 	}
 	[CCode (type_id = "GTK_TYPE_TEXT_ITER", cheader_filename = "gtk/gtk.h")]
 	public struct TextIter {
@@ -5832,7 +5860,7 @@ namespace Gtk {
 		public weak string accelerator;
 		public weak string tooltip;
 		[CCode (type = "GCallback")]
-		public weak Gtk.ActionCallback callback;
+		public Gtk.ActionCallback callback;
 		public bool is_active;
 	}
 	[CCode (type_id = "GTK_TYPE_TREE_ITER", cheader_filename = "gtk/gtk.h")]
@@ -6597,25 +6625,6 @@ namespace Gtk {
 		TOPLEVEL,
 		POPUP
 	}
-	[CCode (cprefix = "GTK_WRAP_ALLOCATE_", cheader_filename = "gtk/gtk.h")]
-	public enum WrapAllocationMode {
-		FREE,
-		ALIGNED,
-		HOMOGENEOUS
-	}
-	[CCode (cprefix = "GTK_WRAP_BOX_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum WrapBoxPacking {
-		H_EXPAND,
-		V_EXPAND
-	}
-	[CCode (cprefix = "GTK_WRAP_BOX_SPREAD_", cheader_filename = "gtk/gtk.h")]
-	public enum WrapBoxSpreading {
-		START,
-		END,
-		EVEN,
-		EXPAND
-	}
 	[CCode (cprefix = "GTK_WRAP_", cheader_filename = "gtk/gtk.h")]
 	public enum WrapMode {
 		NONE,
@@ -6772,12 +6781,6 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PAPER_NAME_LETTER;
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public const int PARAM_READABLE;
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public const int PARAM_READWRITE;
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public const int PARAM_WRITABLE;
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int PATH_PRIO_MASK;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_COLLATE;
@@ -6841,8 +6844,6 @@ namespace Gtk {
 	public const string PRINT_SETTINGS_WIN32_DRIVER_VERSION;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int PRIORITY_RESIZE;
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public const int SIZE_REQUEST_CACHED_SIZES;
 	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ABOUT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_ABOUT;
@@ -7165,7 +7166,7 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static unowned GLib.SList<Gtk.AccelGroup> accel_groups_from_object (GLib.Object object);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static uint accelerator_get_default_mod_mask ();
+	public static Gdk.ModifierType accelerator_get_default_mod_mask ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static unowned string accelerator_get_label (uint accelerator_key, Gdk.ModifierType accelerator_mods);
 	[CCode (cheader_filename = "gtk/gtk.h")]
diff --git a/vapi/packages/gdk-3.0/gdk-3.0-custom.vala b/vapi/packages/gdk-3.0/gdk-3.0-custom.vala
index 9e36598..695fa56 100644
--- a/vapi/packages/gdk-3.0/gdk-3.0-custom.vala
+++ b/vapi/packages/gdk-3.0/gdk-3.0-custom.vala
@@ -29,37 +29,6 @@ namespace Gdk {
 	public class Bitmap {
 	}
 
-	public class Drawable {
-		[CCode (cname = "gdk_draw_arc")]
-		public virtual void draw_arc (Gdk.GC gc, bool filled, int x, int y, int width, int height, int angle1, int angle2);
-		[CCode (cname = "gdk_draw_drawable")]
-		public virtual void draw_drawable (Gdk.GC gc, Gdk.Drawable src, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
-		[CCode (cname = "gdk_draw_glyphs")]
-		public virtual void draw_glyphs (Gdk.GC gc, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
-		[CCode (cname = "gdk_draw_glyphs_transformed")]
-		public virtual void draw_glyphs_transformed (Gdk.GC gc, Pango.Matrix matrix, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
-		[CCode (cname = "gdk_draw_image")]
-		public virtual void draw_image (Gdk.GC gc, Gdk.Image image, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
-		[CCode (cname = "gdk_draw_lines")]
-		public virtual void draw_lines (Gdk.GC gc, Gdk.Point[] points);
-		[CCode (cname = "gdk_draw_pixbuf")]
-		public virtual void draw_pixbuf (Gdk.GC? gc, Gdk.Pixbuf pixbuf, int src_x, int src_y, int dest_x, int dest_y, int width, int height, Gdk.RgbDither dither, int x_dither, int y_dither);
-		[CCode (cname = "gdk_draw_points")]
-		public virtual void draw_points (Gdk.GC gc, Gdk.Point[] points);
-		[CCode (cname = "gdk_draw_polygon")]
-		public virtual void draw_polygon (Gdk.GC gc, bool filled, Gdk.Point[] points);
-		[CCode (cname = "gdk_draw_rectangle")]
-		public virtual void draw_rectangle (Gdk.GC gc, bool filled, int x, int y, int width, int height);
-		[CCode (cname = "gdk_draw_segments")]
-		public virtual void draw_segments (Gdk.GC gc, Gdk.Segment[] segs);
-		[CCode (cname = "gdk_draw_text")]
-		public virtual void draw_text (Gdk.Font font, Gdk.GC gc, int x, int y, string text, int text_length);
-		[CCode (cname = "gdk_draw_text_wc")]
-		public virtual void draw_text_wc (Gdk.Font font, Gdk.GC gc, int x, int y, Gdk.WChar text, int text_length);
-		[CCode (cname = "gdk_draw_trapezoids")]
-		public virtual void draw_trapezoids (Gdk.GC gc, Gdk.Trapezoid[] trapezoids);
-	}
-
 	[Deprecated (since = "vala-0.12", replacement = "Selection.convert")]
 	public static void selection_convert (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, uint32 time_);
 	[Deprecated (since = "vala-0.12", replacement = "Selection.owner_get")]
diff --git a/vapi/packages/gdk-3.0/gdk-3.0.excludes b/vapi/packages/gdk-3.0/gdk-3.0.excludes
index 9ca941a..735456c 100644
--- a/vapi/packages/gdk-3.0/gdk-3.0.excludes
+++ b/vapi/packages/gdk-3.0/gdk-3.0.excludes
@@ -1,5 +1,6 @@
 gdkalias.h
 gdkkeysyms.h
+gdkkeysyms-compat.h
 gdkx.h
 gdkdirectfb.h
 gdkprivate.h
diff --git a/vapi/packages/gdk-3.0/gdk-3.0.gi b/vapi/packages/gdk-3.0/gdk-3.0.gi
index b7d3722..1c45ecd 100644
--- a/vapi/packages/gdk-3.0/gdk-3.0.gi
+++ b/vapi/packages/gdk-3.0/gdk-3.0.gi
@@ -24,6 +24,13 @@
 				<parameter name="drawable" type="GdkDrawable*"/>
 			</parameters>
 		</function>
+		<function name="cairo_get_clip_rectangle" symbol="gdk_cairo_get_clip_rectangle">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="rect" type="GdkRectangle*"/>
+			</parameters>
+		</function>
 		<function name="cairo_rectangle" symbol="gdk_cairo_rectangle">
 			<return-type type="void"/>
 			<parameters>
@@ -35,7 +42,13 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="cr" type="cairo_t*"/>
-				<parameter name="region" type="GdkRegion*"/>
+				<parameter name="region" type="cairo_region_t*"/>
+			</parameters>
+		</function>
+		<function name="cairo_region_create_from_surface" symbol="gdk_cairo_region_create_from_surface">
+			<return-type type="cairo_region_t*"/>
+			<parameters>
+				<parameter name="surface" type="cairo_surface_t*"/>
 			</parameters>
 		</function>
 		<function name="cairo_reset_clip" symbol="gdk_cairo_reset_clip">
@@ -61,13 +74,20 @@
 				<parameter name="pixbuf_y" type="double"/>
 			</parameters>
 		</function>
-		<function name="cairo_set_source_pixmap" symbol="gdk_cairo_set_source_pixmap">
+		<function name="cairo_set_source_rgba" symbol="gdk_cairo_set_source_rgba">
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="cr" type="cairo_t*"/>
-				<parameter name="pixmap" type="GdkPixmap*"/>
-				<parameter name="pixmap_x" type="double"/>
-				<parameter name="pixmap_y" type="double"/>
+				<parameter name="rgba" type="GdkRGBA*"/>
+			</parameters>
+		</function>
+		<function name="cairo_set_source_window" symbol="gdk_cairo_set_source_window">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="x" type="double"/>
+				<parameter name="y" type="double"/>
 			</parameters>
 		</function>
 		<function name="drag_abort" symbol="gdk_drag_abort">
@@ -162,323 +182,6 @@
 				<parameter name="time_" type="guint32"/>
 			</parameters>
 		</function>
-		<function name="draw_arc" symbol="gdk_draw_arc">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="filled" type="gboolean"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-				<parameter name="width" type="gint"/>
-				<parameter name="height" type="gint"/>
-				<parameter name="angle1" type="gint"/>
-				<parameter name="angle2" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_drawable" symbol="gdk_draw_drawable">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="src" type="GdkDrawable*"/>
-				<parameter name="xsrc" type="gint"/>
-				<parameter name="ysrc" type="gint"/>
-				<parameter name="xdest" type="gint"/>
-				<parameter name="ydest" type="gint"/>
-				<parameter name="width" type="gint"/>
-				<parameter name="height" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_glyphs" symbol="gdk_draw_glyphs">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="font" type="PangoFont*"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-				<parameter name="glyphs" type="PangoGlyphString*"/>
-			</parameters>
-		</function>
-		<function name="draw_glyphs_transformed" symbol="gdk_draw_glyphs_transformed">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="matrix" type="PangoMatrix*"/>
-				<parameter name="font" type="PangoFont*"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-				<parameter name="glyphs" type="PangoGlyphString*"/>
-			</parameters>
-		</function>
-		<function name="draw_gray_image" symbol="gdk_draw_gray_image">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-				<parameter name="width" type="gint"/>
-				<parameter name="height" type="gint"/>
-				<parameter name="dith" type="GdkRgbDither"/>
-				<parameter name="buf" type="guchar*"/>
-				<parameter name="rowstride" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_image" symbol="gdk_draw_image">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="image" type="GdkImage*"/>
-				<parameter name="xsrc" type="gint"/>
-				<parameter name="ysrc" type="gint"/>
-				<parameter name="xdest" type="gint"/>
-				<parameter name="ydest" type="gint"/>
-				<parameter name="width" type="gint"/>
-				<parameter name="height" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_indexed_image" symbol="gdk_draw_indexed_image">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-				<parameter name="width" type="gint"/>
-				<parameter name="height" type="gint"/>
-				<parameter name="dith" type="GdkRgbDither"/>
-				<parameter name="buf" type="guchar*"/>
-				<parameter name="rowstride" type="gint"/>
-				<parameter name="cmap" type="GdkRgbCmap*"/>
-			</parameters>
-		</function>
-		<function name="draw_layout" symbol="gdk_draw_layout">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-				<parameter name="layout" type="PangoLayout*"/>
-			</parameters>
-		</function>
-		<function name="draw_layout_line" symbol="gdk_draw_layout_line">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-				<parameter name="line" type="PangoLayoutLine*"/>
-			</parameters>
-		</function>
-		<function name="draw_layout_line_with_colors" symbol="gdk_draw_layout_line_with_colors">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-				<parameter name="line" type="PangoLayoutLine*"/>
-				<parameter name="foreground" type="GdkColor*"/>
-				<parameter name="background" type="GdkColor*"/>
-			</parameters>
-		</function>
-		<function name="draw_layout_with_colors" symbol="gdk_draw_layout_with_colors">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-				<parameter name="layout" type="PangoLayout*"/>
-				<parameter name="foreground" type="GdkColor*"/>
-				<parameter name="background" type="GdkColor*"/>
-			</parameters>
-		</function>
-		<function name="draw_line" symbol="gdk_draw_line">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="x1_" type="gint"/>
-				<parameter name="y1_" type="gint"/>
-				<parameter name="x2_" type="gint"/>
-				<parameter name="y2_" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_lines" symbol="gdk_draw_lines">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="points" type="GdkPoint*"/>
-				<parameter name="n_points" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_pixbuf" symbol="gdk_draw_pixbuf">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="pixbuf" type="GdkPixbuf*"/>
-				<parameter name="src_x" type="gint"/>
-				<parameter name="src_y" type="gint"/>
-				<parameter name="dest_x" type="gint"/>
-				<parameter name="dest_y" type="gint"/>
-				<parameter name="width" type="gint"/>
-				<parameter name="height" type="gint"/>
-				<parameter name="dither" type="GdkRgbDither"/>
-				<parameter name="x_dither" type="gint"/>
-				<parameter name="y_dither" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_point" symbol="gdk_draw_point">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_points" symbol="gdk_draw_points">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="points" type="GdkPoint*"/>
-				<parameter name="n_points" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_polygon" symbol="gdk_draw_polygon">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="filled" type="gboolean"/>
-				<parameter name="points" type="GdkPoint*"/>
-				<parameter name="n_points" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_rectangle" symbol="gdk_draw_rectangle">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="filled" type="gboolean"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-				<parameter name="width" type="gint"/>
-				<parameter name="height" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_rgb_32_image" symbol="gdk_draw_rgb_32_image">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-				<parameter name="width" type="gint"/>
-				<parameter name="height" type="gint"/>
-				<parameter name="dith" type="GdkRgbDither"/>
-				<parameter name="buf" type="guchar*"/>
-				<parameter name="rowstride" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_rgb_32_image_dithalign" symbol="gdk_draw_rgb_32_image_dithalign">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-				<parameter name="width" type="gint"/>
-				<parameter name="height" type="gint"/>
-				<parameter name="dith" type="GdkRgbDither"/>
-				<parameter name="buf" type="guchar*"/>
-				<parameter name="rowstride" type="gint"/>
-				<parameter name="xdith" type="gint"/>
-				<parameter name="ydith" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_rgb_image" symbol="gdk_draw_rgb_image">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-				<parameter name="width" type="gint"/>
-				<parameter name="height" type="gint"/>
-				<parameter name="dith" type="GdkRgbDither"/>
-				<parameter name="rgb_buf" type="guchar*"/>
-				<parameter name="rowstride" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_rgb_image_dithalign" symbol="gdk_draw_rgb_image_dithalign">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-				<parameter name="width" type="gint"/>
-				<parameter name="height" type="gint"/>
-				<parameter name="dith" type="GdkRgbDither"/>
-				<parameter name="rgb_buf" type="guchar*"/>
-				<parameter name="rowstride" type="gint"/>
-				<parameter name="xdith" type="gint"/>
-				<parameter name="ydith" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_segments" symbol="gdk_draw_segments">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="segs" type="GdkSegment*"/>
-				<parameter name="n_segs" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_text" symbol="gdk_draw_text">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="font" type="GdkFont*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-				<parameter name="text" type="gchar*"/>
-				<parameter name="text_length" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_text_wc" symbol="gdk_draw_text_wc">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="font" type="GdkFont*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-				<parameter name="text" type="GdkWChar*"/>
-				<parameter name="text_length" type="gint"/>
-			</parameters>
-		</function>
-		<function name="draw_trapezoids" symbol="gdk_draw_trapezoids">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="gc" type="GdkGC*"/>
-				<parameter name="trapezoids" type="GdkTrapezoid*"/>
-				<parameter name="n_trapezoids" type="gint"/>
-			</parameters>
-		</function>
 		<function name="drop_finish" symbol="gdk_drop_finish">
 			<return-type type="void"/>
 			<parameters>
@@ -501,6 +204,9 @@
 		<function name="error_trap_pop" symbol="gdk_error_trap_pop">
 			<return-type type="gint"/>
 		</function>
+		<function name="error_trap_pop_ignored" symbol="gdk_error_trap_pop_ignored">
+			<return-type type="void"/>
+		</function>
 		<function name="error_trap_push" symbol="gdk_error_trap_push">
 			<return-type type="void"/>
 		</function>
@@ -535,13 +241,6 @@
 		<function name="flush" symbol="gdk_flush">
 			<return-type type="void"/>
 		</function>
-		<function name="fontset_load_for_display" symbol="gdk_fontset_load_for_display">
-			<return-type type="GdkFont*"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="fontset_name" type="gchar*"/>
-			</parameters>
-		</function>
 		<function name="free_compound_text" symbol="gdk_free_compound_text">
 			<return-type type="void"/>
 			<parameters>
@@ -564,7 +263,7 @@
 			<return-type type="gchar*"/>
 		</function>
 		<function name="get_program_class" symbol="gdk_get_program_class">
-			<return-type type="char*"/>
+			<return-type type="gchar*"/>
 		</function>
 		<function name="get_show_events" symbol="gdk_get_show_events">
 			<return-type type="gboolean"/>
@@ -665,8 +364,8 @@
 				<parameter name="window" type="GdkWindow*"/>
 			</parameters>
 		</function>
-		<function name="offscreen_window_get_pixmap" symbol="gdk_offscreen_window_get_pixmap">
-			<return-type type="GdkPixmap*"/>
+		<function name="offscreen_window_get_surface" symbol="gdk_offscreen_window_get_surface">
+			<return-type type="cairo_surface_t*"/>
 			<parameters>
 				<parameter name="window" type="GdkWindow*"/>
 			</parameters>
@@ -688,7 +387,7 @@
 			</parameters>
 		</function>
 		<function name="pango_layout_get_clip_region" symbol="gdk_pango_layout_get_clip_region">
-			<return-type type="GdkRegion*"/>
+			<return-type type="cairo_region_t*"/>
 			<parameters>
 				<parameter name="layout" type="PangoLayout*"/>
 				<parameter name="x_origin" type="gint"/>
@@ -698,7 +397,7 @@
 			</parameters>
 		</function>
 		<function name="pango_layout_line_get_clip_region" symbol="gdk_pango_layout_line_get_clip_region">
-			<return-type type="GdkRegion*"/>
+			<return-type type="cairo_region_t*"/>
 			<parameters>
 				<parameter name="line" type="PangoLayoutLine*"/>
 				<parameter name="x_origin" type="gint"/>
@@ -714,65 +413,24 @@
 				<parameter name="argv" type="gchar***"/>
 			</parameters>
 		</function>
-		<function name="pixbuf_get_from_drawable" symbol="gdk_pixbuf_get_from_drawable">
+		<function name="pixbuf_get_from_surface" symbol="gdk_pixbuf_get_from_surface">
 			<return-type type="GdkPixbuf*"/>
 			<parameters>
-				<parameter name="dest" type="GdkPixbuf*"/>
-				<parameter name="src" type="GdkDrawable*"/>
-				<parameter name="cmap" type="GdkColormap*"/>
+				<parameter name="surface" type="cairo_surface_t*"/>
 				<parameter name="src_x" type="int"/>
 				<parameter name="src_y" type="int"/>
-				<parameter name="dest_x" type="int"/>
-				<parameter name="dest_y" type="int"/>
 				<parameter name="width" type="int"/>
 				<parameter name="height" type="int"/>
 			</parameters>
 		</function>
-		<function name="pixbuf_get_from_image" symbol="gdk_pixbuf_get_from_image">
+		<function name="pixbuf_get_from_window" symbol="gdk_pixbuf_get_from_window">
 			<return-type type="GdkPixbuf*"/>
 			<parameters>
-				<parameter name="dest" type="GdkPixbuf*"/>
-				<parameter name="src" type="GdkImage*"/>
-				<parameter name="cmap" type="GdkColormap*"/>
-				<parameter name="src_x" type="int"/>
-				<parameter name="src_y" type="int"/>
-				<parameter name="dest_x" type="int"/>
-				<parameter name="dest_y" type="int"/>
-				<parameter name="width" type="int"/>
-				<parameter name="height" type="int"/>
-			</parameters>
-		</function>
-		<function name="pixbuf_render_pixmap_and_mask" symbol="gdk_pixbuf_render_pixmap_and_mask">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="pixbuf" type="GdkPixbuf*"/>
-				<parameter name="pixmap_return" type="GdkPixmap**"/>
-				<parameter name="mask_return" type="GdkBitmap**"/>
-				<parameter name="alpha_threshold" type="int"/>
-			</parameters>
-		</function>
-		<function name="pixbuf_render_pixmap_and_mask_for_colormap" symbol="gdk_pixbuf_render_pixmap_and_mask_for_colormap">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="pixbuf" type="GdkPixbuf*"/>
-				<parameter name="colormap" type="GdkColormap*"/>
-				<parameter name="pixmap_return" type="GdkPixmap**"/>
-				<parameter name="mask_return" type="GdkBitmap**"/>
-				<parameter name="alpha_threshold" type="int"/>
-			</parameters>
-		</function>
-		<function name="pixbuf_render_threshold_alpha" symbol="gdk_pixbuf_render_threshold_alpha">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="pixbuf" type="GdkPixbuf*"/>
-				<parameter name="bitmap" type="GdkBitmap*"/>
+				<parameter name="window" type="GdkWindow*"/>
 				<parameter name="src_x" type="int"/>
 				<parameter name="src_y" type="int"/>
-				<parameter name="dest_x" type="int"/>
-				<parameter name="dest_y" type="int"/>
 				<parameter name="width" type="int"/>
 				<parameter name="height" type="int"/>
-				<parameter name="alpha_threshold" type="int"/>
 			</parameters>
 		</function>
 		<function name="pointer_grab" symbol="gdk_pointer_grab">
@@ -846,46 +504,6 @@
 				<parameter name="count" type="gint*"/>
 			</parameters>
 		</function>
-		<function name="rgb_colormap_ditherable" symbol="gdk_rgb_colormap_ditherable">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="cmap" type="GdkColormap*"/>
-			</parameters>
-		</function>
-		<function name="rgb_ditherable" symbol="gdk_rgb_ditherable">
-			<return-type type="gboolean"/>
-		</function>
-		<function name="rgb_find_color" symbol="gdk_rgb_find_color">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="colormap" type="GdkColormap*"/>
-				<parameter name="color" type="GdkColor*"/>
-			</parameters>
-		</function>
-		<function name="rgb_get_colormap" symbol="gdk_rgb_get_colormap">
-			<return-type type="GdkColormap*"/>
-		</function>
-		<function name="rgb_get_visual" symbol="gdk_rgb_get_visual">
-			<return-type type="GdkVisual*"/>
-		</function>
-		<function name="rgb_set_install" symbol="gdk_rgb_set_install">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="install" type="gboolean"/>
-			</parameters>
-		</function>
-		<function name="rgb_set_min_colors" symbol="gdk_rgb_set_min_colors">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="min_colors" type="gint"/>
-			</parameters>
-		</function>
-		<function name="rgb_set_verbose" symbol="gdk_rgb_set_verbose">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="verbose" type="gboolean"/>
-			</parameters>
-		</function>
 		<function name="selection_convert" symbol="gdk_selection_convert">
 			<return-type type="void"/>
 			<parameters>
@@ -975,7 +593,7 @@
 		<function name="set_program_class" symbol="gdk_set_program_class">
 			<return-type type="void"/>
 			<parameters>
-				<parameter name="program_class" type="char*"/>
+				<parameter name="program_class" type="gchar*"/>
 			</parameters>
 		</function>
 		<function name="set_show_events" symbol="gdk_set_show_events">
@@ -1243,19 +861,11 @@
 				<parameter name="data" type="gpointer"/>
 			</parameters>
 		</callback>
-		<callback name="GdkInputFunction">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="source" type="gint"/>
-				<parameter name="condition" type="GdkInputCondition"/>
-			</parameters>
-		</callback>
-		<callback name="GdkSpanFunc">
-			<return-type type="void"/>
+		<callback name="GdkWindowChildFunc">
+			<return-type type="gboolean"/>
 			<parameters>
-				<parameter name="span" type="GdkSpan*"/>
-				<parameter name="data" type="gpointer"/>
+				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="user_data" type="gpointer"/>
 			</parameters>
 		</callback>
 		<struct name="GdkAtom">
@@ -1279,18 +889,6 @@
 				</parameters>
 			</method>
 		</struct>
-		<struct name="GdkBitmap">
-			<method name="create_from_data" symbol="gdk_bitmap_create_from_data">
-				<return-type type="GdkBitmap*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="data" type="gchar*"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-				</parameters>
-			</method>
-			<field name="parent_instance" type="GObject"/>
-		</struct>
 		<struct name="GdkDeviceAxis">
 			<field name="use" type="GdkAxisUse"/>
 			<field name="min" type="gdouble"/>
@@ -1375,7 +973,7 @@
 			<field name="window" type="GdkWindow*"/>
 			<field name="send_event" type="gint8"/>
 			<field name="area" type="GdkRectangle"/>
-			<field name="region" type="GdkRegion*"/>
+			<field name="region" type="cairo_region_t*"/>
 			<field name="count" type="gint"/>
 		</struct>
 		<struct name="GdkEventFocus">
@@ -1492,26 +1090,6 @@
 			<field name="changed_mask" type="GdkWindowState"/>
 			<field name="new_window_state" type="GdkWindowState"/>
 		</struct>
-		<struct name="GdkGCValues">
-			<field name="foreground" type="GdkColor"/>
-			<field name="background" type="GdkColor"/>
-			<field name="font" type="GdkFont*"/>
-			<field name="function" type="GdkFunction"/>
-			<field name="fill" type="GdkFill"/>
-			<field name="tile" type="GdkPixmap*"/>
-			<field name="stipple" type="GdkPixmap*"/>
-			<field name="clip_mask" type="GdkPixmap*"/>
-			<field name="subwindow_mode" type="GdkSubwindowMode"/>
-			<field name="ts_x_origin" type="gint"/>
-			<field name="ts_y_origin" type="gint"/>
-			<field name="clip_x_origin" type="gint"/>
-			<field name="clip_y_origin" type="gint"/>
-			<field name="graphics_exposures" type="gint"/>
-			<field name="line_width" type="gint"/>
-			<field name="line_style" type="GdkLineStyle"/>
-			<field name="cap_style" type="GdkCapStyle"/>
-			<field name="join_style" type="GdkJoinStyle"/>
-		</struct>
 		<struct name="GdkGeometry">
 			<field name="min_width" type="gint"/>
 			<field name="min_height" type="gint"/>
@@ -1546,44 +1124,6 @@
 		</struct>
 		<struct name="GdkNativeWindow">
 		</struct>
-		<struct name="GdkPangoAttrEmbossColor">
-			<method name="new" symbol="gdk_pango_attr_emboss_color_new">
-				<return-type type="PangoAttribute*"/>
-				<parameters>
-					<parameter name="color" type="GdkColor*"/>
-				</parameters>
-			</method>
-			<field name="attr" type="PangoAttribute"/>
-			<field name="color" type="PangoColor"/>
-		</struct>
-		<struct name="GdkPangoAttrEmbossed">
-			<method name="new" symbol="gdk_pango_attr_embossed_new">
-				<return-type type="PangoAttribute*"/>
-				<parameters>
-					<parameter name="embossed" type="gboolean"/>
-				</parameters>
-			</method>
-			<field name="attr" type="PangoAttribute"/>
-			<field name="embossed" type="gboolean"/>
-		</struct>
-		<struct name="GdkPangoAttrStipple">
-			<method name="new" symbol="gdk_pango_attr_stipple_new">
-				<return-type type="PangoAttribute*"/>
-				<parameters>
-					<parameter name="stipple" type="GdkBitmap*"/>
-				</parameters>
-			</method>
-			<field name="attr" type="PangoAttribute"/>
-			<field name="stipple" type="GdkBitmap*"/>
-		</struct>
-		<struct name="GdkPixmapObject">
-			<field name="parent_instance" type="GdkDrawable"/>
-			<field name="_g_sealed__impl" type="GdkDrawable*"/>
-			<field name="_g_sealed__depth" type="gint"/>
-		</struct>
-		<struct name="GdkPixmapObjectClass">
-			<field name="parent_class" type="GdkDrawableClass"/>
-		</struct>
 		<struct name="GdkPoint">
 			<field name="x" type="gint"/>
 			<field name="y" type="gint"/>
@@ -1600,194 +1140,30 @@
 			<field name="state" type="guint32"/>
 			<field name="button" type="guint32"/>
 		</struct>
-		<struct name="GdkRegion">
-			<method name="copy" symbol="gdk_region_copy">
-				<return-type type="GdkRegion*"/>
-				<parameters>
-					<parameter name="region" type="GdkRegion*"/>
-				</parameters>
-			</method>
-			<method name="destroy" symbol="gdk_region_destroy">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="region" type="GdkRegion*"/>
-				</parameters>
-			</method>
-			<method name="empty" symbol="gdk_region_empty">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="region" type="GdkRegion*"/>
-				</parameters>
-			</method>
-			<method name="equal" symbol="gdk_region_equal">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="region1" type="GdkRegion*"/>
-					<parameter name="region2" type="GdkRegion*"/>
-				</parameters>
-			</method>
-			<method name="get_clipbox" symbol="gdk_region_get_clipbox">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="region" type="GdkRegion*"/>
-					<parameter name="rectangle" type="GdkRectangle*"/>
-				</parameters>
-			</method>
-			<method name="get_rectangles" symbol="gdk_region_get_rectangles">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="region" type="GdkRegion*"/>
-					<parameter name="rectangles" type="GdkRectangle**"/>
-					<parameter name="n_rectangles" type="gint*"/>
-				</parameters>
-			</method>
-			<method name="intersect" symbol="gdk_region_intersect">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="source1" type="GdkRegion*"/>
-					<parameter name="source2" type="GdkRegion*"/>
-				</parameters>
-			</method>
-			<method name="new" symbol="gdk_region_new">
-				<return-type type="GdkRegion*"/>
-			</method>
-			<method name="offset" symbol="gdk_region_offset">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="region" type="GdkRegion*"/>
-					<parameter name="dx" type="gint"/>
-					<parameter name="dy" type="gint"/>
-				</parameters>
-			</method>
-			<method name="point_in" symbol="gdk_region_point_in">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="region" type="GdkRegion*"/>
-					<parameter name="x" type="int"/>
-					<parameter name="y" type="int"/>
-				</parameters>
-			</method>
-			<method name="polygon" symbol="gdk_region_polygon">
-				<return-type type="GdkRegion*"/>
-				<parameters>
-					<parameter name="points" type="GdkPoint*"/>
-					<parameter name="n_points" type="gint"/>
-					<parameter name="fill_rule" type="GdkFillRule"/>
-				</parameters>
-			</method>
-			<method name="rect_equal" symbol="gdk_region_rect_equal">
+		<struct name="GdkRectangle">
+			<method name="intersect" symbol="gdk_rectangle_intersect">
 				<return-type type="gboolean"/>
 				<parameters>
-					<parameter name="region" type="GdkRegion*"/>
-					<parameter name="rectangle" type="GdkRectangle*"/>
-				</parameters>
-			</method>
-			<method name="rect_in" symbol="gdk_region_rect_in">
-				<return-type type="GdkOverlapType"/>
-				<parameters>
-					<parameter name="region" type="GdkRegion*"/>
-					<parameter name="rectangle" type="GdkRectangle*"/>
-				</parameters>
-			</method>
-			<method name="rectangle" symbol="gdk_region_rectangle">
-				<return-type type="GdkRegion*"/>
-				<parameters>
-					<parameter name="rectangle" type="GdkRectangle*"/>
-				</parameters>
-			</method>
-			<method name="shrink" symbol="gdk_region_shrink">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="region" type="GdkRegion*"/>
-					<parameter name="dx" type="gint"/>
-					<parameter name="dy" type="gint"/>
-				</parameters>
-			</method>
-			<method name="spans_intersect_foreach" symbol="gdk_region_spans_intersect_foreach">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="region" type="GdkRegion*"/>
-					<parameter name="spans" type="GdkSpan*"/>
-					<parameter name="n_spans" type="int"/>
-					<parameter name="sorted" type="gboolean"/>
-					<parameter name="function" type="GdkSpanFunc"/>
-					<parameter name="data" type="gpointer"/>
-				</parameters>
-			</method>
-			<method name="subtract" symbol="gdk_region_subtract">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="source1" type="GdkRegion*"/>
-					<parameter name="source2" type="GdkRegion*"/>
-				</parameters>
-			</method>
-			<method name="union" symbol="gdk_region_union">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="source1" type="GdkRegion*"/>
-					<parameter name="source2" type="GdkRegion*"/>
-				</parameters>
-			</method>
-			<method name="union_with_rect" symbol="gdk_region_union_with_rect">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="region" type="GdkRegion*"/>
-					<parameter name="rect" type="GdkRectangle*"/>
-				</parameters>
-			</method>
-			<method name="xor" symbol="gdk_region_xor">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="source1" type="GdkRegion*"/>
-					<parameter name="source2" type="GdkRegion*"/>
+					<parameter name="src1" type="GdkRectangle*"/>
+					<parameter name="src2" type="GdkRectangle*"/>
+					<parameter name="dest" type="GdkRectangle*"/>
 				</parameters>
 			</method>
-		</struct>
-		<struct name="GdkRgbCmap">
-			<method name="free" symbol="gdk_rgb_cmap_free">
+			<method name="union" symbol="gdk_rectangle_union">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="cmap" type="GdkRgbCmap*"/>
-				</parameters>
-			</method>
-			<method name="new" symbol="gdk_rgb_cmap_new">
-				<return-type type="GdkRgbCmap*"/>
-				<parameters>
-					<parameter name="colors" type="guint32*"/>
-					<parameter name="n_colors" type="gint"/>
+					<parameter name="src1" type="GdkRectangle*"/>
+					<parameter name="src2" type="GdkRectangle*"/>
+					<parameter name="dest" type="GdkRectangle*"/>
 				</parameters>
 			</method>
-			<field name="colors" type="guint32[]"/>
-			<field name="n_colors" type="gint"/>
-			<field name="info_list" type="GSList*"/>
-		</struct>
-		<struct name="GdkSegment">
-			<field name="x1" type="gint"/>
-			<field name="y1" type="gint"/>
-			<field name="x2" type="gint"/>
-			<field name="y2" type="gint"/>
-		</struct>
-		<struct name="GdkSpan">
-			<field name="x" type="gint"/>
-			<field name="y" type="gint"/>
-			<field name="width" type="gint"/>
 		</struct>
 		<struct name="GdkTimeCoord">
 			<field name="time" type="guint32"/>
 			<field name="axes" type="gdouble[]"/>
 		</struct>
-		<struct name="GdkTrapezoid">
-			<field name="y1" type="double"/>
-			<field name="x11" type="double"/>
-			<field name="x21" type="double"/>
-			<field name="y2" type="double"/>
-			<field name="x12" type="double"/>
-			<field name="x22" type="double"/>
-		</struct>
 		<struct name="GdkVisualClass">
 		</struct>
-		<struct name="GdkWChar">
-		</struct>
 		<struct name="GdkWindowAttr">
 			<field name="title" type="gchar*"/>
 			<field name="event_mask" type="gint"/>
@@ -1797,7 +1173,6 @@
 			<field name="height" type="gint"/>
 			<field name="wclass" type="GdkWindowClass"/>
 			<field name="visual" type="GdkVisual*"/>
-			<field name="colormap" type="GdkColormap*"/>
 			<field name="window_type" type="GdkWindowType"/>
 			<field name="cursor" type="GdkCursor*"/>
 			<field name="wmclass_name" type="gchar*"/>
@@ -1809,21 +1184,20 @@
 		</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">
-			<method name="to_drawable" symbol="gdk_window_redirect_to_drawable">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="src_x" type="gint"/>
-					<parameter name="src_y" type="gint"/>
-					<parameter name="dest_x" type="gint"/>
-					<parameter name="dest_y" type="gint"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-				</parameters>
-			</method>
 		</struct>
 		<struct name="GdkXEvent">
 		</struct>
@@ -1872,6 +1246,12 @@
 			<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>
@@ -1913,17 +1293,6 @@
 					<parameter name="y" type="gint"/>
 				</parameters>
 			</constructor>
-			<constructor name="new_from_pixmap" symbol="gdk_cursor_new_from_pixmap">
-				<return-type type="GdkCursor*"/>
-				<parameters>
-					<parameter name="source" type="GdkPixmap*"/>
-					<parameter name="mask" type="GdkPixmap*"/>
-					<parameter name="fg" type="GdkColor*"/>
-					<parameter name="bg" type="GdkColor*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-				</parameters>
-			</constructor>
 			<method name="ref" symbol="gdk_cursor_ref">
 				<return-type type="GdkCursor*"/>
 				<parameters>
@@ -2090,71 +1459,51 @@
 			<field name="setting" type="GdkEventSetting"/>
 			<field name="grab_broken" type="GdkEventGrabBroken"/>
 		</boxed>
-		<boxed name="GdkFont" type-name="GdkFont" get-type="gdk_font_get_type">
-			<method name="equal" symbol="gdk_font_equal">
-				<return-type type="gboolean"/>
+		<boxed name="GdkRGBA" type-name="GdkRGBA" get-type="gdk_rgba_get_type">
+			<method name="copy" symbol="gdk_rgba_copy">
+				<return-type type="GdkRGBA*"/>
 				<parameters>
-					<parameter name="fonta" type="GdkFont*"/>
-					<parameter name="fontb" type="GdkFont*"/>
+					<parameter name="rgba" type="GdkRGBA*"/>
 				</parameters>
 			</method>
-			<method name="from_description_for_display" symbol="gdk_font_from_description_for_display">
-				<return-type type="GdkFont*"/>
+			<method name="equal" symbol="gdk_rgba_equal">
+				<return-type type="gboolean"/>
 				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="font_desc" type="PangoFontDescription*"/>
+					<parameter name="p1" type="gconstpointer"/>
+					<parameter name="p2" type="gconstpointer"/>
 				</parameters>
 			</method>
-			<method name="id" symbol="gdk_font_id">
-				<return-type type="gint"/>
+			<method name="free" symbol="gdk_rgba_free">
+				<return-type type="void"/>
 				<parameters>
-					<parameter name="font" type="GdkFont*"/>
+					<parameter name="rgba" type="GdkRGBA*"/>
 				</parameters>
 			</method>
-			<method name="load_for_display" symbol="gdk_font_load_for_display">
-				<return-type type="GdkFont*"/>
+			<method name="hash" symbol="gdk_rgba_hash">
+				<return-type type="guint"/>
 				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="font_name" type="gchar*"/>
+					<parameter name="p" type="gconstpointer"/>
 				</parameters>
 			</method>
-			<method name="ref" symbol="gdk_font_ref">
-				<return-type type="GdkFont*"/>
+			<method name="parse" symbol="gdk_rgba_parse">
+				<return-type type="gboolean"/>
 				<parameters>
-					<parameter name="font" type="GdkFont*"/>
+					<parameter name="spec" type="gchar*"/>
+					<parameter name="rgba" type="GdkRGBA*"/>
 				</parameters>
 			</method>
-			<method name="unref" symbol="gdk_font_unref">
-				<return-type type="void"/>
+			<method name="to_string" symbol="gdk_rgba_to_string">
+				<return-type type="gchar*"/>
 				<parameters>
-					<parameter name="font" type="GdkFont*"/>
+					<parameter name="rgba" type="GdkRGBA*"/>
 				</parameters>
 			</method>
-			<field name="type" type="GdkFontType"/>
-			<field name="ascent" type="gint"/>
-			<field name="descent" type="gint"/>
+			<field name="red" type="gdouble"/>
+			<field name="green" type="gdouble"/>
+			<field name="blue" type="gdouble"/>
+			<field name="alpha" type="gdouble"/>
 		</boxed>
 		<boxed name="GdkRectangle" type-name="GdkRectangle" get-type="gdk_rectangle_get_type">
-			<method name="intersect" symbol="gdk_rectangle_intersect">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="src1" type="GdkRectangle*"/>
-					<parameter name="src2" type="GdkRectangle*"/>
-					<parameter name="dest" type="GdkRectangle*"/>
-				</parameters>
-			</method>
-			<method name="union" symbol="gdk_rectangle_union">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="src1" type="GdkRectangle*"/>
-					<parameter name="src2" type="GdkRectangle*"/>
-					<parameter name="dest" type="GdkRectangle*"/>
-				</parameters>
-			</method>
-			<field name="x" type="gint"/>
-			<field name="y" type="gint"/>
-			<field name="width" type="gint"/>
-			<field name="height" type="gint"/>
 		</boxed>
 		<enum name="GdkAxisUse" type-name="GdkAxisUse" get-type="gdk_axis_use_get_type">
 			<member name="GDK_AXIS_IGNORE" value="0"/>
@@ -2170,12 +1519,6 @@
 			<member name="GDK_LSB_FIRST" value="0"/>
 			<member name="GDK_MSB_FIRST" value="1"/>
 		</enum>
-		<enum name="GdkCapStyle" type-name="GdkCapStyle" get-type="gdk_cap_style_get_type">
-			<member name="GDK_CAP_NOT_LAST" value="0"/>
-			<member name="GDK_CAP_BUTT" value="1"/>
-			<member name="GDK_CAP_ROUND" value="2"/>
-			<member name="GDK_CAP_PROJECTING" value="3"/>
-		</enum>
 		<enum name="GdkCrossingMode" type-name="GdkCrossingMode" get-type="gdk_crossing_mode_get_type">
 			<member name="GDK_CROSSING_NORMAL" value="0"/>
 			<member name="GDK_CROSSING_GRAB" value="1"/>
@@ -2326,43 +1669,11 @@
 			<member name="GDK_EXTENSION_EVENTS_ALL" value="1"/>
 			<member name="GDK_EXTENSION_EVENTS_CURSOR" value="2"/>
 		</enum>
-		<enum name="GdkFill" type-name="GdkFill" get-type="gdk_fill_get_type">
-			<member name="GDK_SOLID" value="0"/>
-			<member name="GDK_TILED" value="1"/>
-			<member name="GDK_STIPPLED" value="2"/>
-			<member name="GDK_OPAQUE_STIPPLED" value="3"/>
-		</enum>
-		<enum name="GdkFillRule" type-name="GdkFillRule" get-type="gdk_fill_rule_get_type">
-			<member name="GDK_EVEN_ODD_RULE" value="0"/>
-			<member name="GDK_WINDING_RULE" value="1"/>
-		</enum>
 		<enum name="GdkFilterReturn" type-name="GdkFilterReturn" get-type="gdk_filter_return_get_type">
 			<member name="GDK_FILTER_CONTINUE" value="0"/>
 			<member name="GDK_FILTER_TRANSLATE" value="1"/>
 			<member name="GDK_FILTER_REMOVE" value="2"/>
 		</enum>
-		<enum name="GdkFontType" type-name="GdkFontType" get-type="gdk_font_type_get_type">
-			<member name="GDK_FONT_FONT" value="0"/>
-			<member name="GDK_FONT_FONTSET" value="1"/>
-		</enum>
-		<enum name="GdkFunction" type-name="GdkFunction" get-type="gdk_function_get_type">
-			<member name="GDK_COPY" value="0"/>
-			<member name="GDK_INVERT" value="1"/>
-			<member name="GDK_XOR" value="2"/>
-			<member name="GDK_CLEAR" value="3"/>
-			<member name="GDK_AND" value="4"/>
-			<member name="GDK_AND_REVERSE" value="5"/>
-			<member name="GDK_AND_INVERT" value="6"/>
-			<member name="GDK_NOOP" value="7"/>
-			<member name="GDK_OR" value="8"/>
-			<member name="GDK_EQUIV" value="9"/>
-			<member name="GDK_OR_REVERSE" value="10"/>
-			<member name="GDK_COPY_INVERT" value="11"/>
-			<member name="GDK_OR_INVERT" value="12"/>
-			<member name="GDK_NAND" value="13"/>
-			<member name="GDK_NOR" value="14"/>
-			<member name="GDK_SET" value="15"/>
-		</enum>
 		<enum name="GdkGrabOwnership" type-name="GdkGrabOwnership" get-type="gdk_grab_ownership_get_type">
 			<member name="GDK_OWNERSHIP_NONE" value="0"/>
 			<member name="GDK_OWNERSHIP_WINDOW" value="1"/>
@@ -2387,11 +1698,6 @@
 			<member name="GDK_GRAVITY_SOUTH_EAST" value="9"/>
 			<member name="GDK_GRAVITY_STATIC" value="10"/>
 		</enum>
-		<enum name="GdkImageType" type-name="GdkImageType" get-type="gdk_image_type_get_type">
-			<member name="GDK_IMAGE_NORMAL" value="0"/>
-			<member name="GDK_IMAGE_SHARED" value="1"/>
-			<member name="GDK_IMAGE_FASTEST" value="2"/>
-		</enum>
 		<enum name="GdkInputMode" type-name="GdkInputMode" get-type="gdk_input_mode_get_type">
 			<member name="GDK_MODE_DISABLED" value="0"/>
 			<member name="GDK_MODE_SCREEN" value="1"/>
@@ -2404,16 +1710,6 @@
 			<member name="GDK_SOURCE_CURSOR" value="3"/>
 			<member name="GDK_SOURCE_KEYBOARD" value="4"/>
 		</enum>
-		<enum name="GdkJoinStyle" type-name="GdkJoinStyle" get-type="gdk_join_style_get_type">
-			<member name="GDK_JOIN_MITER" value="0"/>
-			<member name="GDK_JOIN_ROUND" value="1"/>
-			<member name="GDK_JOIN_BEVEL" value="2"/>
-		</enum>
-		<enum name="GdkLineStyle" type-name="GdkLineStyle" get-type="gdk_line_style_get_type">
-			<member name="GDK_LINE_SOLID" value="0"/>
-			<member name="GDK_LINE_ON_OFF_DASH" value="1"/>
-			<member name="GDK_LINE_DOUBLE_DASH" value="2"/>
-		</enum>
 		<enum name="GdkNotifyType" type-name="GdkNotifyType" get-type="gdk_notify_type_get_type">
 			<member name="GDK_NOTIFY_ANCESTOR" value="0"/>
 			<member name="GDK_NOTIFY_VIRTUAL" value="1"/>
@@ -2422,11 +1718,6 @@
 			<member name="GDK_NOTIFY_NONLINEAR_VIRTUAL" value="4"/>
 			<member name="GDK_NOTIFY_UNKNOWN" value="5"/>
 		</enum>
-		<enum name="GdkOverlapType" type-name="GdkOverlapType" get-type="gdk_overlap_type_get_type">
-			<member name="GDK_OVERLAP_RECTANGLE_IN" value="0"/>
-			<member name="GDK_OVERLAP_RECTANGLE_OUT" value="1"/>
-			<member name="GDK_OVERLAP_RECTANGLE_PART" value="2"/>
-		</enum>
 		<enum name="GdkOwnerChange" type-name="GdkOwnerChange" get-type="gdk_owner_change_get_type">
 			<member name="GDK_OWNER_CHANGE_NEW_OWNER" value="0"/>
 			<member name="GDK_OWNER_CHANGE_DESTROY" value="1"/>
@@ -2441,11 +1732,6 @@
 			<member name="GDK_PROPERTY_NEW_VALUE" value="0"/>
 			<member name="GDK_PROPERTY_DELETE" value="1"/>
 		</enum>
-		<enum name="GdkRgbDither" type-name="GdkRgbDither" get-type="gdk_rgb_dither_get_type">
-			<member name="GDK_RGB_DITHER_NONE" value="0"/>
-			<member name="GDK_RGB_DITHER_NORMAL" value="1"/>
-			<member name="GDK_RGB_DITHER_MAX" value="2"/>
-		</enum>
 		<enum name="GdkScrollDirection" type-name="GdkScrollDirection" get-type="gdk_scroll_direction_get_type">
 			<member name="GDK_SCROLL_UP" value="0"/>
 			<member name="GDK_SCROLL_DOWN" value="1"/>
@@ -2464,10 +1750,6 @@
 			<member name="GDK_ERROR_FILE" value="-3"/>
 			<member name="GDK_ERROR_MEM" value="-4"/>
 		</enum>
-		<enum name="GdkSubwindowMode" type-name="GdkSubwindowMode" get-type="gdk_subwindow_mode_get_type">
-			<member name="GDK_CLIP_BY_CHILDREN" value="0"/>
-			<member name="GDK_INCLUDE_INFERIORS" value="1"/>
-		</enum>
 		<enum name="GdkVisibilityState" type-name="GdkVisibilityState" get-type="gdk_visibility_state_get_type">
 			<member name="GDK_VISIBILITY_UNOBSCURED" value="0"/>
 			<member name="GDK_VISIBILITY_PARTIAL" value="1"/>
@@ -2499,10 +1781,9 @@
 			<member name="GDK_WINDOW_ROOT" value="0"/>
 			<member name="GDK_WINDOW_TOPLEVEL" value="1"/>
 			<member name="GDK_WINDOW_CHILD" value="2"/>
-			<member name="GDK_WINDOW_DIALOG" value="3"/>
-			<member name="GDK_WINDOW_TEMP" value="4"/>
-			<member name="GDK_WINDOW_FOREIGN" value="5"/>
-			<member name="GDK_WINDOW_OFFSCREEN" value="6"/>
+			<member name="GDK_WINDOW_TEMP" value="3"/>
+			<member name="GDK_WINDOW_FOREIGN" value="4"/>
+			<member name="GDK_WINDOW_OFFSCREEN" value="5"/>
 		</enum>
 		<enum name="GdkWindowTypeHint" type-name="GdkWindowTypeHint" get-type="gdk_window_type_hint_get_type">
 			<member name="GDK_WINDOW_TYPE_HINT_NORMAL" value="0"/>
@@ -2552,31 +1833,6 @@
 			<member name="GDK_SCROLL_MASK" value="2097152"/>
 			<member name="GDK_ALL_EVENTS_MASK" value="4194302"/>
 		</flags>
-		<flags name="GdkGCValuesMask" type-name="GdkGCValuesMask" get-type="gdk_gc_values_mask_get_type">
-			<member name="GDK_GC_FOREGROUND" value="1"/>
-			<member name="GDK_GC_BACKGROUND" value="2"/>
-			<member name="GDK_GC_FONT" value="4"/>
-			<member name="GDK_GC_FUNCTION" value="8"/>
-			<member name="GDK_GC_FILL" value="16"/>
-			<member name="GDK_GC_TILE" value="32"/>
-			<member name="GDK_GC_STIPPLE" value="64"/>
-			<member name="GDK_GC_CLIP_MASK" value="128"/>
-			<member name="GDK_GC_SUBWINDOW" value="256"/>
-			<member name="GDK_GC_TS_X_ORIGIN" value="512"/>
-			<member name="GDK_GC_TS_Y_ORIGIN" value="1024"/>
-			<member name="GDK_GC_CLIP_X_ORIGIN" value="2048"/>
-			<member name="GDK_GC_CLIP_Y_ORIGIN" value="4096"/>
-			<member name="GDK_GC_EXPOSURES" value="8192"/>
-			<member name="GDK_GC_LINE_WIDTH" value="16384"/>
-			<member name="GDK_GC_LINE_STYLE" value="32768"/>
-			<member name="GDK_GC_CAP_STYLE" value="65536"/>
-			<member name="GDK_GC_JOIN_STYLE" value="131072"/>
-		</flags>
-		<flags name="GdkInputCondition" type-name="GdkInputCondition" get-type="gdk_input_condition_get_type">
-			<member name="GDK_INPUT_READ" value="1"/>
-			<member name="GDK_INPUT_WRITE" value="2"/>
-			<member name="GDK_INPUT_EXCEPTION" value="4"/>
-		</flags>
 		<flags name="GdkModifierType" type-name="GdkModifierType" get-type="gdk_modifier_type_get_type">
 			<member name="GDK_SHIFT_MASK" value="1"/>
 			<member name="GDK_LOCK_MASK" value="2"/>
@@ -2619,11 +1875,10 @@
 			<member name="GDK_WA_X" value="4"/>
 			<member name="GDK_WA_Y" value="8"/>
 			<member name="GDK_WA_CURSOR" value="16"/>
-			<member name="GDK_WA_COLORMAP" value="32"/>
-			<member name="GDK_WA_VISUAL" value="64"/>
-			<member name="GDK_WA_WMCLASS" value="128"/>
-			<member name="GDK_WA_NOREDIR" value="256"/>
-			<member name="GDK_WA_TYPE_HINT" value="512"/>
+			<member name="GDK_WA_VISUAL" value="32"/>
+			<member name="GDK_WA_WMCLASS" value="64"/>
+			<member name="GDK_WA_NOREDIR" value="128"/>
+			<member name="GDK_WA_TYPE_HINT" value="256"/>
 		</flags>
 		<flags name="GdkWindowHints" type-name="GdkWindowHints" get-type="gdk_window_hints_get_type">
 			<member name="GDK_HINT_POS" value="1"/>
@@ -2692,66 +1947,6 @@
 				</parameters>
 			</method>
 		</object>
-		<object name="GdkColormap" parent="GObject" type-name="GdkColormap" get-type="gdk_colormap_get_type">
-			<method name="alloc_color" symbol="gdk_colormap_alloc_color">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="colormap" type="GdkColormap*"/>
-					<parameter name="color" type="GdkColor*"/>
-					<parameter name="writeable" type="gboolean"/>
-					<parameter name="best_match" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="alloc_colors" symbol="gdk_colormap_alloc_colors">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="colormap" type="GdkColormap*"/>
-					<parameter name="colors" type="GdkColor*"/>
-					<parameter name="n_colors" type="gint"/>
-					<parameter name="writeable" type="gboolean"/>
-					<parameter name="best_match" type="gboolean"/>
-					<parameter name="success" type="gboolean*"/>
-				</parameters>
-			</method>
-			<method name="free_colors" symbol="gdk_colormap_free_colors">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="colormap" type="GdkColormap*"/>
-					<parameter name="colors" type="GdkColor*"/>
-					<parameter name="n_colors" type="gint"/>
-				</parameters>
-			</method>
-			<method name="get_screen" symbol="gdk_colormap_get_screen">
-				<return-type type="GdkScreen*"/>
-				<parameters>
-					<parameter name="cmap" type="GdkColormap*"/>
-				</parameters>
-			</method>
-			<method name="get_system" symbol="gdk_colormap_get_system">
-				<return-type type="GdkColormap*"/>
-			</method>
-			<method name="get_visual" symbol="gdk_colormap_get_visual">
-				<return-type type="GdkVisual*"/>
-				<parameters>
-					<parameter name="colormap" type="GdkColormap*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="gdk_colormap_new">
-				<return-type type="GdkColormap*"/>
-				<parameters>
-					<parameter name="visual" type="GdkVisual*"/>
-					<parameter name="allocate" type="gboolean"/>
-				</parameters>
-			</constructor>
-			<method name="query_color" symbol="gdk_colormap_query_color">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="colormap" type="GdkColormap*"/>
-					<parameter name="pixel" type="gulong"/>
-					<parameter name="result" type="GdkColor*"/>
-				</parameters>
-			</method>
-		</object>
 		<object name="GdkDevice" parent="GObject" type-name="GdkDevice" get-type="gdk_device_get_type">
 			<method name="free_history" symbol="gdk_device_free_history">
 				<return-type type="void"/>
@@ -2817,7 +2012,7 @@
 					<parameter name="start" type="guint32"/>
 					<parameter name="stop" type="guint32"/>
 					<parameter name="events" type="GdkTimeCoord***"/>
-					<parameter name="n_events" type="guint*"/>
+					<parameter name="n_events" type="gint*"/>
 				</parameters>
 			</method>
 			<method name="get_key" symbol="gdk_device_get_key">
@@ -2938,6 +2133,12 @@
 			<property name="type" type="GdkDeviceType" readable="1" writable="1" construct="0" construct-only="1"/>
 		</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">
+				<return-type type="GdkDevice*"/>
+				<parameters>
+					<parameter name="device_manager" type="GdkDeviceManager*"/>
+				</parameters>
+			</method>
 			<method name="get_display" symbol="gdk_device_manager_get_display">
 				<return-type type="GdkDisplay*"/>
 				<parameters>
@@ -2973,6 +2174,12 @@
 					<parameter name="device" 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>
@@ -3114,6 +2321,12 @@
 					<parameter name="win_y" type="gint*"/>
 				</parameters>
 			</method>
+			<method name="is_closed" symbol="gdk_display_is_closed">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+				</parameters>
+			</method>
 			<method name="keyboard_ungrab" symbol="gdk_display_keyboard_ungrab">
 				<return-type type="void"/>
 				<parameters>
@@ -3388,86 +2601,18 @@
 			</method>
 		</object>
 		<object name="GdkDrawable" parent="GObject" type-name="GdkDrawable" get-type="gdk_drawable_get_type">
-			<method name="copy_to_image" symbol="gdk_drawable_copy_to_image">
-				<return-type type="GdkImage*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="image" type="GdkImage*"/>
-					<parameter name="src_x" type="gint"/>
-					<parameter name="src_y" type="gint"/>
-					<parameter name="dest_x" type="gint"/>
-					<parameter name="dest_y" type="gint"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-				</parameters>
-			</method>
 			<method name="get_clip_region" symbol="gdk_drawable_get_clip_region">
-				<return-type type="GdkRegion*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-				</parameters>
-			</method>
-			<method name="get_colormap" symbol="gdk_drawable_get_colormap">
-				<return-type type="GdkColormap*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-				</parameters>
-			</method>
-			<method name="get_depth" symbol="gdk_drawable_get_depth">
-				<return-type type="gint"/>
+				<return-type type="cairo_region_t*"/>
 				<parameters>
 					<parameter name="drawable" type="GdkDrawable*"/>
 				</parameters>
 			</method>
-			<method name="get_display" symbol="gdk_drawable_get_display">
-				<return-type type="GdkDisplay*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-				</parameters>
-			</method>
-			<method name="get_image" symbol="gdk_drawable_get_image">
-				<return-type type="GdkImage*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-				</parameters>
-			</method>
-			<method name="get_screen" symbol="gdk_drawable_get_screen">
-				<return-type type="GdkScreen*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-				</parameters>
-			</method>
-			<method name="get_size" symbol="gdk_drawable_get_size">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="width" type="gint*"/>
-					<parameter name="height" type="gint*"/>
-				</parameters>
-			</method>
 			<method name="get_visible_region" symbol="gdk_drawable_get_visible_region">
-				<return-type type="GdkRegion*"/>
+				<return-type type="cairo_region_t*"/>
 				<parameters>
 					<parameter name="drawable" type="GdkDrawable*"/>
 				</parameters>
 			</method>
-			<method name="get_visual" symbol="gdk_drawable_get_visual">
-				<return-type type="GdkVisual*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-				</parameters>
-			</method>
-			<method name="set_colormap" symbol="gdk_drawable_set_colormap">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="colormap" type="GdkColormap*"/>
-				</parameters>
-			</method>
 			<vfunc name="create_cairo_surface">
 				<return-type type="cairo_surface_t*"/>
 				<parameters>
@@ -3476,261 +2621,14 @@
 					<parameter name="height" type="int"/>
 				</parameters>
 			</vfunc>
-			<vfunc name="create_gc">
-				<return-type type="GdkGC*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="values" type="GdkGCValues*"/>
-					<parameter name="mask" type="GdkGCValuesMask"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="draw_arc">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="filled" type="gboolean"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-					<parameter name="angle1" type="gint"/>
-					<parameter name="angle2" type="gint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="draw_drawable">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="src" type="GdkDrawable*"/>
-					<parameter name="xsrc" type="gint"/>
-					<parameter name="ysrc" type="gint"/>
-					<parameter name="xdest" type="gint"/>
-					<parameter name="ydest" type="gint"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="draw_drawable_with_src">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="src" type="GdkDrawable*"/>
-					<parameter name="xsrc" type="gint"/>
-					<parameter name="ysrc" type="gint"/>
-					<parameter name="xdest" type="gint"/>
-					<parameter name="ydest" type="gint"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-					<parameter name="original_src" type="GdkDrawable*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="draw_glyphs">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="font" type="PangoFont*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="glyphs" type="PangoGlyphString*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="draw_glyphs_transformed">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="matrix" type="PangoMatrix*"/>
-					<parameter name="font" type="PangoFont*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="glyphs" type="PangoGlyphString*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="draw_image">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="image" type="GdkImage*"/>
-					<parameter name="xsrc" type="gint"/>
-					<parameter name="ysrc" type="gint"/>
-					<parameter name="xdest" type="gint"/>
-					<parameter name="ydest" type="gint"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="draw_lines">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="points" type="GdkPoint*"/>
-					<parameter name="npoints" type="gint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="draw_pixbuf">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-					<parameter name="src_x" type="gint"/>
-					<parameter name="src_y" type="gint"/>
-					<parameter name="dest_x" type="gint"/>
-					<parameter name="dest_y" type="gint"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-					<parameter name="dither" type="GdkRgbDither"/>
-					<parameter name="x_dither" type="gint"/>
-					<parameter name="y_dither" type="gint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="draw_points">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="points" type="GdkPoint*"/>
-					<parameter name="npoints" type="gint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="draw_polygon">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="filled" type="gboolean"/>
-					<parameter name="points" type="GdkPoint*"/>
-					<parameter name="npoints" type="gint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="draw_rectangle">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="filled" type="gboolean"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="draw_segments">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="segs" type="GdkSegment*"/>
-					<parameter name="nsegs" type="gint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="draw_text">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="font" type="GdkFont*"/>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="text" type="gchar*"/>
-					<parameter name="text_length" type="gint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="draw_text_wc">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="font" type="GdkFont*"/>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="text" type="GdkWChar*"/>
-					<parameter name="text_length" type="gint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="draw_trapezoids">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="trapezoids" type="GdkTrapezoid*"/>
-					<parameter name="n_trapezoids" type="gint"/>
-				</parameters>
-			</vfunc>
 			<vfunc name="get_clip_region">
-				<return-type type="GdkRegion*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_colormap">
-				<return-type type="GdkColormap*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_composite_drawable">
-				<return-type type="GdkDrawable*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-					<parameter name="composite_x_offset" type="gint*"/>
-					<parameter name="composite_y_offset" type="gint*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_depth">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_image">
-				<return-type type="GdkImage*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_screen">
-				<return-type type="GdkScreen*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_size">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="width" type="gint*"/>
-					<parameter name="height" type="gint*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_source_drawable">
-				<return-type type="GdkDrawable*"/>
+				<return-type type="cairo_region_t*"/>
 				<parameters>
 					<parameter name="drawable" type="GdkDrawable*"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="get_visible_region">
-				<return-type type="GdkRegion*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_visual">
-				<return-type type="GdkVisual*"/>
+				<return-type type="cairo_region_t*"/>
 				<parameters>
 					<parameter name="drawable" type="GdkDrawable*"/>
 				</parameters>
@@ -3748,323 +2646,6 @@
 					<parameter name="cr" type="cairo_t*"/>
 				</parameters>
 			</vfunc>
-			<vfunc name="set_colormap">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="cmap" type="GdkColormap*"/>
-				</parameters>
-			</vfunc>
-		</object>
-		<object name="GdkGC" parent="GObject" type-name="GdkGC" get-type="gdk_gc_get_type">
-			<method name="copy" symbol="gdk_gc_copy">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dst_gc" type="GdkGC*"/>
-					<parameter name="src_gc" type="GdkGC*"/>
-				</parameters>
-			</method>
-			<method name="get_colormap" symbol="gdk_gc_get_colormap">
-				<return-type type="GdkColormap*"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-				</parameters>
-			</method>
-			<method name="get_screen" symbol="gdk_gc_get_screen">
-				<return-type type="GdkScreen*"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-				</parameters>
-			</method>
-			<method name="get_values" symbol="gdk_gc_get_values">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="values" type="GdkGCValues*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="gdk_gc_new">
-				<return-type type="GdkGC*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_with_values" symbol="gdk_gc_new_with_values">
-				<return-type type="GdkGC*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="values" type="GdkGCValues*"/>
-					<parameter name="values_mask" type="GdkGCValuesMask"/>
-				</parameters>
-			</constructor>
-			<method name="offset" symbol="gdk_gc_offset">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="x_offset" type="gint"/>
-					<parameter name="y_offset" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_background" symbol="gdk_gc_set_background">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="color" type="GdkColor*"/>
-				</parameters>
-			</method>
-			<method name="set_clip_mask" symbol="gdk_gc_set_clip_mask">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="mask" type="GdkBitmap*"/>
-				</parameters>
-			</method>
-			<method name="set_clip_origin" symbol="gdk_gc_set_clip_origin">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_clip_rectangle" symbol="gdk_gc_set_clip_rectangle">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="rectangle" type="GdkRectangle*"/>
-				</parameters>
-			</method>
-			<method name="set_clip_region" symbol="gdk_gc_set_clip_region">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="region" type="GdkRegion*"/>
-				</parameters>
-			</method>
-			<method name="set_colormap" symbol="gdk_gc_set_colormap">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="colormap" type="GdkColormap*"/>
-				</parameters>
-			</method>
-			<method name="set_dashes" symbol="gdk_gc_set_dashes">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="dash_offset" type="gint"/>
-					<parameter name="dash_list" type="gint8[]"/>
-					<parameter name="n" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_exposures" symbol="gdk_gc_set_exposures">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="exposures" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_fill" symbol="gdk_gc_set_fill">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="fill" type="GdkFill"/>
-				</parameters>
-			</method>
-			<method name="set_foreground" symbol="gdk_gc_set_foreground">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="color" type="GdkColor*"/>
-				</parameters>
-			</method>
-			<method name="set_function" symbol="gdk_gc_set_function">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="function" type="GdkFunction"/>
-				</parameters>
-			</method>
-			<method name="set_line_attributes" symbol="gdk_gc_set_line_attributes">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="line_width" type="gint"/>
-					<parameter name="line_style" type="GdkLineStyle"/>
-					<parameter name="cap_style" type="GdkCapStyle"/>
-					<parameter name="join_style" type="GdkJoinStyle"/>
-				</parameters>
-			</method>
-			<method name="set_rgb_bg_color" symbol="gdk_gc_set_rgb_bg_color">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="color" type="GdkColor*"/>
-				</parameters>
-			</method>
-			<method name="set_rgb_fg_color" symbol="gdk_gc_set_rgb_fg_color">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="color" type="GdkColor*"/>
-				</parameters>
-			</method>
-			<method name="set_stipple" symbol="gdk_gc_set_stipple">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="stipple" type="GdkPixmap*"/>
-				</parameters>
-			</method>
-			<method name="set_subwindow" symbol="gdk_gc_set_subwindow">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="mode" type="GdkSubwindowMode"/>
-				</parameters>
-			</method>
-			<method name="set_tile" symbol="gdk_gc_set_tile">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="tile" type="GdkPixmap*"/>
-				</parameters>
-			</method>
-			<method name="set_ts_origin" symbol="gdk_gc_set_ts_origin">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_values" symbol="gdk_gc_set_values">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="values" type="GdkGCValues*"/>
-					<parameter name="values_mask" type="GdkGCValuesMask"/>
-				</parameters>
-			</method>
-			<vfunc name="get_values">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="values" type="GdkGCValues*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="set_dashes">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="dash_offset" type="gint"/>
-					<parameter name="dash_list" type="gint8[]"/>
-					<parameter name="n" type="gint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="set_values">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gc" type="GdkGC*"/>
-					<parameter name="values" type="GdkGCValues*"/>
-					<parameter name="mask" type="GdkGCValuesMask"/>
-				</parameters>
-			</vfunc>
-		</object>
-		<object name="GdkImage" parent="GObject" type-name="GdkImage" get-type="gdk_image_get_type">
-			<method name="get_bits_per_pixel" symbol="gdk_image_get_bits_per_pixel">
-				<return-type type="guint16"/>
-				<parameters>
-					<parameter name="image" type="GdkImage*"/>
-				</parameters>
-			</method>
-			<method name="get_byte_order" symbol="gdk_image_get_byte_order">
-				<return-type type="GdkByteOrder"/>
-				<parameters>
-					<parameter name="image" type="GdkImage*"/>
-				</parameters>
-			</method>
-			<method name="get_bytes_per_line" symbol="gdk_image_get_bytes_per_line">
-				<return-type type="guint16"/>
-				<parameters>
-					<parameter name="image" type="GdkImage*"/>
-				</parameters>
-			</method>
-			<method name="get_bytes_per_pixel" symbol="gdk_image_get_bytes_per_pixel">
-				<return-type type="guint16"/>
-				<parameters>
-					<parameter name="image" type="GdkImage*"/>
-				</parameters>
-			</method>
-			<method name="get_colormap" symbol="gdk_image_get_colormap">
-				<return-type type="GdkColormap*"/>
-				<parameters>
-					<parameter name="image" type="GdkImage*"/>
-				</parameters>
-			</method>
-			<method name="get_depth" symbol="gdk_image_get_depth">
-				<return-type type="guint16"/>
-				<parameters>
-					<parameter name="image" type="GdkImage*"/>
-				</parameters>
-			</method>
-			<method name="get_height" symbol="gdk_image_get_height">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="image" type="GdkImage*"/>
-				</parameters>
-			</method>
-			<method name="get_image_type" symbol="gdk_image_get_image_type">
-				<return-type type="GdkImageType"/>
-				<parameters>
-					<parameter name="image" type="GdkImage*"/>
-				</parameters>
-			</method>
-			<method name="get_pixel" symbol="gdk_image_get_pixel">
-				<return-type type="guint32"/>
-				<parameters>
-					<parameter name="image" type="GdkImage*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-				</parameters>
-			</method>
-			<method name="get_visual" symbol="gdk_image_get_visual">
-				<return-type type="GdkVisual*"/>
-				<parameters>
-					<parameter name="image" type="GdkImage*"/>
-				</parameters>
-			</method>
-			<method name="get_width" symbol="gdk_image_get_width">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="image" type="GdkImage*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="gdk_image_new">
-				<return-type type="GdkImage*"/>
-				<parameters>
-					<parameter name="type" type="GdkImageType"/>
-					<parameter name="visual" type="GdkVisual*"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-				</parameters>
-			</constructor>
-			<method name="put_pixel" symbol="gdk_image_put_pixel">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="image" type="GdkImage*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="pixel" type="guint32"/>
-				</parameters>
-			</method>
-			<method name="set_colormap" symbol="gdk_image_set_colormap">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="image" type="GdkImage*"/>
-					<parameter name="colormap" type="GdkColormap*"/>
-				</parameters>
-			</method>
 		</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">
@@ -4114,6 +2695,12 @@
 					<parameter name="display" type="GdkDisplay*"/>
 				</parameters>
 			</method>
+			<method name="get_num_lock_state" symbol="gdk_keymap_get_num_lock_state">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="keymap" type="GdkKeymap*"/>
+				</parameters>
+			</method>
 			<method name="have_bidi_layouts" symbol="gdk_keymap_have_bidi_layouts">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -4166,148 +2753,6 @@
 				</parameters>
 			</signal>
 		</object>
-		<object name="GdkPangoRenderer" parent="PangoRenderer" type-name="GdkPangoRenderer" get-type="gdk_pango_renderer_get_type">
-			<method name="get_default" symbol="gdk_pango_renderer_get_default">
-				<return-type type="PangoRenderer*"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="gdk_pango_renderer_new">
-				<return-type type="PangoRenderer*"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-				</parameters>
-			</constructor>
-			<method name="set_drawable" symbol="gdk_pango_renderer_set_drawable">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gdk_renderer" type="GdkPangoRenderer*"/>
-					<parameter name="drawable" type="GdkDrawable*"/>
-				</parameters>
-			</method>
-			<method name="set_gc" symbol="gdk_pango_renderer_set_gc">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gdk_renderer" type="GdkPangoRenderer*"/>
-					<parameter name="gc" type="GdkGC*"/>
-				</parameters>
-			</method>
-			<method name="set_override_color" symbol="gdk_pango_renderer_set_override_color">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gdk_renderer" type="GdkPangoRenderer*"/>
-					<parameter name="part" type="PangoRenderPart"/>
-					<parameter name="color" type="GdkColor*"/>
-				</parameters>
-			</method>
-			<method name="set_stipple" symbol="gdk_pango_renderer_set_stipple">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="gdk_renderer" type="GdkPangoRenderer*"/>
-					<parameter name="part" type="PangoRenderPart"/>
-					<parameter name="stipple" type="GdkBitmap*"/>
-				</parameters>
-			</method>
-			<property name="screen" type="GdkScreen*" readable="1" writable="1" construct="0" construct-only="1"/>
-		</object>
-		<object name="GdkPixmap" parent="GdkDrawable" type-name="GdkPixmap" get-type="gdk_pixmap_get_type">
-			<method name="colormap_create_from_xpm" symbol="gdk_pixmap_colormap_create_from_xpm">
-				<return-type type="GdkPixmap*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="colormap" type="GdkColormap*"/>
-					<parameter name="mask" type="GdkBitmap**"/>
-					<parameter name="transparent_color" type="GdkColor*"/>
-					<parameter name="filename" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="colormap_create_from_xpm_d" symbol="gdk_pixmap_colormap_create_from_xpm_d">
-				<return-type type="GdkPixmap*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="colormap" type="GdkColormap*"/>
-					<parameter name="mask" type="GdkBitmap**"/>
-					<parameter name="transparent_color" type="GdkColor*"/>
-					<parameter name="data" type="gchar**"/>
-				</parameters>
-			</method>
-			<method name="create_from_data" symbol="gdk_pixmap_create_from_data">
-				<return-type type="GdkPixmap*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="data" type="gchar*"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-					<parameter name="depth" type="gint"/>
-					<parameter name="fg" type="GdkColor*"/>
-					<parameter name="bg" type="GdkColor*"/>
-				</parameters>
-			</method>
-			<method name="create_from_xpm" symbol="gdk_pixmap_create_from_xpm">
-				<return-type type="GdkPixmap*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="mask" type="GdkBitmap**"/>
-					<parameter name="transparent_color" type="GdkColor*"/>
-					<parameter name="filename" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="create_from_xpm_d" symbol="gdk_pixmap_create_from_xpm_d">
-				<return-type type="GdkPixmap*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="mask" type="GdkBitmap**"/>
-					<parameter name="transparent_color" type="GdkColor*"/>
-					<parameter name="data" type="gchar**"/>
-				</parameters>
-			</method>
-			<method name="foreign_new" symbol="gdk_pixmap_foreign_new">
-				<return-type type="GdkPixmap*"/>
-				<parameters>
-					<parameter name="anid" type="GdkNativeWindow"/>
-				</parameters>
-			</method>
-			<method name="foreign_new_for_display" symbol="gdk_pixmap_foreign_new_for_display">
-				<return-type type="GdkPixmap*"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="anid" type="GdkNativeWindow"/>
-				</parameters>
-			</method>
-			<method name="foreign_new_for_screen" symbol="gdk_pixmap_foreign_new_for_screen">
-				<return-type type="GdkPixmap*"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-					<parameter name="anid" type="GdkNativeWindow"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-					<parameter name="depth" type="gint"/>
-				</parameters>
-			</method>
-			<method name="lookup" symbol="gdk_pixmap_lookup">
-				<return-type type="GdkPixmap*"/>
-				<parameters>
-					<parameter name="anid" type="GdkNativeWindow"/>
-				</parameters>
-			</method>
-			<method name="lookup_for_display" symbol="gdk_pixmap_lookup_for_display">
-				<return-type type="GdkPixmap*"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="anid" type="GdkNativeWindow"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="gdk_pixmap_new">
-				<return-type type="GdkPixmap*"/>
-				<parameters>
-					<parameter name="drawable" type="GdkDrawable*"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-					<parameter name="depth" type="gint"/>
-				</parameters>
-			</constructor>
-		</object>
 		<object name="GdkScreen" parent="GObject" type-name="GdkScreen" get-type="gdk_screen_get_type">
 			<method name="broadcast_client_message" symbol="gdk_screen_broadcast_client_message">
 				<return-type type="void"/>
@@ -4325,12 +2770,6 @@
 			<method name="get_default" symbol="gdk_screen_get_default">
 				<return-type type="GdkScreen*"/>
 			</method>
-			<method name="get_default_colormap" symbol="gdk_screen_get_default_colormap">
-				<return-type type="GdkColormap*"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-				</parameters>
-			</method>
 			<method name="get_display" symbol="gdk_screen_get_display">
 				<return-type type="GdkDisplay*"/>
 				<parameters>
@@ -4423,24 +2862,6 @@
 					<parameter name="screen" type="GdkScreen*"/>
 				</parameters>
 			</method>
-			<method name="get_rgb_colormap" symbol="gdk_screen_get_rgb_colormap">
-				<return-type type="GdkColormap*"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-				</parameters>
-			</method>
-			<method name="get_rgb_visual" symbol="gdk_screen_get_rgb_visual">
-				<return-type type="GdkVisual*"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-				</parameters>
-			</method>
-			<method name="get_rgba_colormap" symbol="gdk_screen_get_rgba_colormap">
-				<return-type type="GdkColormap*"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-				</parameters>
-			</method>
 			<method name="get_rgba_visual" symbol="gdk_screen_get_rgba_visual">
 				<return-type type="GdkVisual*"/>
 				<parameters>
@@ -4461,12 +2882,6 @@
 					<parameter name="value" type="GValue*"/>
 				</parameters>
 			</method>
-			<method name="get_system_colormap" symbol="gdk_screen_get_system_colormap">
-				<return-type type="GdkColormap*"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-				</parameters>
-			</method>
 			<method name="get_system_visual" symbol="gdk_screen_get_system_visual">
 				<return-type type="GdkVisual*"/>
 				<parameters>
@@ -4521,13 +2936,6 @@
 					<parameter name="screen" type="GdkScreen*"/>
 				</parameters>
 			</method>
-			<method name="set_default_colormap" symbol="gdk_screen_set_default_colormap">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-					<parameter name="colormap" type="GdkColormap*"/>
-				</parameters>
-			</method>
 			<method name="set_font_options" symbol="gdk_screen_set_font_options">
 				<return-type type="void"/>
 				<parameters>
@@ -4708,7 +3116,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="region" type="GdkRegion*"/>
+					<parameter name="region" type="cairo_region_t*"/>
 				</parameters>
 			</method>
 			<method name="begin_resize_drag" symbol="gdk_window_begin_resize_drag">
@@ -4722,32 +3130,6 @@
 					<parameter name="timestamp" type="guint32"/>
 				</parameters>
 			</method>
-			<method name="clear" symbol="gdk_window_clear">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-				</parameters>
-			</method>
-			<method name="clear_area" symbol="gdk_window_clear_area">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-				</parameters>
-			</method>
-			<method name="clear_area_e" symbol="gdk_window_clear_area_e">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-				</parameters>
-			</method>
 			<method name="configure_finished" symbol="gdk_window_configure_finished">
 				<return-type type="void"/>
 				<parameters>
@@ -4785,6 +3167,15 @@
 					<parameter name="parent_y" type="gdouble*"/>
 				</parameters>
 			</method>
+			<method name="create_similar_surface" symbol="gdk_window_create_similar_surface">
+				<return-type type="cairo_surface_t*"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="content" type="cairo_content_t"/>
+					<parameter name="width" type="int"/>
+					<parameter name="height" type="int"/>
+				</parameters>
+			</method>
 			<method name="deiconify" symbol="gdk_window_deiconify">
 				<return-type type="void"/>
 				<parameters>
@@ -4871,19 +3262,10 @@
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
-			<method name="get_back_pixmap" symbol="gdk_window_get_back_pixmap">
-				<return-type type="void"/>
+			<method name="get_background_pattern" symbol="gdk_window_get_background_pattern">
+				<return-type type="cairo_pattern_t*"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="pixmap" type="GdkPixmap**"/>
-					<parameter name="parent_relative" type="gboolean*"/>
-				</parameters>
-			</method>
-			<method name="get_background" symbol="gdk_window_get_background">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="color" type="GdkColor*"/>
 				</parameters>
 			</method>
 			<method name="get_children" symbol="gdk_window_get_children">
@@ -4911,14 +3293,6 @@
 					<parameter name="decorations" type="GdkWMDecoration*"/>
 				</parameters>
 			</method>
-			<method name="get_deskrelative_origin" symbol="gdk_window_get_deskrelative_origin">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="x" type="gint*"/>
-					<parameter name="y" type="gint*"/>
-				</parameters>
-			</method>
 			<method name="get_device_cursor" symbol="gdk_window_get_device_cursor">
 				<return-type type="GdkCursor*"/>
 				<parameters>
@@ -4943,6 +3317,12 @@
 					<parameter name="mask" type="GdkModifierType*"/>
 				</parameters>
 			</method>
+			<method name="get_display" symbol="gdk_window_get_display">
+				<return-type type="GdkDisplay*"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
 			<method name="get_effective_parent" symbol="gdk_window_get_effective_parent">
 				<return-type type="GdkWindow*"/>
 				<parameters>
@@ -4991,13 +3371,10 @@
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
-			<method name="get_internal_paint_info" symbol="gdk_window_get_internal_paint_info">
-				<return-type type="void"/>
+			<method name="get_height" symbol="gdk_window_get_height">
+				<return-type type="int"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="real_drawable" type="GdkDrawable**"/>
-					<parameter name="x_offset" type="gint*"/>
-					<parameter name="y_offset" type="gint*"/>
 				</parameters>
 			</method>
 			<method name="get_modal_hint" symbol="gdk_window_get_modal_hint">
@@ -5055,6 +3432,12 @@
 					<parameter name="y" type="gint*"/>
 				</parameters>
 			</method>
+			<method name="get_screen" symbol="gdk_window_get_screen">
+				<return-type type="GdkScreen*"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
 			<method name="get_state" symbol="gdk_window_get_state">
 				<return-type type="GdkWindowState"/>
 				<parameters>
@@ -5080,7 +3463,7 @@
 				</parameters>
 			</method>
 			<method name="get_update_area" symbol="gdk_window_get_update_area">
-				<return-type type="GdkRegion*"/>
+				<return-type type="cairo_region_t*"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
@@ -5092,38 +3475,47 @@
 					<parameter name="data" type="gpointer*"/>
 				</parameters>
 			</method>
+			<method name="get_visual" symbol="gdk_window_get_visual">
+				<return-type type="GdkVisual*"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
+			<method name="get_width" symbol="gdk_window_get_width">
+				<return-type type="int"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
 			<method name="get_window_type" symbol="gdk_window_get_window_type">
 				<return-type type="GdkWindowType"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
-			<method name="hide" symbol="gdk_window_hide">
-				<return-type type="void"/>
+			<method name="has_native" symbol="gdk_window_has_native">
+				<return-type type="gboolean"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
-			<method name="iconify" symbol="gdk_window_iconify">
+			<method name="hide" symbol="gdk_window_hide">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
-			<method name="input_shape_combine_mask" symbol="gdk_window_input_shape_combine_mask">
+			<method name="iconify" symbol="gdk_window_iconify">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="mask" type="GdkBitmap*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
 				</parameters>
 			</method>
 			<method name="input_shape_combine_region" symbol="gdk_window_input_shape_combine_region">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="shape_region" type="GdkRegion*"/>
+					<parameter name="shape_region" type="cairo_region_t*"/>
 					<parameter name="offset_x" type="gint"/>
 					<parameter name="offset_y" type="gint"/>
 				</parameters>
@@ -5132,8 +3524,8 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="region" type="GdkRegion*"/>
-					<parameter name="child_func" type="GCallback"/>
+					<parameter name="region" type="cairo_region_t*"/>
+					<parameter name="child_func" type="GdkWindowChildFunc"/>
 					<parameter name="user_data" type="gpointer"/>
 				</parameters>
 			</method>
@@ -5149,7 +3541,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="region" type="GdkRegion*"/>
+					<parameter name="region" type="cairo_region_t*"/>
 					<parameter name="invalidate_children" type="gboolean"/>
 				</parameters>
 			</method>
@@ -5232,7 +3624,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="region" type="GdkRegion*"/>
+					<parameter name="region" type="cairo_region_t*"/>
 					<parameter name="dx" type="gint"/>
 					<parameter name="dy" type="gint"/>
 				</parameters>
@@ -5291,12 +3683,6 @@
 					<parameter name="data" type="gpointer"/>
 				</parameters>
 			</method>
-			<method name="remove_redirection" symbol="gdk_window_remove_redirection">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-				</parameters>
-			</method>
 			<method name="reparent" symbol="gdk_window_reparent">
 				<return-type type="void"/>
 				<parameters>
@@ -5337,19 +3723,25 @@
 					<parameter name="accept_focus" type="gboolean"/>
 				</parameters>
 			</method>
-			<method name="set_back_pixmap" symbol="gdk_window_set_back_pixmap">
+			<method name="set_background" symbol="gdk_window_set_background">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="pixmap" type="GdkPixmap*"/>
-					<parameter name="parent_relative" type="gboolean"/>
+					<parameter name="color" type="GdkColor*"/>
 				</parameters>
 			</method>
-			<method name="set_background" symbol="gdk_window_set_background">
+			<method name="set_background_pattern" symbol="gdk_window_set_background_pattern">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="color" type="GdkColor*"/>
+					<parameter name="pattern" type="cairo_pattern_t*"/>
+				</parameters>
+			</method>
+			<method name="set_background_rgba" symbol="gdk_window_set_background_rgba">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="rgba" type="GdkRGBA*"/>
 				</parameters>
 			</method>
 			<method name="set_child_input_shapes" symbol="gdk_window_set_child_input_shapes">
@@ -5443,15 +3835,6 @@
 					<parameter name="leader" type="GdkWindow*"/>
 				</parameters>
 			</method>
-			<method name="set_icon" symbol="gdk_window_set_icon">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="icon_window" type="GdkWindow*"/>
-					<parameter name="pixmap" type="GdkPixmap*"/>
-					<parameter name="mask" type="GdkBitmap*"/>
-				</parameters>
-			</method>
 			<method name="set_icon_list" symbol="gdk_window_set_icon_list">
 				<return-type type="void"/>
 				<parameters>
@@ -5578,20 +3961,11 @@
 					<parameter name="user_data" type="gpointer"/>
 				</parameters>
 			</method>
-			<method name="shape_combine_mask" symbol="gdk_window_shape_combine_mask">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="mask" type="GdkBitmap*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-				</parameters>
-			</method>
 			<method name="shape_combine_region" symbol="gdk_window_shape_combine_region">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="shape_region" type="GdkRegion*"/>
+					<parameter name="shape_region" type="cairo_region_t*"/>
 					<parameter name="offset_x" type="gint"/>
 					<parameter name="offset_y" type="gint"/>
 				</parameters>
@@ -5651,6 +4025,14 @@
 				</parameters>
 			</method>
 			<property name="cursor" type="GdkCursor*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<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"/>
+				</parameters>
+			</signal>
 			<signal name="from-embedder" when="LAST">
 				<return-type type="void"/>
 				<parameters>
diff --git a/vapi/packages/gdk-3.0/gdk-3.0.metadata b/vapi/packages/gdk-3.0/gdk-3.0.metadata
index 591f655..f062e69 100644
--- a/vapi/packages/gdk-3.0/gdk-3.0.metadata
+++ b/vapi/packages/gdk-3.0/gdk-3.0.metadata
@@ -95,6 +95,7 @@ gdk_region_rectangle transfer_ownership="1"
 gdk_region_polygon transfer_ownership="1"
 gdk_rgb_find_color.color is_ref="1"
 GdkRgbCmap is_value_type="1"
+GdkRGBA is_value_type="1"
 gdk_screen_get_monitor_geometry.dest is_out="1"
 gdk_screen_get_toplevel_windows type_arguments="unowned Window" transfer_ownership="1"
 gdk_screen_get_window_stack type_arguments="Window" transfer_ownership="1" nullable="1"
@@ -135,6 +136,7 @@ gdk_window_get_origin.x is_out="1"
 gdk_window_get_origin.y is_out="1"
 gdk_window_set_cursor.cursor nullable="1"
 gdk_window_input_shape_combine_mask.mask nullable="1"
+GdkWindow::create_surface namespace_name="Cairo" type_name="Surface" transfer_ownership="1"
 GdkWindowAttr is_value_type="1"
 GdkWindowClass common_prefix="GDK_"
 GdkWindowObject hidden="1"
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 0dec2ec..b196f17 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
@@ -26,42 +26,41 @@
 				<parameter name="atom" type="GdkAtom"/>
 			</parameters>
 		</function>
-		<function name="x11_colormap_foreign_new" symbol="gdk_x11_colormap_foreign_new">
-			<return-type type="GdkColormap*"/>
+		<function name="x11_cursor_get_xcursor" symbol="gdk_x11_cursor_get_xcursor">
+			<return-type type="Cursor"/>
 			<parameters>
-				<parameter name="visual" type="GdkVisual*"/>
-				<parameter name="xcolormap" type="Colormap"/>
+				<parameter name="cursor" type="GdkCursor*"/>
 			</parameters>
 		</function>
-		<function name="x11_colormap_get_xcolormap" symbol="gdk_x11_colormap_get_xcolormap">
-			<return-type type="Colormap"/>
+		<function name="x11_cursor_get_xdisplay" symbol="gdk_x11_cursor_get_xdisplay">
+			<return-type type="Display*"/>
 			<parameters>
-				<parameter name="colormap" type="GdkColormap*"/>
+				<parameter name="cursor" type="GdkCursor*"/>
 			</parameters>
 		</function>
-		<function name="x11_colormap_get_xdisplay" symbol="gdk_x11_colormap_get_xdisplay">
-			<return-type type="Display*"/>
+		<function name="x11_display_broadcast_startup_message" symbol="gdk_x11_display_broadcast_startup_message">
+			<return-type type="void"/>
 			<parameters>
-				<parameter name="colormap" type="GdkColormap*"/>
+				<parameter name="display" type="GdkDisplay*"/>
+				<parameter name="message_type" type="char*"/>
 			</parameters>
 		</function>
-		<function name="x11_cursor_get_xcursor" symbol="gdk_x11_cursor_get_xcursor">
-			<return-type type="Cursor"/>
+		<function name="x11_display_error_trap_pop" symbol="gdk_x11_display_error_trap_pop">
+			<return-type type="gint"/>
 			<parameters>
-				<parameter name="cursor" type="GdkCursor*"/>
+				<parameter name="display" type="GdkDisplay*"/>
 			</parameters>
 		</function>
-		<function name="x11_cursor_get_xdisplay" symbol="gdk_x11_cursor_get_xdisplay">
-			<return-type type="Display*"/>
+		<function name="x11_display_error_trap_pop_ignored" symbol="gdk_x11_display_error_trap_pop_ignored">
+			<return-type type="void"/>
 			<parameters>
-				<parameter name="cursor" type="GdkCursor*"/>
+				<parameter name="display" type="GdkDisplay*"/>
 			</parameters>
 		</function>
-		<function name="x11_display_broadcast_startup_message" symbol="gdk_x11_display_broadcast_startup_message">
+		<function name="x11_display_error_trap_push" symbol="gdk_x11_display_error_trap_push">
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="message_type" type="char*"/>
 			</parameters>
 		</function>
 		<function name="x11_display_get_startup_notification_id" symbol="gdk_x11_display_get_startup_notification_id">
@@ -96,6 +95,13 @@
 				<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>
@@ -114,18 +120,6 @@
 				<parameter name="drawable" type="GdkDrawable*"/>
 			</parameters>
 		</function>
-		<function name="x11_gc_get_xdisplay" symbol="gdk_x11_gc_get_xdisplay">
-			<return-type type="Display*"/>
-			<parameters>
-				<parameter name="gc" type="GdkGC*"/>
-			</parameters>
-		</function>
-		<function name="x11_gc_get_xgc" symbol="gdk_x11_gc_get_xgc">
-			<return-type type="GC"/>
-			<parameters>
-				<parameter name="gc" type="GdkGC*"/>
-			</parameters>
-		</function>
 		<function name="x11_get_default_root_xwindow" symbol="gdk_x11_get_default_root_xwindow">
 			<return-type type="Window"/>
 		</function>
@@ -170,30 +164,12 @@
 		<function name="x11_grab_server" symbol="gdk_x11_grab_server">
 			<return-type type="void"/>
 		</function>
-		<function name="x11_image_get_xdisplay" symbol="gdk_x11_image_get_xdisplay">
-			<return-type type="Display*"/>
-			<parameters>
-				<parameter name="image" type="GdkImage*"/>
-			</parameters>
-		</function>
-		<function name="x11_image_get_ximage" symbol="gdk_x11_image_get_ximage">
-			<return-type type="XImage*"/>
-			<parameters>
-				<parameter name="image" type="GdkImage*"/>
-			</parameters>
-		</function>
 		<function name="x11_lookup_xdisplay" symbol="gdk_x11_lookup_xdisplay">
 			<return-type type="GdkDisplay*"/>
 			<parameters>
 				<parameter name="xdisplay" type="Display*"/>
 			</parameters>
 		</function>
-		<function name="x11_pixmap_get_drawable_impl" symbol="gdk_x11_pixmap_get_drawable_impl">
-			<return-type type="GdkDrawable*"/>
-			<parameters>
-				<parameter name="pixmap" type="GdkPixmap*"/>
-			</parameters>
-		</function>
 		<function name="x11_register_standard_event_type" symbol="gdk_x11_register_standard_event_type">
 			<return-type type="void"/>
 			<parameters>
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.gi b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
index e564c9d..fabb93b 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.gi
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
@@ -16,7 +16,7 @@
 			</parameters>
 		</function>
 		<function name="accelerator_get_default_mod_mask" symbol="gtk_accelerator_get_default_mod_mask">
-			<return-type type="guint"/>
+			<return-type type="GdkModifierType"/>
 		</function>
 		<function name="accelerator_get_label" symbol="gtk_accelerator_get_label">
 			<return-type type="gchar*"/>
@@ -2116,11 +2116,6 @@
 			<field name="shrink" type="guint"/>
 			<field name="empty" type="guint"/>
 		</struct>
-		<struct name="GtkTargetEntry">
-			<field name="target" type="gchar*"/>
-			<field name="flags" type="guint"/>
-			<field name="info" type="guint"/>
-		</struct>
 		<struct name="GtkTargetPair">
 			<field name="target" type="GdkAtom"/>
 			<field name="flags" type="guint"/>
@@ -2163,19 +2158,6 @@
 		</struct>
 		<struct name="GtkWindowGeometryInfo">
 		</struct>
-		<struct name="SizeRequest">
-			<field name="for_size" type="gint"/>
-			<field name="minimum_size" type="gint"/>
-			<field name="natural_size" type="gint"/>
-		</struct>
-		<struct name="SizeRequestCache">
-			<field name="widths" type="SizeRequest[]"/>
-			<field name="heights" type="SizeRequest[]"/>
-			<field name="cached_widths" type="guint"/>
-			<field name="cached_heights" type="guint"/>
-			<field name="last_cached_width" type="guint"/>
-			<field name="last_cached_height" type="guint"/>
-		</struct>
 		<boxed name="GtkBorder" type-name="GtkBorder" get-type="gtk_border_get_type">
 			<method name="copy" symbol="gtk_border_copy">
 				<return-type type="GtkBorder*"/>
@@ -2260,10 +2242,10 @@
 				<return-type type="GdkPixbuf*"/>
 				<parameters>
 					<parameter name="icon_info" type="GtkIconInfo*"/>
-					<parameter name="fg" type="GdkColor*"/>
-					<parameter name="success_color" type="GdkColor*"/>
-					<parameter name="warning_color" type="GdkColor*"/>
-					<parameter name="error_color" type="GdkColor*"/>
+					<parameter name="fg" type="GdkRGBA*"/>
+					<parameter name="success_color" type="GdkRGBA*"/>
+					<parameter name="warning_color" type="GdkRGBA*"/>
+					<parameter name="error_color" type="GdkRGBA*"/>
 					<parameter name="was_symbolic" type="gboolean*"/>
 					<parameter name="error" type="GError**"/>
 				</parameters>
@@ -2630,6 +2612,14 @@
 			</method>
 		</boxed>
 		<boxed name="GtkRecentInfo" type-name="GtkRecentInfo" get-type="gtk_recent_info_get_type">
+			<method name="create_app_info" symbol="gtk_recent_info_create_app_info">
+				<return-type type="GAppInfo*"/>
+				<parameters>
+					<parameter name="info" type="GtkRecentInfo*"/>
+					<parameter name="app_name" type="gchar*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
 			<method name="exists" symbol="gtk_recent_info_exists">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -2677,6 +2667,12 @@
 					<parameter name="info" type="GtkRecentInfo*"/>
 				</parameters>
 			</method>
+			<method name="get_gicon" symbol="gtk_recent_info_get_gicon">
+				<return-type type="GIcon*"/>
+				<parameters>
+					<parameter name="info" type="GtkRecentInfo*"/>
+				</parameters>
+			</method>
 			<method name="get_groups" symbol="gtk_recent_info_get_groups">
 				<return-type type="gchar**"/>
 				<parameters>
@@ -2945,6 +2941,31 @@
 			<field name="_g_sealed__length" type="gint"/>
 			<field name="_g_sealed__display" type="GdkDisplay*"/>
 		</boxed>
+		<boxed name="GtkTargetEntry" type-name="GtkTargetEntry" get-type="gtk_target_entry_get_type">
+			<method name="copy" symbol="gtk_target_entry_copy">
+				<return-type type="GtkTargetEntry*"/>
+				<parameters>
+					<parameter name="data" type="GtkTargetEntry*"/>
+				</parameters>
+			</method>
+			<method name="free" symbol="gtk_target_entry_free">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="data" type="GtkTargetEntry*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gtk_target_entry_new">
+				<return-type type="GtkTargetEntry*"/>
+				<parameters>
+					<parameter name="target" type="char*"/>
+					<parameter name="flags" type="guint"/>
+					<parameter name="info" type="guint"/>
+				</parameters>
+			</constructor>
+			<field name="target" type="gchar*"/>
+			<field name="flags" type="guint"/>
+			<field name="info" type="guint"/>
+		</boxed>
 		<boxed name="GtkTargetList" type-name="GtkTargetList" get-type="gtk_target_list_get_type">
 			<method name="add" symbol="gtk_target_list_add">
 				<return-type type="void"/>
@@ -4450,17 +4471,6 @@
 			<member name="GTK_WINDOW_TOPLEVEL" value="0"/>
 			<member name="GTK_WINDOW_POPUP" value="1"/>
 		</enum>
-		<enum name="GtkWrapAllocationMode" type-name="GtkWrapAllocationMode" get-type="gtk_wrap_allocation_mode_get_type">
-			<member name="GTK_WRAP_ALLOCATE_FREE" value="0"/>
-			<member name="GTK_WRAP_ALLOCATE_ALIGNED" value="1"/>
-			<member name="GTK_WRAP_ALLOCATE_HOMOGENEOUS" value="2"/>
-		</enum>
-		<enum name="GtkWrapBoxSpreading" type-name="GtkWrapBoxSpreading" get-type="gtk_wrap_box_spreading_get_type">
-			<member name="GTK_WRAP_BOX_SPREAD_START" value="0"/>
-			<member name="GTK_WRAP_BOX_SPREAD_END" value="1"/>
-			<member name="GTK_WRAP_BOX_SPREAD_EVEN" value="2"/>
-			<member name="GTK_WRAP_BOX_SPREAD_EXPAND" value="3"/>
-		</enum>
 		<enum name="GtkWrapMode" type-name="GtkWrapMode" get-type="gtk_wrap_mode_get_type">
 			<member name="GTK_WRAP_NONE" value="0"/>
 			<member name="GTK_WRAP_CHAR" value="1"/>
@@ -4574,10 +4584,6 @@
 			<member name="GTK_UI_MANAGER_ACCELERATOR" value="256"/>
 			<member name="GTK_UI_MANAGER_POPUP_WITH_ACCELS" value="512"/>
 		</flags>
-		<flags name="GtkWrapBoxPacking" type-name="GtkWrapBoxPacking" get-type="gtk_wrap_box_packing_get_type">
-			<member name="GTK_WRAP_BOX_H_EXPAND" value="1"/>
-			<member name="GTK_WRAP_BOX_V_EXPAND" value="2"/>
-		</flags>
 		<object name="GtkAboutDialog" parent="GtkDialog" type-name="GtkAboutDialog" get-type="gtk_about_dialog_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
@@ -5819,86 +5825,35 @@
 		</object>
 		<object name="GtkApplication" parent="GApplication" type-name="GtkApplication" get-type="gtk_application_get_type">
 			<implements>
-				<interface name="GInitable"/>
+				<interface name="GActionGroup"/>
 			</implements>
 			<method name="add_window" symbol="gtk_application_add_window">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="app" type="GtkApplication*"/>
+					<parameter name="application" type="GtkApplication*"/>
 					<parameter name="window" type="GtkWindow*"/>
 				</parameters>
 			</method>
-			<method name="create_window" symbol="gtk_application_create_window">
-				<return-type type="GtkWindow*"/>
-				<parameters>
-					<parameter name="app" type="GtkApplication*"/>
-				</parameters>
-			</method>
-			<method name="get_window" symbol="gtk_application_get_window">
-				<return-type type="GtkWindow*"/>
-				<parameters>
-					<parameter name="app" type="GtkApplication*"/>
-				</parameters>
-			</method>
 			<method name="get_windows" symbol="gtk_application_get_windows">
-				<return-type type="GSList*"/>
+				<return-type type="GList*"/>
 				<parameters>
-					<parameter name="app" type="GtkApplication*"/>
+					<parameter name="application" type="GtkApplication*"/>
 				</parameters>
 			</method>
 			<constructor name="new" symbol="gtk_application_new">
 				<return-type type="GtkApplication*"/>
 				<parameters>
-					<parameter name="appid" type="gchar*"/>
-					<parameter name="argc" type="gint*"/>
-					<parameter name="argv" type="gchar***"/>
+					<parameter name="application_id" type="gchar*"/>
+					<parameter name="flags" type="GApplicationFlags"/>
 				</parameters>
 			</constructor>
-			<method name="quit" symbol="gtk_application_quit">
+			<method name="remove_window" symbol="gtk_application_remove_window">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="app" type="GtkApplication*"/>
-				</parameters>
-			</method>
-			<method name="run" symbol="gtk_application_run">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="app" type="GtkApplication*"/>
-				</parameters>
-			</method>
-			<method name="set_action_group" symbol="gtk_application_set_action_group">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="app" type="GtkApplication*"/>
-					<parameter name="group" type="GtkActionGroup*"/>
+					<parameter name="application" type="GtkApplication*"/>
+					<parameter name="window" type="GtkWindow*"/>
 				</parameters>
 			</method>
-			<signal name="action" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="app" type="GtkApplication*"/>
-					<parameter name="action_name" type="char*"/>
-				</parameters>
-			</signal>
-			<signal name="activated" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="app" type="GtkApplication*"/>
-					<parameter name="args" type="GVariant"/>
-				</parameters>
-			</signal>
-			<signal name="quit" when="LAST">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="app" type="GtkApplication*"/>
-				</parameters>
-			</signal>
-			<vfunc name="create_window">
-				<return-type type="GtkWindow*"/>
-				<parameters>
-					<parameter name="app" type="GtkApplication*"/>
-				</parameters>
-			</vfunc>
 		</object>
 		<object name="GtkArrow" parent="GtkMisc" type-name="GtkArrow" get-type="gtk_arrow_get_type">
 			<implements>
@@ -6936,6 +6891,7 @@
 			</method>
 			<property name="cell-background" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
 			<property name="cell-background-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="cell-background-rgba" type="GdkRGBA*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="cell-background-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="editing" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="height" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -7157,6 +7113,7 @@
 			<property name="attributes" type="PangoAttrList*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="background" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
 			<property name="background-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="background-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="editable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="editable-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -7168,6 +7125,7 @@
 			<property name="font-desc" type="PangoFontDescription*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="foreground" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
 			<property name="foreground-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="foreground-rgba" type="GdkRGBA*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="foreground-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="language" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="language-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -7327,6 +7285,13 @@
 					<parameter name="color" type="GdkColor*"/>
 				</parameters>
 			</method>
+			<method name="set_background_rgba" symbol="gtk_cell_view_set_background_rgba">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell_view" type="GtkCellView*"/>
+					<parameter name="rgba" type="GdkRGBA*"/>
+				</parameters>
+			</method>
 			<method name="set_displayed_row" symbol="gtk_cell_view_set_displayed_row">
 				<return-type type="void"/>
 				<parameters>
@@ -7343,6 +7308,7 @@
 			</method>
 			<property name="background" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
 			<property name="background-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="background-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="model" type="GtkTreeModel*" readable="1" writable="1" construct="0" construct-only="0"/>
 		</object>
@@ -7692,6 +7658,13 @@
 					<parameter name="color" type="GdkColor*"/>
 				</parameters>
 			</method>
+			<method name="get_rgba" symbol="gtk_color_button_get_rgba">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="color_button" type="GtkColorButton*"/>
+					<parameter name="rgba" type="GdkRGBA*"/>
+				</parameters>
+			</method>
 			<method name="get_title" symbol="gtk_color_button_get_title">
 				<return-type type="gchar*"/>
 				<parameters>
@@ -7713,6 +7686,12 @@
 					<parameter name="color" type="GdkColor*"/>
 				</parameters>
 			</constructor>
+			<constructor name="new_with_rgba" symbol="gtk_color_button_new_with_rgba">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="rgba" type="GdkRGBA*"/>
+				</parameters>
+			</constructor>
 			<method name="set_alpha" symbol="gtk_color_button_set_alpha">
 				<return-type type="void"/>
 				<parameters>
@@ -7727,6 +7706,13 @@
 					<parameter name="color" type="GdkColor*"/>
 				</parameters>
 			</method>
+			<method name="set_rgba" symbol="gtk_color_button_set_rgba">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="color_button" type="GtkColorButton*"/>
+					<parameter name="rgba" type="GdkRGBA*"/>
+				</parameters>
+			</method>
 			<method name="set_title" symbol="gtk_color_button_set_title">
 				<return-type type="void"/>
 				<parameters>
@@ -7743,6 +7729,7 @@
 			</method>
 			<property name="alpha" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="color" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="rgba" type="GdkRGBA*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="use-alpha" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<signal name="color-set" when="FIRST">
@@ -7771,6 +7758,13 @@
 					<parameter name="color" type="GdkColor*"/>
 				</parameters>
 			</method>
+			<method name="get_current_rgba" symbol="gtk_color_selection_get_current_rgba">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="colorsel" type="GtkColorSelection*"/>
+					<parameter name="rgba" type="GdkRGBA*"/>
+				</parameters>
+			</method>
 			<method name="get_has_opacity_control" symbol="gtk_color_selection_get_has_opacity_control">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -7796,6 +7790,13 @@
 					<parameter name="color" type="GdkColor*"/>
 				</parameters>
 			</method>
+			<method name="get_previous_rgba" symbol="gtk_color_selection_get_previous_rgba">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="colorsel" type="GtkColorSelection*"/>
+					<parameter name="rgba" type="GdkRGBA*"/>
+				</parameters>
+			</method>
 			<method name="is_adjusting" symbol="gtk_color_selection_is_adjusting">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -7840,6 +7841,13 @@
 					<parameter name="color" type="GdkColor*"/>
 				</parameters>
 			</method>
+			<method name="set_current_rgba" symbol="gtk_color_selection_set_current_rgba">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="colorsel" type="GtkColorSelection*"/>
+					<parameter name="rgba" type="GdkRGBA*"/>
+				</parameters>
+			</method>
 			<method name="set_has_opacity_control" symbol="gtk_color_selection_set_has_opacity_control">
 				<return-type type="void"/>
 				<parameters>
@@ -7868,8 +7876,16 @@
 					<parameter name="color" type="GdkColor*"/>
 				</parameters>
 			</method>
+			<method name="set_previous_rgba" symbol="gtk_color_selection_set_previous_rgba">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="colorsel" type="GtkColorSelection*"/>
+					<parameter name="rgba" type="GdkRGBA*"/>
+				</parameters>
+			</method>
 			<property name="current-alpha" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="current-color" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="current-rgba" type="GdkRGBA*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="has-opacity-control" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="has-palette" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<signal name="color-changed" when="FIRST">
@@ -7908,13 +7924,6 @@
 				<interface name="GtkCellLayout"/>
 				<interface name="GtkCellEditable"/>
 			</implements>
-			<method name="append_text" symbol="gtk_combo_box_append_text">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="combo_box" type="GtkComboBox*"/>
-					<parameter name="text" type="gchar*"/>
-				</parameters>
-			</method>
 			<method name="get_active" symbol="gtk_combo_box_get_active">
 				<return-type type="gint"/>
 				<parameters>
@@ -7928,12 +7937,6 @@
 					<parameter name="iter" type="GtkTreeIter*"/>
 				</parameters>
 			</method>
-			<method name="get_active_text" symbol="gtk_combo_box_get_active_text">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="combo_box" type="GtkComboBox*"/>
-				</parameters>
-			</method>
 			<method name="get_add_tearoffs" symbol="gtk_combo_box_get_add_tearoffs">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -7952,12 +7955,24 @@
 					<parameter name="combo_box" type="GtkComboBox*"/>
 				</parameters>
 			</method>
+			<method name="get_entry_text_column" symbol="gtk_combo_box_get_entry_text_column">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="combo_box" type="GtkComboBox*"/>
+				</parameters>
+			</method>
 			<method name="get_focus_on_click" symbol="gtk_combo_box_get_focus_on_click">
 				<return-type type="gboolean"/>
 				<parameters>
 					<parameter name="combo" type="GtkComboBox*"/>
 				</parameters>
 			</method>
+			<method name="get_has_entry" symbol="gtk_combo_box_get_has_entry">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="combo_box" type="GtkComboBox*"/>
+				</parameters>
+			</method>
 			<method name="get_model" symbol="gtk_combo_box_get_model">
 				<return-type type="GtkTreeModel*"/>
 				<parameters>
@@ -7970,6 +7985,12 @@
 					<parameter name="combo_box" type="GtkComboBox*"/>
 				</parameters>
 			</method>
+			<method name="get_popup_fixed_width" symbol="gtk_combo_box_get_popup_fixed_width">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="combo_box" type="GtkComboBox*"/>
+				</parameters>
+			</method>
 			<method name="get_row_separator_func" symbol="gtk_combo_box_get_row_separator_func">
 				<return-type type="GtkTreeViewRowSeparatorFunc"/>
 				<parameters>
@@ -7994,18 +8015,10 @@
 					<parameter name="combo_box" type="GtkComboBox*"/>
 				</parameters>
 			</method>
-			<method name="insert_text" symbol="gtk_combo_box_insert_text">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="combo_box" type="GtkComboBox*"/>
-					<parameter name="position" type="gint"/>
-					<parameter name="text" type="gchar*"/>
-				</parameters>
-			</method>
 			<constructor name="new" symbol="gtk_combo_box_new">
 				<return-type type="GtkWidget*"/>
 			</constructor>
-			<constructor name="new_text" symbol="gtk_combo_box_new_text">
+			<constructor name="new_with_entry" symbol="gtk_combo_box_new_with_entry">
 				<return-type type="GtkWidget*"/>
 			</constructor>
 			<constructor name="new_with_model" symbol="gtk_combo_box_new_with_model">
@@ -8033,20 +8046,6 @@
 					<parameter name="device" type="GdkDevice*"/>
 				</parameters>
 			</method>
-			<method name="prepend_text" symbol="gtk_combo_box_prepend_text">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="combo_box" type="GtkComboBox*"/>
-					<parameter name="text" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="remove_text" symbol="gtk_combo_box_remove_text">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="combo_box" type="GtkComboBox*"/>
-					<parameter name="position" type="gint"/>
-				</parameters>
-			</method>
 			<method name="set_active" symbol="gtk_combo_box_set_active">
 				<return-type type="void"/>
 				<parameters>
@@ -8082,6 +8081,13 @@
 					<parameter name="column_span" type="gint"/>
 				</parameters>
 			</method>
+			<method name="set_entry_text_column" symbol="gtk_combo_box_set_entry_text_column">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="combo_box" type="GtkComboBox*"/>
+					<parameter name="text_column" type="gint"/>
+				</parameters>
+			</method>
 			<method name="set_focus_on_click" symbol="gtk_combo_box_set_focus_on_click">
 				<return-type type="void"/>
 				<parameters>
@@ -8096,6 +8102,13 @@
 					<parameter name="model" type="GtkTreeModel*"/>
 				</parameters>
 			</method>
+			<method name="set_popup_fixed_width" symbol="gtk_combo_box_set_popup_fixed_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="combo_box" type="GtkComboBox*"/>
+					<parameter name="fixed" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_row_separator_func" symbol="gtk_combo_box_set_row_separator_func">
 				<return-type type="void"/>
 				<parameters>
@@ -8130,9 +8143,12 @@
 			<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="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="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"/>
 			<property name="row-span-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="tearoff-title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -8162,47 +8178,61 @@
 					<parameter name="object" type="GtkComboBox*"/>
 				</parameters>
 			</signal>
-			<vfunc name="get_active_text">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="combo_box" type="GtkComboBox*"/>
-				</parameters>
-			</vfunc>
 		</object>
-		<object name="GtkComboBoxEntry" parent="GtkComboBox" type-name="GtkComboBoxEntry" get-type="gtk_combo_box_entry_get_type">
+		<object name="GtkComboBoxText" parent="GtkComboBox" type-name="GtkComboBoxText" get-type="gtk_combo_box_text_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
 				<interface name="GtkCellLayout"/>
 				<interface name="GtkCellEditable"/>
 			</implements>
-			<method name="get_text_column" symbol="gtk_combo_box_entry_get_text_column">
-				<return-type type="gint"/>
+			<method name="append_text" symbol="gtk_combo_box_text_append_text">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="combo_box" type="GtkComboBoxText*"/>
+					<parameter name="text" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="get_active_text" symbol="gtk_combo_box_text_get_active_text">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="combo_box" type="GtkComboBoxText*"/>
+				</parameters>
+			</method>
+			<method name="insert_text" symbol="gtk_combo_box_text_insert_text">
+				<return-type type="void"/>
 				<parameters>
-					<parameter name="entry_box" type="GtkComboBoxEntry*"/>
+					<parameter name="combo_box" type="GtkComboBoxText*"/>
+					<parameter name="position" type="gint"/>
+					<parameter name="text" type="gchar*"/>
 				</parameters>
 			</method>
-			<constructor name="new" symbol="gtk_combo_box_entry_new">
+			<constructor name="new" symbol="gtk_combo_box_text_new">
 				<return-type type="GtkWidget*"/>
 			</constructor>
-			<constructor name="new_text" symbol="gtk_combo_box_entry_new_text">
+			<constructor name="new_with_entry" symbol="gtk_combo_box_text_new_with_entry">
 				<return-type type="GtkWidget*"/>
 			</constructor>
-			<constructor name="new_with_model" symbol="gtk_combo_box_entry_new_with_model">
-				<return-type type="GtkWidget*"/>
+			<method name="prepend_text" symbol="gtk_combo_box_text_prepend_text">
+				<return-type type="void"/>
 				<parameters>
-					<parameter name="model" type="GtkTreeModel*"/>
-					<parameter name="text_column" type="gint"/>
+					<parameter name="combo_box" type="GtkComboBoxText*"/>
+					<parameter name="text" type="gchar*"/>
 				</parameters>
-			</constructor>
-			<method name="set_text_column" symbol="gtk_combo_box_entry_set_text_column">
+			</method>
+			<method name="remove" symbol="gtk_combo_box_text_remove">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="entry_box" type="GtkComboBoxEntry*"/>
-					<parameter name="text_column" type="gint"/>
+					<parameter name="combo_box" type="GtkComboBoxText*"/>
+					<parameter name="position" type="gint"/>
+				</parameters>
+			</method>
+			<method name="remove_all" symbol="gtk_combo_box_text_remove_all">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="combo_box" type="GtkComboBoxText*"/>
 				</parameters>
 			</method>
-			<property name="text-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 		</object>
 		<object name="GtkContainer" parent="GtkWidget" type-name="GtkContainer" get-type="gtk_container_get_type">
 			<implements>
@@ -8712,6 +8742,14 @@
 					<parameter name="icon_pos" type="GtkEntryIconPosition"/>
 				</parameters>
 			</method>
+			<method name="get_icon_area" symbol="gtk_entry_get_icon_area">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="entry" type="GtkEntry*"/>
+					<parameter name="icon_pos" type="GtkEntryIconPosition"/>
+					<parameter name="icon_area" type="GdkRectangle*"/>
+				</parameters>
+			</method>
 			<method name="get_icon_at_pos" symbol="gtk_entry_get_icon_at_pos">
 				<return-type type="gint"/>
 				<parameters>
@@ -8776,13 +8814,6 @@
 					<parameter name="icon_pos" type="GtkEntryIconPosition"/>
 				</parameters>
 			</method>
-			<method name="get_icon_window" symbol="gtk_entry_get_icon_window">
-				<return-type type="GdkWindow*"/>
-				<parameters>
-					<parameter name="entry" type="GtkEntry*"/>
-					<parameter name="icon_pos" type="GtkEntryIconPosition"/>
-				</parameters>
-			</method>
 			<method name="get_inner_border" symbol="gtk_entry_get_inner_border">
 				<return-type type="GtkBorder*"/>
 				<parameters>
@@ -8839,14 +8870,15 @@
 					<parameter name="entry" type="GtkEntry*"/>
 				</parameters>
 			</method>
-			<method name="get_text_length" symbol="gtk_entry_get_text_length">
-				<return-type type="guint16"/>
+			<method name="get_text_area" symbol="gtk_entry_get_text_area">
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="entry" type="GtkEntry*"/>
+					<parameter name="text_area" type="GdkRectangle*"/>
 				</parameters>
 			</method>
-			<method name="get_text_window" symbol="gtk_entry_get_text_window">
-				<return-type type="GdkWindow*"/>
+			<method name="get_text_length" symbol="gtk_entry_get_text_length">
+				<return-type type="guint16"/>
 				<parameters>
 					<parameter name="entry" type="GtkEntry*"/>
 				</parameters>
@@ -10245,6 +10277,94 @@
 				</parameters>
 			</vfunc>
 		</object>
+		<object name="GtkGrid" parent="GtkContainer" type-name="GtkGrid" get-type="gtk_grid_get_type">
+			<implements>
+				<interface name="AtkImplementor"/>
+				<interface name="GtkBuildable"/>
+				<interface name="GtkOrientable"/>
+			</implements>
+			<method name="attach" symbol="gtk_grid_attach">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="grid" type="GtkGrid*"/>
+					<parameter name="child" type="GtkWidget*"/>
+					<parameter name="left" type="gint"/>
+					<parameter name="top" type="gint"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="height" type="gint"/>
+				</parameters>
+			</method>
+			<method name="attach_next_to" symbol="gtk_grid_attach_next_to">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="grid" type="GtkGrid*"/>
+					<parameter name="child" type="GtkWidget*"/>
+					<parameter name="sibling" type="GtkWidget*"/>
+					<parameter name="side" type="GtkPositionType"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="height" type="gint"/>
+				</parameters>
+			</method>
+			<method name="get_column_homogeneous" symbol="gtk_grid_get_column_homogeneous">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="grid" type="GtkGrid*"/>
+				</parameters>
+			</method>
+			<method name="get_column_spacing" symbol="gtk_grid_get_column_spacing">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="grid" type="GtkGrid*"/>
+				</parameters>
+			</method>
+			<method name="get_row_homogeneous" symbol="gtk_grid_get_row_homogeneous">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="grid" type="GtkGrid*"/>
+				</parameters>
+			</method>
+			<method name="get_row_spacing" symbol="gtk_grid_get_row_spacing">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="grid" type="GtkGrid*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gtk_grid_new">
+				<return-type type="GtkWidget*"/>
+			</constructor>
+			<method name="set_column_homogeneous" symbol="gtk_grid_set_column_homogeneous">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="grid" type="GtkGrid*"/>
+					<parameter name="homogeneous" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_column_spacing" symbol="gtk_grid_set_column_spacing">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="grid" type="GtkGrid*"/>
+					<parameter name="spacing" type="guint"/>
+				</parameters>
+			</method>
+			<method name="set_row_homogeneous" symbol="gtk_grid_set_row_homogeneous">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="grid" type="GtkGrid*"/>
+					<parameter name="homogeneous" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_row_spacing" symbol="gtk_grid_set_row_spacing">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="grid" type="GtkGrid*"/>
+					<parameter name="spacing" type="guint"/>
+				</parameters>
+			</method>
+			<property name="column-homogeneous" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="column-spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="row-homogeneous" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="row-spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+		</object>
 		<object name="GtkHBox" parent="GtkBox" type-name="GtkHBox" get-type="gtk_hbox_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
@@ -10908,6 +11028,7 @@
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
 				<interface name="GtkCellLayout"/>
+				<interface name="GtkScrollable"/>
 			</implements>
 			<method name="convert_widget_to_bin_window_coords" symbol="gtk_icon_view_convert_widget_to_bin_window_coords">
 				<return-type type="void"/>
@@ -11391,14 +11512,6 @@
 					<parameter name="icon_view" type="GtkIconView*"/>
 				</parameters>
 			</signal>
-			<signal name="set-scroll-adjustments" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="icon_view" type="GtkIconView*"/>
-					<parameter name="hadjustment" type="GtkAdjustment*"/>
-					<parameter name="vadjustment" type="GtkAdjustment*"/>
-				</parameters>
-			</signal>
 			<signal name="toggle-cursor-item" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -12161,6 +12274,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkScrollable"/>
 			</implements>
 			<method name="get_bin_window" symbol="gtk_layout_get_bin_window">
 				<return-type type="GdkWindow*"/>
@@ -12168,12 +12282,6 @@
 					<parameter name="layout" type="GtkLayout*"/>
 				</parameters>
 			</method>
-			<method name="get_hadjustment" symbol="gtk_layout_get_hadjustment">
-				<return-type type="GtkAdjustment*"/>
-				<parameters>
-					<parameter name="layout" type="GtkLayout*"/>
-				</parameters>
-			</method>
 			<method name="get_size" symbol="gtk_layout_get_size">
 				<return-type type="void"/>
 				<parameters>
@@ -12182,12 +12290,6 @@
 					<parameter name="height" type="guint*"/>
 				</parameters>
 			</method>
-			<method name="get_vadjustment" symbol="gtk_layout_get_vadjustment">
-				<return-type type="GtkAdjustment*"/>
-				<parameters>
-					<parameter name="layout" type="GtkLayout*"/>
-				</parameters>
-			</method>
 			<method name="move" symbol="gtk_layout_move">
 				<return-type type="void"/>
 				<parameters>
@@ -12213,13 +12315,6 @@
 					<parameter name="y" type="gint"/>
 				</parameters>
 			</method>
-			<method name="set_hadjustment" symbol="gtk_layout_set_hadjustment">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkLayout*"/>
-					<parameter name="adjustment" type="GtkAdjustment*"/>
-				</parameters>
-			</method>
 			<method name="set_size" symbol="gtk_layout_set_size">
 				<return-type type="void"/>
 				<parameters>
@@ -12228,25 +12323,8 @@
 					<parameter name="height" type="guint"/>
 				</parameters>
 			</method>
-			<method name="set_vadjustment" symbol="gtk_layout_set_vadjustment">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkLayout*"/>
-					<parameter name="adjustment" type="GtkAdjustment*"/>
-				</parameters>
-			</method>
-			<property name="hadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="height" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="vadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="width" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="set-scroll-adjustments" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkLayout*"/>
-					<parameter name="hadjustment" type="GtkAdjustment*"/>
-					<parameter name="vadjustment" type="GtkAdjustment*"/>
-				</parameters>
-			</signal>
 		</object>
 		<object name="GtkLinkButton" parent="GtkButton" type-name="GtkLinkButton" get-type="gtk_link_button_get_type">
 			<implements>
@@ -12295,6 +12373,12 @@
 			</method>
 			<property name="uri" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="visited" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="activate-link" when="LAST">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="button" type="GtkLinkButton*"/>
+				</parameters>
+			</signal>
 		</object>
 		<object name="GtkListStore" parent="GObject" type-name="GtkListStore" get-type="gtk_list_store_get_type">
 			<implements>
@@ -13602,25 +13686,25 @@
 			<signal name="page-added" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="object" type="GtkNotebook*"/>
-					<parameter name="p0" type="GtkWidget*"/>
-					<parameter name="p1" type="guint"/>
+					<parameter name="notebook" type="GtkNotebook*"/>
+					<parameter name="child" type="GtkWidget*"/>
+					<parameter name="page_num" type="guint"/>
 				</parameters>
 			</signal>
 			<signal name="page-removed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="object" type="GtkNotebook*"/>
-					<parameter name="p0" type="GtkWidget*"/>
-					<parameter name="p1" type="guint"/>
+					<parameter name="notebook" type="GtkNotebook*"/>
+					<parameter name="child" type="GtkWidget*"/>
+					<parameter name="page_num" type="guint"/>
 				</parameters>
 			</signal>
 			<signal name="page-reordered" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="object" type="GtkNotebook*"/>
-					<parameter name="p0" type="GtkWidget*"/>
-					<parameter name="p1" type="guint"/>
+					<parameter name="notebook" type="GtkNotebook*"/>
+					<parameter name="child" type="GtkWidget*"/>
+					<parameter name="page_num" type="guint"/>
 				</parameters>
 			</signal>
 			<signal name="reorder-tab" when="LAST">
@@ -16154,6 +16238,18 @@
 					<parameter name="scrolled_window" type="GtkScrolledWindow*"/>
 				</parameters>
 			</method>
+			<method name="get_min_content_height" symbol="gtk_scrolled_window_get_min_content_height">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+				</parameters>
+			</method>
+			<method name="get_min_content_width" symbol="gtk_scrolled_window_get_min_content_width">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+				</parameters>
+			</method>
 			<method name="get_placement" symbol="gtk_scrolled_window_get_placement">
 				<return-type type="GtkCornerType"/>
 				<parameters>
@@ -16200,6 +16296,20 @@
 					<parameter name="hadjustment" type="GtkAdjustment*"/>
 				</parameters>
 			</method>
+			<method name="set_min_content_height" symbol="gtk_scrolled_window_set_min_content_height">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+					<parameter name="height" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_min_content_width" symbol="gtk_scrolled_window_set_min_content_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="scrolled_window" type="GtkScrolledWindow*"/>
+					<parameter name="width" type="gint"/>
+				</parameters>
+			</method>
 			<method name="set_placement" symbol="gtk_scrolled_window_set_placement">
 				<return-type type="void"/>
 				<parameters>
@@ -16237,6 +16347,8 @@
 			</method>
 			<property name="hadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="hscrollbar-policy" type="GtkPolicyType" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="min-content-height" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="min-content-width" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="shadow-type" type="GtkShadowType" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="vadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="vscrollbar-policy" type="GtkPolicyType" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -16368,6 +16480,9 @@
 			<property name="gtk-alternative-sort-arrows" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-application-prefer-dark-theme" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-auto-mnemonics" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gtk-button-images" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gtk-can-change-accels" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gtk-color-palette" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-color-scheme" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-cursor-blink" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-cursor-blink-time" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -16383,6 +16498,8 @@
 			<property name="gtk-enable-input-feedback-sounds" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-enable-mnemonics" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-enable-tooltips" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gtk-entry-password-hint-timeout" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gtk-entry-select-on-focus" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-error-bell" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-fallback-icon-theme" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-file-chooser-backend" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -16391,15 +16508,23 @@
 			<property name="gtk-icon-sizes" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-icon-theme-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-im-module" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gtk-im-preedit-style" type="GtkIMPreeditStyle" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gtk-im-status-style" type="GtkIMStatusStyle" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-key-theme-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-keynav-cursor-only" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-keynav-wrap-around" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gtk-label-select-on-focus" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-menu-bar-accel" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gtk-menu-bar-popup-delay" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gtk-menu-images" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gtk-menu-popdown-delay" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gtk-menu-popup-delay" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-modules" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-print-backends" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-print-preview-command" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-recent-files-limit" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-recent-files-max-age" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gtk-scrolled-window-placement" type="GtkCornerType" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-show-input-method-menu" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-show-unicode-menu" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-sound-theme-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -17059,12 +17184,6 @@
 					<parameter name="context_description" type="gchar*"/>
 				</parameters>
 			</method>
-			<method name="get_has_resize_grip" symbol="gtk_statusbar_get_has_resize_grip">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="statusbar" type="GtkStatusbar*"/>
-				</parameters>
-			</method>
 			<method name="get_message_area" symbol="gtk_statusbar_get_message_area">
 				<return-type type="GtkWidget*"/>
 				<parameters>
@@ -17104,14 +17223,6 @@
 					<parameter name="context_id" type="guint"/>
 				</parameters>
 			</method>
-			<method name="set_has_resize_grip" symbol="gtk_statusbar_set_has_resize_grip">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="statusbar" type="GtkStatusbar*"/>
-					<parameter name="setting" type="gboolean"/>
-				</parameters>
-			</method>
-			<property name="has-resize-grip" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<signal name="text-popped" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -18654,6 +18765,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkScrollable"/>
 			</implements>
 			<method name="add_child_at_anchor" symbol="gtk_text_view_add_child_at_anchor">
 				<return-type type="void"/>
@@ -18749,12 +18861,6 @@
 					<parameter name="text_view" type="GtkTextView*"/>
 				</parameters>
 			</method>
-			<method name="get_hadjustment" symbol="gtk_text_view_get_hadjustment">
-				<return-type type="GtkAdjustment*"/>
-				<parameters>
-					<parameter name="text_view" type="GtkTextView*"/>
-				</parameters>
-			</method>
 			<method name="get_indent" symbol="gtk_text_view_get_indent">
 				<return-type type="gint"/>
 				<parameters>
@@ -18854,12 +18960,6 @@
 					<parameter name="text_view" type="GtkTextView*"/>
 				</parameters>
 			</method>
-			<method name="get_vadjustment" symbol="gtk_text_view_get_vadjustment">
-				<return-type type="GtkAdjustment*"/>
-				<parameters>
-					<parameter name="text_view" type="GtkTextView*"/>
-				</parameters>
-			</method>
 			<method name="get_visible_rect" symbol="gtk_text_view_get_visible_rect">
 				<return-type type="void"/>
 				<parameters>
@@ -19190,14 +19290,6 @@
 					<parameter name="text_view" type="GtkTextView*"/>
 				</parameters>
 			</signal>
-			<signal name="set-scroll-adjustments" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="text_view" type="GtkTextView*"/>
-					<parameter name="hadjustment" type="GtkAdjustment*"/>
-					<parameter name="vadjustment" type="GtkAdjustment*"/>
-				</parameters>
-			</signal>
 			<signal name="toggle-cursor-visible" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -19210,13 +19302,6 @@
 					<parameter name="text_view" type="GtkTextView*"/>
 				</parameters>
 			</signal>
-			<vfunc name="move_focus">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="text_view" type="GtkTextView*"/>
-					<parameter name="direction" type="GtkDirectionType"/>
-				</parameters>
-			</vfunc>
 		</object>
 		<object name="GtkToggleAction" parent="GtkAction" type-name="GtkToggleAction" get-type="gtk_toggle_action_get_type">
 			<implements>
@@ -19824,6 +19909,7 @@
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
 				<interface name="GtkOrientable"/>
+				<interface name="GtkScrollable"/>
 			</implements>
 			<method name="add_drag_dest" symbol="gtk_tool_palette_add_drag_dest">
 				<return-type type="void"/>
@@ -19856,12 +19942,6 @@
 					<parameter name="y" type="gint"/>
 				</parameters>
 			</method>
-			<method name="get_hadjustment" symbol="gtk_tool_palette_get_hadjustment">
-				<return-type type="GtkAdjustment*"/>
-				<parameters>
-					<parameter name="palette" type="GtkToolPalette*"/>
-				</parameters>
-			</method>
 			<method name="get_icon_size" symbol="gtk_tool_palette_get_icon_size">
 				<return-type type="GtkIconSize"/>
 				<parameters>
@@ -19874,12 +19954,6 @@
 					<parameter name="palette" type="GtkToolPalette*"/>
 				</parameters>
 			</method>
-			<method name="get_vadjustment" symbol="gtk_tool_palette_get_vadjustment">
-				<return-type type="GtkAdjustment*"/>
-				<parameters>
-					<parameter name="palette" type="GtkToolPalette*"/>
-				</parameters>
-			</method>
 			<constructor name="new" symbol="gtk_tool_palette_new">
 				<return-type type="GtkWidget*"/>
 			</constructor>
@@ -19919,14 +19993,6 @@
 			<property name="icon-size" type="GtkIconSize" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="icon-size-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="toolbar-style" type="GtkToolbarStyle" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="set-scroll-adjustments" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="widget" type="GtkToolPalette*"/>
-					<parameter name="hadjustment" type="GtkAdjustment*"/>
-					<parameter name="vadjustment" type="GtkAdjustment*"/>
-				</parameters>
-			</signal>
 		</object>
 		<object name="GtkToolbar" parent="GtkContainer" type-name="GtkToolbar" get-type="gtk_toolbar_get_type">
 			<implements>
@@ -20664,6 +20730,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkScrollable"/>
 			</implements>
 			<method name="append_column" symbol="gtk_tree_view_append_column">
 				<return-type type="gint"/>
@@ -20891,12 +20958,6 @@
 					<parameter name="tree_view" type="GtkTreeView*"/>
 				</parameters>
 			</method>
-			<method name="get_hadjustment" symbol="gtk_tree_view_get_hadjustment">
-				<return-type type="GtkAdjustment*"/>
-				<parameters>
-					<parameter name="tree_view" type="GtkTreeView*"/>
-				</parameters>
-			</method>
 			<method name="get_headers_clickable" symbol="gtk_tree_view_get_headers_clickable">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -21023,12 +21084,6 @@
 					<parameter name="iter" type="GtkTreeIter*"/>
 				</parameters>
 			</method>
-			<method name="get_vadjustment" symbol="gtk_tree_view_get_vadjustment">
-				<return-type type="GtkAdjustment*"/>
-				<parameters>
-					<parameter name="tree_view" type="GtkTreeView*"/>
-				</parameters>
-			</method>
 			<method name="get_visible_range" symbol="gtk_tree_view_get_visible_range">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -21225,13 +21280,6 @@
 					<parameter name="grid_lines" type="GtkTreeViewGridLines"/>
 				</parameters>
 			</method>
-			<method name="set_hadjustment" symbol="gtk_tree_view_set_hadjustment">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="tree_view" type="GtkTreeView*"/>
-					<parameter name="adjustment" type="GtkAdjustment*"/>
-				</parameters>
-			</method>
 			<method name="set_headers_clickable" symbol="gtk_tree_view_set_headers_clickable">
 				<return-type type="void"/>
 				<parameters>
@@ -21368,13 +21416,6 @@
 					<parameter name="path" type="GtkTreePath*"/>
 				</parameters>
 			</method>
-			<method name="set_vadjustment" symbol="gtk_tree_view_set_vadjustment">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="tree_view" type="GtkTreeView*"/>
-					<parameter name="adjustment" type="GtkAdjustment*"/>
-				</parameters>
-			</method>
 			<method name="unset_rows_drag_dest" symbol="gtk_tree_view_unset_rows_drag_dest">
 				<return-type type="void"/>
 				<parameters>
@@ -21392,7 +21433,6 @@
 			<property name="enable-tree-lines" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="expander-column" type="GtkTreeViewColumn*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="fixed-height-mode" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="hadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="headers-clickable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="headers-visible" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="hover-expand" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -21405,7 +21445,6 @@
 			<property name="search-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="show-expanders" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="tooltip-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="vadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<signal name="columns-changed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -21478,14 +21517,6 @@
 					<parameter name="start_editing" type="gboolean"/>
 				</parameters>
 			</signal>
-			<signal name="set-scroll-adjustments" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="tree_view" type="GtkTreeView*"/>
-					<parameter name="hadjustment" type="GtkAdjustment*"/>
-					<parameter name="vadjustment" type="GtkAdjustment*"/>
-				</parameters>
-			</signal>
 			<signal name="start-interactive-search" when="LAST">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -22164,6 +22195,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkScrollable"/>
 			</implements>
 			<method name="get_bin_window" symbol="gtk_viewport_get_bin_window">
 				<return-type type="GdkWindow*"/>
@@ -22171,24 +22203,12 @@
 					<parameter name="viewport" type="GtkViewport*"/>
 				</parameters>
 			</method>
-			<method name="get_hadjustment" symbol="gtk_viewport_get_hadjustment">
-				<return-type type="GtkAdjustment*"/>
-				<parameters>
-					<parameter name="viewport" type="GtkViewport*"/>
-				</parameters>
-			</method>
 			<method name="get_shadow_type" symbol="gtk_viewport_get_shadow_type">
 				<return-type type="GtkShadowType"/>
 				<parameters>
 					<parameter name="viewport" type="GtkViewport*"/>
 				</parameters>
 			</method>
-			<method name="get_vadjustment" symbol="gtk_viewport_get_vadjustment">
-				<return-type type="GtkAdjustment*"/>
-				<parameters>
-					<parameter name="viewport" type="GtkViewport*"/>
-				</parameters>
-			</method>
 			<method name="get_view_window" symbol="gtk_viewport_get_view_window">
 				<return-type type="GdkWindow*"/>
 				<parameters>
@@ -22202,13 +22222,6 @@
 					<parameter name="vadjustment" type="GtkAdjustment*"/>
 				</parameters>
 			</constructor>
-			<method name="set_hadjustment" symbol="gtk_viewport_set_hadjustment">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="viewport" type="GtkViewport*"/>
-					<parameter name="adjustment" type="GtkAdjustment*"/>
-				</parameters>
-			</method>
 			<method name="set_shadow_type" symbol="gtk_viewport_set_shadow_type">
 				<return-type type="void"/>
 				<parameters>
@@ -22216,24 +22229,7 @@
 					<parameter name="type" type="GtkShadowType"/>
 				</parameters>
 			</method>
-			<method name="set_vadjustment" symbol="gtk_viewport_set_vadjustment">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="viewport" type="GtkViewport*"/>
-					<parameter name="adjustment" type="GtkAdjustment*"/>
-				</parameters>
-			</method>
-			<property name="hadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="shadow-type" type="GtkShadowType" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="vadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="1" construct-only="0"/>
-			<signal name="set-scroll-adjustments" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="viewport" type="GtkViewport*"/>
-					<parameter name="hadjustment" type="GtkAdjustment*"/>
-					<parameter name="vadjustment" type="GtkAdjustment*"/>
-				</parameters>
-			</signal>
 		</object>
 		<object name="GtkVolumeButton" parent="GtkScaleButton" type-name="GtkVolumeButton" get-type="gtk_volume_button_get_type">
 			<implements>
@@ -22349,6 +22345,13 @@
 					<parameter name="path_reversed" type="gchar**"/>
 				</parameters>
 			</method>
+			<method name="compute_expand" symbol="gtk_widget_compute_expand">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="orientation" type="GtkOrientation"/>
+				</parameters>
+			</method>
 			<method name="create_pango_context" symbol="gtk_widget_create_pango_context">
 				<return-type type="PangoContext*"/>
 				<parameters>
@@ -22544,6 +22547,18 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="get_hexpand" symbol="gtk_widget_get_hexpand">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
+			<method name="get_hexpand_set" symbol="gtk_widget_get_hexpand_set">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_mapped" symbol="gtk_widget_get_mapped">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -22765,6 +22780,18 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="get_vexpand" symbol="gtk_widget_get_vexpand">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
+			<method name="get_vexpand_set" symbol="gtk_widget_get_vexpand_set">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_visible" symbol="gtk_widget_get_visible">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -22831,12 +22858,6 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
-			<method name="hide_all" symbol="gtk_widget_hide_all">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-				</parameters>
-			</method>
 			<method name="hide_on_delete" symbol="gtk_widget_hide_on_delete">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -23017,6 +23038,12 @@
 			<method name="push_composite_child" symbol="gtk_widget_push_composite_child">
 				<return-type type="void"/>
 			</method>
+			<method name="queue_compute_expand" symbol="gtk_widget_queue_compute_expand">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="queue_draw" symbol="gtk_widget_queue_draw">
 				<return-type type="void"/>
 				<parameters>
@@ -23033,6 +23060,13 @@
 					<parameter name="height" type="gint"/>
 				</parameters>
 			</method>
+			<method name="queue_draw_region" symbol="gtk_widget_queue_draw_region">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="region" type="cairo_region_t*"/>
+				</parameters>
+			</method>
 			<method name="queue_resize" symbol="gtk_widget_queue_resize">
 				<return-type type="void"/>
 				<parameters>
@@ -23229,6 +23263,20 @@
 					<parameter name="has_window" type="gboolean"/>
 				</parameters>
 			</method>
+			<method name="set_hexpand" symbol="gtk_widget_set_hexpand">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="expand" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_hexpand_set" symbol="gtk_widget_set_hexpand_set">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="set" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_mapped" symbol="gtk_widget_set_mapped">
 				<return-type type="void"/>
 				<parameters>
@@ -23313,14 +23361,6 @@
 					<parameter name="redraw_on_allocate" type="gboolean"/>
 				</parameters>
 			</method>
-			<method name="set_scroll_adjustments" symbol="gtk_widget_set_scroll_adjustments">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="hadjustment" type="GtkAdjustment*"/>
-					<parameter name="vadjustment" type="GtkAdjustment*"/>
-				</parameters>
-			</method>
 			<method name="set_sensitive" symbol="gtk_widget_set_sensitive">
 				<return-type type="void"/>
 				<parameters>
@@ -23385,6 +23425,20 @@
 					<parameter name="align" type="GtkAlign"/>
 				</parameters>
 			</method>
+			<method name="set_vexpand" symbol="gtk_widget_set_vexpand">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="expand" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_vexpand_set" symbol="gtk_widget_set_vexpand_set">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="set" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_visible" symbol="gtk_widget_set_visible">
 				<return-type type="void"/>
 				<parameters>
@@ -23514,12 +23568,15 @@
 			<property name="composite-child" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
 			<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"/>
 			<property name="has-tooltip" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="height-request" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="hexpand" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="hexpand-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="is-focus" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="margin" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="margin-bottom" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -23535,6 +23592,8 @@
 			<property name="tooltip-markup" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="tooltip-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="valign" type="GtkAlign" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="vexpand" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="vexpand-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="visible" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="width-request" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="window" type="GdkWindow*" readable="1" writable="0" construct="0" construct-only="0"/>
@@ -23595,8 +23654,8 @@
 			<signal name="damage-event" when="LAST">
 				<return-type type="gboolean"/>
 				<parameters>
-					<parameter name="object" type="GtkWidget*"/>
-					<parameter name="p0" type="GdkEvent*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="event" type="GdkEvent*"/>
 				</parameters>
 			</signal>
 			<signal name="delete-event" when="LAST">
@@ -23804,8 +23863,8 @@
 			<signal name="keynav-failed" when="LAST">
 				<return-type type="gboolean"/>
 				<parameters>
-					<parameter name="object" type="GtkWidget*"/>
-					<parameter name="p0" type="GtkDirectionType"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="direction" type="GtkDirectionType"/>
 				</parameters>
 			</signal>
 			<signal name="leave-notify-event" when="LAST">
@@ -23845,8 +23904,8 @@
 			<signal name="move-focus" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="object" type="GtkWidget*"/>
-					<parameter name="p0" type="GtkDirectionType"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="direction" type="GtkDirectionType"/>
 				</parameters>
 			</signal>
 			<signal name="no-expose-event" when="LAST">
@@ -24036,7 +24095,10 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="allocation" type="GtkAllocation*"/>
+					<parameter name="orientation" type="GtkOrientation"/>
+					<parameter name="natural_size" type="gint*"/>
+					<parameter name="allocated_pos" type="gint*"/>
+					<parameter name="allocated_size" type="gint*"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="adjust_size_request">
@@ -24044,11 +24106,18 @@
 				<parameters>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="orientation" type="GtkOrientation"/>
-					<parameter name="for_size" type="gint"/>
 					<parameter name="minimum_size" type="gint*"/>
 					<parameter name="natural_size" type="gint*"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="compute_expand">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="hexpand_p" type="gboolean*"/>
+					<parameter name="vexpand_p" type="gboolean*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="dispatch_child_properties_changed">
 				<return-type type="void"/>
 				<parameters>
@@ -24103,12 +24172,6 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</vfunc>
-			<vfunc name="hide_all">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-				</parameters>
-			</vfunc>
 			<vfunc name="show_all">
 				<return-type type="void"/>
 				<parameters>
@@ -24201,6 +24264,12 @@
 					<parameter name="window" type="GtkWindow*"/>
 				</parameters>
 			</method>
+			<method name="get_application" symbol="gtk_window_get_application">
+				<return-type type="GtkApplication*"/>
+				<parameters>
+					<parameter name="window" type="GtkWindow*"/>
+				</parameters>
+			</method>
 			<method name="get_decorated" symbol="gtk_window_get_decorated">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -24279,6 +24348,12 @@
 					<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>
+					<parameter name="window" type="GtkWindow*"/>
+				</parameters>
+			</method>
 			<method name="get_icon" symbol="gtk_window_get_icon">
 				<return-type type="GdkPixbuf*"/>
 				<parameters>
@@ -24335,6 +24410,13 @@
 					<parameter name="window" type="GtkWindow*"/>
 				</parameters>
 			</method>
+			<method name="get_resize_grip_area" symbol="gtk_window_get_resize_grip_area">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="window" type="GtkWindow*"/>
+					<parameter name="rect" type="GdkRectangle*"/>
+				</parameters>
+			</method>
 			<method name="get_role" symbol="gtk_window_get_role">
 				<return-type type="gchar*"/>
 				<parameters>
@@ -24515,6 +24597,20 @@
 					<parameter name="height" type="gint"/>
 				</parameters>
 			</method>
+			<method name="resize_grip_is_visible" symbol="gtk_window_resize_grip_is_visible">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="window" type="GtkWindow*"/>
+				</parameters>
+			</method>
+			<method name="resize_to_geometry" symbol="gtk_window_resize_to_geometry">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="window" type="GtkWindow*"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="height" type="gint"/>
+				</parameters>
+			</method>
 			<method name="set_accept_focus" symbol="gtk_window_set_accept_focus">
 				<return-type type="void"/>
 				<parameters>
@@ -24522,6 +24618,13 @@
 					<parameter name="setting" type="gboolean"/>
 				</parameters>
 			</method>
+			<method name="set_application" symbol="gtk_window_set_application">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="window" type="GtkWindow*"/>
+					<parameter name="application" type="GtkApplication*"/>
+				</parameters>
+			</method>
 			<method name="set_auto_startup_notification" symbol="gtk_window_set_auto_startup_notification">
 				<return-type type="void"/>
 				<parameters>
@@ -24542,6 +24645,14 @@
 					<parameter name="default_widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="set_default_geometry" symbol="gtk_window_set_default_geometry">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="window" type="GtkWindow*"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="height" type="gint"/>
+				</parameters>
+			</method>
 			<method name="set_default_icon" symbol="gtk_window_set_default_icon">
 				<return-type type="void"/>
 				<parameters>
@@ -24636,6 +24747,13 @@
 					<parameter name="setting" type="gboolean"/>
 				</parameters>
 			</method>
+			<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="value" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_icon" symbol="gtk_window_set_icon">
 				<return-type type="void"/>
 				<parameters>
@@ -24817,6 +24935,7 @@
 				</parameters>
 			</method>
 			<property name="accept-focus" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="application" type="GtkApplication*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="decorated" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="default-height" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="default-width" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -24824,6 +24943,7 @@
 			<property name="destroy-with-parent" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="focus-on-map" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gravity" type="GdkGravity" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="has-resize-grip" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="has-toplevel-focus" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="icon" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -24832,6 +24952,7 @@
 			<property name="modal" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="opacity" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="resizable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="resize-grip-visible" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="role" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="screen" type="GdkScreen*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="skip-pager-hint" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -24875,13 +24996,6 @@
 					<parameter name="focus" type="GtkWidget*"/>
 				</parameters>
 			</signal>
-			<vfunc name="move_focus">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GtkWindow*"/>
-					<parameter name="direction" type="GtkDirectionType"/>
-				</parameters>
-			</vfunc>
 		</object>
 		<object name="GtkWindowGroup" parent="GObject" type-name="GtkWindowGroup" get-type="gtk_window_group_get_type">
 			<method name="add_window" symbol="gtk_window_group_add_window">
@@ -24921,138 +25035,6 @@
 				</parameters>
 			</method>
 		</object>
-		<object name="GtkWrapBox" parent="GtkContainer" type-name="GtkWrapBox" get-type="gtk_wrap_box_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-				<interface name="GtkOrientable"/>
-			</implements>
-			<method name="get_allocation_mode" symbol="gtk_wrap_box_get_allocation_mode">
-				<return-type type="GtkWrapAllocationMode"/>
-				<parameters>
-					<parameter name="box" type="GtkWrapBox*"/>
-				</parameters>
-			</method>
-			<method name="get_horizontal_spacing" symbol="gtk_wrap_box_get_horizontal_spacing">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="box" type="GtkWrapBox*"/>
-				</parameters>
-			</method>
-			<method name="get_horizontal_spreading" symbol="gtk_wrap_box_get_horizontal_spreading">
-				<return-type type="GtkWrapBoxSpreading"/>
-				<parameters>
-					<parameter name="box" type="GtkWrapBox*"/>
-				</parameters>
-			</method>
-			<method name="get_minimum_line_children" symbol="gtk_wrap_box_get_minimum_line_children">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="box" type="GtkWrapBox*"/>
-				</parameters>
-			</method>
-			<method name="get_natural_line_children" symbol="gtk_wrap_box_get_natural_line_children">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="box" type="GtkWrapBox*"/>
-				</parameters>
-			</method>
-			<method name="get_vertical_spacing" symbol="gtk_wrap_box_get_vertical_spacing">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="box" type="GtkWrapBox*"/>
-				</parameters>
-			</method>
-			<method name="get_vertical_spreading" symbol="gtk_wrap_box_get_vertical_spreading">
-				<return-type type="GtkWrapBoxSpreading"/>
-				<parameters>
-					<parameter name="box" type="GtkWrapBox*"/>
-				</parameters>
-			</method>
-			<method name="insert_child" symbol="gtk_wrap_box_insert_child">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="box" type="GtkWrapBox*"/>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="index" type="gint"/>
-					<parameter name="packing" type="GtkWrapBoxPacking"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="gtk_wrap_box_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="mode" type="GtkWrapAllocationMode"/>
-					<parameter name="horizontal_spreading" type="GtkWrapBoxSpreading"/>
-					<parameter name="vertical_spreading" type="GtkWrapBoxSpreading"/>
-					<parameter name="horizontal_spacing" type="guint"/>
-					<parameter name="vertical_spacing" type="guint"/>
-				</parameters>
-			</constructor>
-			<method name="reorder_child" symbol="gtk_wrap_box_reorder_child">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="box" type="GtkWrapBox*"/>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="index" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_allocation_mode" symbol="gtk_wrap_box_set_allocation_mode">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="box" type="GtkWrapBox*"/>
-					<parameter name="mode" type="GtkWrapAllocationMode"/>
-				</parameters>
-			</method>
-			<method name="set_horizontal_spacing" symbol="gtk_wrap_box_set_horizontal_spacing">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="box" type="GtkWrapBox*"/>
-					<parameter name="spacing" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_horizontal_spreading" symbol="gtk_wrap_box_set_horizontal_spreading">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="box" type="GtkWrapBox*"/>
-					<parameter name="spreading" type="GtkWrapBoxSpreading"/>
-				</parameters>
-			</method>
-			<method name="set_minimum_line_children" symbol="gtk_wrap_box_set_minimum_line_children">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="box" type="GtkWrapBox*"/>
-					<parameter name="n_children" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_natural_line_children" symbol="gtk_wrap_box_set_natural_line_children">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="box" type="GtkWrapBox*"/>
-					<parameter name="n_children" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_vertical_spacing" symbol="gtk_wrap_box_set_vertical_spacing">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="box" type="GtkWrapBox*"/>
-					<parameter name="spacing" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_vertical_spreading" symbol="gtk_wrap_box_set_vertical_spreading">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="box" type="GtkWrapBox*"/>
-					<parameter name="spreading" type="GtkWrapBoxSpreading"/>
-				</parameters>
-			</method>
-			<property name="allocation-mode" type="GtkWrapAllocationMode" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="horizontal-spacing" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="horizontal-spreading" type="GtkWrapBoxSpreading" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="minimum-line-children" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="natural-line-children" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="vertical-spacing" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="vertical-spreading" type="GtkWrapBoxSpreading" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
 		<interface name="GtkActivatable" type-name="GtkActivatable" get-type="gtk_activatable_get_type">
 			<requires>
 				<interface name="GObject"/>
@@ -26471,6 +26453,39 @@
 				</parameters>
 			</vfunc>
 		</interface>
+		<interface name="GtkScrollable" type-name="GtkScrollable" get-type="gtk_scrollable_get_type">
+			<requires>
+				<interface name="GObject"/>
+			</requires>
+			<method name="get_hadjustment" symbol="gtk_scrollable_get_hadjustment">
+				<return-type type="GtkAdjustment*"/>
+				<parameters>
+					<parameter name="scrollable" type="GtkScrollable*"/>
+				</parameters>
+			</method>
+			<method name="get_vadjustment" symbol="gtk_scrollable_get_vadjustment">
+				<return-type type="GtkAdjustment*"/>
+				<parameters>
+					<parameter name="scrollable" type="GtkScrollable*"/>
+				</parameters>
+			</method>
+			<method name="set_hadjustment" symbol="gtk_scrollable_set_hadjustment">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="scrollable" type="GtkScrollable*"/>
+					<parameter name="hadjustment" type="GtkAdjustment*"/>
+				</parameters>
+			</method>
+			<method name="set_vadjustment" symbol="gtk_scrollable_set_vadjustment">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="scrollable" type="GtkScrollable*"/>
+					<parameter name="vadjustment" type="GtkAdjustment*"/>
+				</parameters>
+			</method>
+			<property name="hadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="vadjustment" type="GtkAdjustment*" readable="1" writable="1" construct="1" construct-only="0"/>
+		</interface>
 		<interface name="GtkToolShell" type-name="GtkToolShell" get-type="gtk_tool_shell_get_type">
 			<requires>
 				<interface name="GtkWidget"/>
@@ -27100,12 +27115,12 @@
 				</parameters>
 			</vfunc>
 		</interface>
-		<constant name="GTK_BINARY_AGE" type="int" value="9100"/>
+		<constant name="GTK_BINARY_AGE" type="int" value="9102"/>
 		<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="0"/>
+		<constant name="GTK_MICRO_VERSION" type="int" value="2"/>
 		<constant name="GTK_MINOR_VERSION" type="int" value="91"/>
 		<constant name="GTK_PAPER_NAME_A3" type="char*" value="iso_a3"/>
 		<constant name="GTK_PAPER_NAME_A4" type="char*" value="iso_a4"/>
@@ -27114,9 +27129,6 @@
 		<constant name="GTK_PAPER_NAME_EXECUTIVE" type="char*" value="na_executive"/>
 		<constant name="GTK_PAPER_NAME_LEGAL" type="char*" value="na_legal"/>
 		<constant name="GTK_PAPER_NAME_LETTER" type="char*" value="na_letter"/>
-		<constant name="GTK_PARAM_READABLE" type="int" value="0"/>
-		<constant name="GTK_PARAM_READWRITE" type="int" value="0"/>
-		<constant name="GTK_PARAM_WRITABLE" type="int" value="0"/>
 		<constant name="GTK_PATH_PRIO_MASK" type="int" value="15"/>
 		<constant name="GTK_PRINT_SETTINGS_COLLATE" type="char*" value="collate"/>
 		<constant name="GTK_PRINT_SETTINGS_DEFAULT_SOURCE" type="char*" value="default-source"/>
@@ -27149,7 +27161,6 @@
 		<constant name="GTK_PRINT_SETTINGS_WIN32_DRIVER_EXTRA" type="char*" value="win32-driver-extra"/>
 		<constant name="GTK_PRINT_SETTINGS_WIN32_DRIVER_VERSION" type="char*" value="win32-driver-version"/>
 		<constant name="GTK_PRIORITY_RESIZE" type="int" value="10"/>
-		<constant name="GTK_SIZE_REQUEST_CACHED_SIZES" type="int" value="3"/>
 		<constant name="GTK_STOCK_ABOUT" type="char*" value="gtk-about"/>
 		<constant name="GTK_STOCK_ADD" type="char*" value="gtk-add"/>
 		<constant name="GTK_STOCK_APPLY" type="char*" value="gtk-apply"/>
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index 0652cb0..f9ade2a 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -48,9 +48,7 @@ gtk_alignment_get_padding.padding_bottom is_out="1"
 gtk_alignment_get_padding.padding_left is_out="1"
 gtk_alignment_get_padding.padding_right is_out="1"
 GtkAllocation is_value_type="1"
-gtk_application_new.argc hidden="1"
-gtk_application_new.argv is_array="1" is_ref="1" array_length_pos="1.9" nullable="1" default_value="null"
-GtkApplication::quit has_emitter="1"
+gtk_application_get_windows type_arguments="unowned Window"
 GtkArg.d hidden="1"
 GtkAssistant.apply hidden="1"
 GtkAssistant.cancel hidden="1"



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