[vala] gdk-2.0: Update to 2.21.7 and mark deprecated symbols as such.

From: Evan Nemerson <evann src gnome org>
To: commits-list gnome org
Cc:
Subject: [vala] gdk-2.0: Update to 2.21.7 and mark deprecated symbols as such.
Date: Sat, 21 Aug 2010 18:56:52 +0000 (UTC)
commit 759fb929ba042632ae0bd7dcacab474c70630308
Author: Evan Nemerson <evan coeus-group com>
Date:   Sat Aug 21 11:54:28 2010 -0700

    gdk-2.0: Update to 2.21.7 and mark deprecated symbols as such.

 vapi/gdk-2.0.vapi                         |   48 +++
 vapi/packages/gdk-2.0/gdk-2.0-custom.vala |   17 +
 vapi/packages/gdk-2.0/gdk-2.0.defines     |    2 -
 vapi/packages/gdk-2.0/gdk-2.0.gi          |  627 +++++++++++++++++++++++++----
 vapi/packages/gdk-2.0/gdk-2.0.metadata    |   82 ++++-
 5 files changed, 693 insertions(+), 83 deletions(-)
---
diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi
index 567520a..ffb715e 100644
--- a/vapi/gdk-2.0.vapi
+++ b/vapi/gdk-2.0.vapi
@@ -192,6 +192,7 @@ namespace Gdk {
 	public class Drawable : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected Drawable ();
+		[Deprecated (since = "2.22")]
 		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);
@@ -298,6 +299,7 @@ namespace Gdk {
 		public int id ();
 		public static unowned Gdk.Font load_for_display (Gdk.Display display, string font_name);
 	}
+	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class GC : GLib.Object {
 		public int clip_x_origin;
@@ -334,6 +336,7 @@ namespace Gdk {
 		[CCode (has_construct_function = false)]
 		public GC.with_values (Gdk.Drawable drawable, Gdk.GCValues values, Gdk.GCValuesMask values_mask);
 	}
+	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Image : GLib.Object {
 		public uint16 bits_per_pixel;
@@ -410,10 +413,15 @@ namespace Gdk {
 	public class Pixmap : Gdk.Drawable {
 		[CCode (has_construct_function = false)]
 		public Pixmap (Gdk.Drawable? drawable, int width, int height, int depth);
+		[Deprecated (since = "2.22")]
 		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);
+		[Deprecated (since = "2.22")]
 		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);
+		[Deprecated (since = "2.22")]
 		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);
+		[Deprecated (since = "2.22")]
 		public static unowned Gdk.Pixmap create_from_xpm (Gdk.Drawable drawable, out unowned Gdk.Bitmap mask, Gdk.Color transparent_color, string filename);
+		[Deprecated (since = "2.22")]
 		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);
@@ -586,7 +594,9 @@ namespace Gdk {
 		public void fullscreen ();
 		public void geometry_changed ();
 		public bool get_accept_focus ();
+		[Deprecated (since = "2.22")]
 		public void get_back_pixmap (out unowned Gdk.Pixmap pixmap, bool parent_relative);
+		[Deprecated (since = "2.22")]
 		public void get_background (Gdk.Color color);
 		public GLib.List<weak Gdk.Window> get_children ();
 		public bool get_composited ();
@@ -1010,14 +1020,17 @@ namespace Gdk {
 		public bool intersect (Gdk.Rectangle src2, Gdk.Rectangle dest);
 		public void union (Gdk.Rectangle src2, out Gdk.Rectangle dest);
 	}
+	[Deprecated (since = "2.22")]
 	[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;
+		[Deprecated (since = "2.22")]
 		[CCode (cname = "gdk_rgb_cmap_new", has_construct_function = false)]
 		public RgbCmap (uint32[] colors);
+		[Deprecated (since = "2.22")]
 		public void free ();
 	}
 	[CCode (type_id = "GDK_TYPE_SEGMENT", cheader_filename = "gdk/gdk.h")]
@@ -1616,6 +1629,7 @@ namespace Gdk {
 	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);
+	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public delegate void SpanFunc (Gdk.Span span);
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1680,56 +1694,82 @@ namespace Gdk {
 	public static bool drag_motion (Gdk.DragContext context, Gdk.Window dest_window, Gdk.DragProtocol protocol, int x_root, int y_root, Gdk.DragAction suggested_action, Gdk.DragAction possible_actions, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void drag_status (Gdk.DragContext context, Gdk.DragAction action, uint32 time_);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_layout (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.Layout layout);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[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_);
+	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_lines (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Point[] points);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_point (Gdk.Drawable drawable, Gdk.GC gc, int x, int y);
+	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_points (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Point[] points);
+	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_polygon (Gdk.Drawable drawable, Gdk.GC gc, bool filled, Gdk.Point[] points);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_segments (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Segment[] segs);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[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);
+	[Deprecated (since = "2.22")]
 	[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")]
@@ -1838,20 +1878,28 @@ 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);
+	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool rgb_colormap_ditherable (Gdk.Colormap cmap);
+	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool rgb_ditherable ();
+	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void rgb_find_color (Gdk.Colormap colormap, ref Gdk.Color color);
+	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static unowned Gdk.Colormap rgb_get_colormap ();
+	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static unowned Gdk.Visual rgb_get_visual ();
+	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void rgb_set_install (bool install);
+	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void rgb_set_min_colors (int min_colors);
+	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void rgb_set_verbose (bool verbose);
 	[CCode (cheader_filename = "gdk/gdk.h")]
diff --git a/vapi/packages/gdk-2.0/gdk-2.0-custom.vala b/vapi/packages/gdk-2.0/gdk-2.0-custom.vala
index a55ba7f..cab710a 100644
--- a/vapi/packages/gdk-2.0/gdk-2.0-custom.vala
+++ b/vapi/packages/gdk-2.0/gdk-2.0-custom.vala
@@ -66,4 +66,21 @@ namespace Gdk {
 		[CCode (cname = "gdk_draw_trapezoids")]
 		public virtual void draw_trapezoids (Gdk.GC gc, Gdk.Trapezoid[] trapezoids);
 	}
+
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static void selection_convert (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, uint32 time_);
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static unowned Gdk.Window selection_owner_get (Gdk.Atom selection);
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static unowned Gdk.Window selection_owner_get_for_display (Gdk.Display display, Gdk.Atom selection);
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static bool selection_owner_set (Gdk.Window owner, Gdk.Atom selection, uint32 time_, bool send_event);
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static bool selection_owner_set_for_display (Gdk.Display display, Gdk.Window owner, Gdk.Atom selection, uint32 time_, bool send_event);
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static int selection_property_get (Gdk.Window requestor, uchar[] data, out Gdk.Atom prop_type, int prop_format);
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static void selection_send_notify (Gdk.NativeWindow requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static void selection_send_notify_for_display (Gdk.Display display, Gdk.NativeWindow requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
 }
diff --git a/vapi/packages/gdk-2.0/gdk-2.0.defines b/vapi/packages/gdk-2.0/gdk-2.0.defines
index 5fc4dd7..10102d5 100644
--- a/vapi/packages/gdk-2.0/gdk-2.0.defines
+++ b/vapi/packages/gdk-2.0/gdk-2.0.defines
@@ -1,3 +1 @@
 -DGDK_COMPILATION
--DGDK_DISABLE_DEPRECATED
-
diff --git a/vapi/packages/gdk-2.0/gdk-2.0.gi b/vapi/packages/gdk-2.0/gdk-2.0.gi
index 34fd946..8a4f252 100644
--- a/vapi/packages/gdk-2.0/gdk-2.0.gi
+++ b/vapi/packages/gdk-2.0/gdk-2.0.gi
@@ -70,6 +70,34 @@
 				<parameter name="pixmap_y" type="double"/>
 			</parameters>
 		</function>
+		<function name="char_height" symbol="gdk_char_height">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="font" type="GdkFont*"/>
+				<parameter name="character" type="gchar"/>
+			</parameters>
+		</function>
+		<function name="char_measure" symbol="gdk_char_measure">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="font" type="GdkFont*"/>
+				<parameter name="character" type="gchar"/>
+			</parameters>
+		</function>
+		<function name="char_width" symbol="gdk_char_width">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="font" type="GdkFont*"/>
+				<parameter name="character" type="gchar"/>
+			</parameters>
+		</function>
+		<function name="char_width_wc" symbol="gdk_char_width_wc">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="font" type="GdkFont*"/>
+				<parameter name="character" type="GdkWChar"/>
+			</parameters>
+		</function>
 		<function name="colors_alloc" symbol="gdk_colors_alloc">
 			<return-type type="gint"/>
 			<parameters>
@@ -90,6 +118,14 @@
 				<parameter name="planes" type="gulong"/>
 			</parameters>
 		</function>
+		<function name="colors_store" symbol="gdk_colors_store">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="colormap" type="GdkColormap*"/>
+				<parameter name="colors" type="GdkColor*"/>
+				<parameter name="ncolors" type="gint"/>
+			</parameters>
+		</function>
 		<function name="devices_list" symbol="gdk_devices_list">
 			<return-type type="GList*"/>
 		</function>
@@ -469,6 +505,17 @@
 				<parameter name="n_segs" type="gint"/>
 			</parameters>
 		</function>
+		<function name="draw_string" symbol="gdk_draw_string">
+			<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="string" type="gchar*"/>
+			</parameters>
+		</function>
 		<function name="draw_text" symbol="gdk_draw_text">
 			<return-type type="void"/>
 			<parameters>
@@ -527,9 +574,21 @@
 		<function name="events_pending" symbol="gdk_events_pending">
 			<return-type type="gboolean"/>
 		</function>
+		<function name="exit" symbol="gdk_exit">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="error_code" type="gint"/>
+			</parameters>
+		</function>
 		<function name="flush" symbol="gdk_flush">
 			<return-type type="void"/>
 		</function>
+		<function name="fontset_load" symbol="gdk_fontset_load">
+			<return-type type="GdkFont*"/>
+			<parameters>
+				<parameter name="fontset_name" type="gchar*"/>
+			</parameters>
+		</function>
 		<function name="fontset_load_for_display" symbol="gdk_fontset_load_for_display">
 			<return-type type="GdkFont*"/>
 			<parameters>
@@ -564,6 +623,9 @@
 		<function name="get_show_events" symbol="gdk_get_show_events">
 			<return-type type="gboolean"/>
 		</function>
+		<function name="get_use_xshm" symbol="gdk_get_use_xshm">
+			<return-type type="gboolean"/>
+		</function>
 		<function name="init" symbol="gdk_init">
 			<return-type type="void"/>
 			<parameters>
@@ -578,6 +640,31 @@
 				<parameter name="argv" type="gchar***"/>
 			</parameters>
 		</function>
+		<function name="input_add" symbol="gdk_input_add">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="source" type="gint"/>
+				<parameter name="condition" type="GdkInputCondition"/>
+				<parameter name="function" type="GdkInputFunction"/>
+				<parameter name="data" type="gpointer"/>
+			</parameters>
+		</function>
+		<function name="input_add_full" symbol="gdk_input_add_full">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="source" type="gint"/>
+				<parameter name="condition" type="GdkInputCondition"/>
+				<parameter name="function" type="GdkInputFunction"/>
+				<parameter name="data" type="gpointer"/>
+				<parameter name="destroy" type="GDestroyNotify"/>
+			</parameters>
+		</function>
+		<function name="input_remove" symbol="gdk_input_remove">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="tag" type="gint"/>
+			</parameters>
+		</function>
 		<function name="input_set_extension_events" symbol="gdk_input_set_extension_events">
 			<return-type type="void"/>
 			<parameters>
@@ -653,6 +740,14 @@
 		<function name="list_visuals" symbol="gdk_list_visuals">
 			<return-type type="GList*"/>
 		</function>
+		<function name="mbstowcs" symbol="gdk_mbstowcs">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="dest" type="GdkWChar*"/>
+				<parameter name="src" type="gchar*"/>
+				<parameter name="dest_max" type="gint"/>
+			</parameters>
+		</function>
 		<function name="notify_startup_complete" symbol="gdk_notify_startup_complete">
 			<return-type type="void"/>
 		</function>
@@ -690,6 +785,13 @@
 				<parameter name="screen" type="GdkScreen*"/>
 			</parameters>
 		</function>
+		<function name="pango_context_set_colormap" symbol="gdk_pango_context_set_colormap">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="context" type="PangoContext*"/>
+				<parameter name="colormap" type="GdkColormap*"/>
+			</parameters>
+		</function>
 		<function name="pango_layout_get_clip_region" symbol="gdk_pango_layout_get_clip_region">
 			<return-type type="GdkRegion*"/>
 			<parameters>
@@ -778,6 +880,41 @@
 				<parameter name="alpha_threshold" type="int"/>
 			</parameters>
 		</function>
+		<function name="pixbuf_render_to_drawable" symbol="gdk_pixbuf_render_to_drawable">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="pixbuf" type="GdkPixbuf*"/>
+				<parameter name="drawable" type="GdkDrawable*"/>
+				<parameter name="gc" type="GdkGC*"/>
+				<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="dither" type="GdkRgbDither"/>
+				<parameter name="x_dither" type="int"/>
+				<parameter name="y_dither" type="int"/>
+			</parameters>
+		</function>
+		<function name="pixbuf_render_to_drawable_alpha" symbol="gdk_pixbuf_render_to_drawable_alpha">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="pixbuf" type="GdkPixbuf*"/>
+				<parameter name="drawable" type="GdkDrawable*"/>
+				<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_mode" type="GdkPixbufAlphaMode"/>
+				<parameter name="alpha_threshold" type="int"/>
+				<parameter name="dither" type="GdkRgbDither"/>
+				<parameter name="x_dither" type="int"/>
+				<parameter name="y_dither" type="int"/>
+			</parameters>
+		</function>
 		<function name="pointer_grab" symbol="gdk_pointer_grab">
 			<return-type type="GdkGrabStatus"/>
 			<parameters>
@@ -873,12 +1010,29 @@
 				<parameter name="color" type="GdkColor*"/>
 			</parameters>
 		</function>
+		<function name="rgb_gc_set_background" symbol="gdk_rgb_gc_set_background">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="gc" type="GdkGC*"/>
+				<parameter name="rgb" type="guint32"/>
+			</parameters>
+		</function>
+		<function name="rgb_gc_set_foreground" symbol="gdk_rgb_gc_set_foreground">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="gc" type="GdkGC*"/>
+				<parameter name="rgb" type="guint32"/>
+			</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_init" symbol="gdk_rgb_init">
+			<return-type type="void"/>
+		</function>
 		<function name="rgb_set_install" symbol="gdk_rgb_set_install">
 			<return-type type="void"/>
 			<parameters>
@@ -897,75 +1051,10 @@
 				<parameter name="verbose" type="gboolean"/>
 			</parameters>
 		</function>
-		<function name="selection_convert" symbol="gdk_selection_convert">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="requestor" type="GdkWindow*"/>
-				<parameter name="selection" type="GdkAtom"/>
-				<parameter name="target" type="GdkAtom"/>
-				<parameter name="time_" type="guint32"/>
-			</parameters>
-		</function>
-		<function name="selection_owner_get" symbol="gdk_selection_owner_get">
-			<return-type type="GdkWindow*"/>
-			<parameters>
-				<parameter name="selection" type="GdkAtom"/>
-			</parameters>
-		</function>
-		<function name="selection_owner_get_for_display" symbol="gdk_selection_owner_get_for_display">
-			<return-type type="GdkWindow*"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="selection" type="GdkAtom"/>
-			</parameters>
-		</function>
-		<function name="selection_owner_set" symbol="gdk_selection_owner_set">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="owner" type="GdkWindow*"/>
-				<parameter name="selection" type="GdkAtom"/>
-				<parameter name="time_" type="guint32"/>
-				<parameter name="send_event" type="gboolean"/>
-			</parameters>
-		</function>
-		<function name="selection_owner_set_for_display" symbol="gdk_selection_owner_set_for_display">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="owner" type="GdkWindow*"/>
-				<parameter name="selection" type="GdkAtom"/>
-				<parameter name="time_" type="guint32"/>
-				<parameter name="send_event" type="gboolean"/>
-			</parameters>
-		</function>
-		<function name="selection_property_get" symbol="gdk_selection_property_get">
-			<return-type type="gint"/>
-			<parameters>
-				<parameter name="requestor" type="GdkWindow*"/>
-				<parameter name="data" type="guchar**"/>
-				<parameter name="prop_type" type="GdkAtom*"/>
-				<parameter name="prop_format" type="gint*"/>
-			</parameters>
-		</function>
-		<function name="selection_send_notify" symbol="gdk_selection_send_notify">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="requestor" type="GdkNativeWindow"/>
-				<parameter name="selection" type="GdkAtom"/>
-				<parameter name="target" type="GdkAtom"/>
-				<parameter name="property" type="GdkAtom"/>
-				<parameter name="time_" type="guint32"/>
-			</parameters>
-		</function>
-		<function name="selection_send_notify_for_display" symbol="gdk_selection_send_notify_for_display">
-			<return-type type="void"/>
+		<function name="rgb_xpixel_from_rgb" symbol="gdk_rgb_xpixel_from_rgb">
+			<return-type type="gulong"/>
 			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="requestor" type="GdkNativeWindow"/>
-				<parameter name="selection" type="GdkAtom"/>
-				<parameter name="target" type="GdkAtom"/>
-				<parameter name="property" type="GdkAtom"/>
-				<parameter name="time_" type="guint32"/>
+				<parameter name="rgb" type="guint32"/>
 			</parameters>
 		</function>
 		<function name="set_double_click_time" symbol="gdk_set_double_click_time">
@@ -1001,6 +1090,12 @@
 				<parameter name="sm_client_id" type="gchar*"/>
 			</parameters>
 		</function>
+		<function name="set_use_xshm" symbol="gdk_set_use_xshm">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="use_xshm" type="gboolean"/>
+			</parameters>
+		</function>
 		<function name="setting_get" symbol="gdk_setting_get">
 			<return-type type="gboolean"/>
 			<parameters>
@@ -1047,6 +1142,32 @@
 				<parameter name="error" type="GError**"/>
 			</parameters>
 		</function>
+		<function name="string_extents" symbol="gdk_string_extents">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="font" type="GdkFont*"/>
+				<parameter name="string" type="gchar*"/>
+				<parameter name="lbearing" type="gint*"/>
+				<parameter name="rbearing" type="gint*"/>
+				<parameter name="width" type="gint*"/>
+				<parameter name="ascent" type="gint*"/>
+				<parameter name="descent" type="gint*"/>
+			</parameters>
+		</function>
+		<function name="string_height" symbol="gdk_string_height">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="font" type="GdkFont*"/>
+				<parameter name="string" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="string_measure" symbol="gdk_string_measure">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="font" type="GdkFont*"/>
+				<parameter name="string" type="gchar*"/>
+			</parameters>
+		</function>
 		<function name="string_to_compound_text" symbol="gdk_string_to_compound_text">
 			<return-type type="gint"/>
 			<parameters>
@@ -1068,6 +1189,13 @@
 				<parameter name="length" type="gint*"/>
 			</parameters>
 		</function>
+		<function name="string_width" symbol="gdk_string_width">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="font" type="GdkFont*"/>
+				<parameter name="string" type="gchar*"/>
+			</parameters>
+		</function>
 		<function name="test_render_sync" symbol="gdk_test_render_sync">
 			<return-type type="void"/>
 			<parameters>
@@ -1096,6 +1224,48 @@
 				<parameter name="key_pressrelease" type="GdkEventType"/>
 			</parameters>
 		</function>
+		<function name="text_extents" symbol="gdk_text_extents">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="font" type="GdkFont*"/>
+				<parameter name="text" type="gchar*"/>
+				<parameter name="text_length" type="gint"/>
+				<parameter name="lbearing" type="gint*"/>
+				<parameter name="rbearing" type="gint*"/>
+				<parameter name="width" type="gint*"/>
+				<parameter name="ascent" type="gint*"/>
+				<parameter name="descent" type="gint*"/>
+			</parameters>
+		</function>
+		<function name="text_extents_wc" symbol="gdk_text_extents_wc">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="font" type="GdkFont*"/>
+				<parameter name="text" type="GdkWChar*"/>
+				<parameter name="text_length" type="gint"/>
+				<parameter name="lbearing" type="gint*"/>
+				<parameter name="rbearing" type="gint*"/>
+				<parameter name="width" type="gint*"/>
+				<parameter name="ascent" type="gint*"/>
+				<parameter name="descent" type="gint*"/>
+			</parameters>
+		</function>
+		<function name="text_height" symbol="gdk_text_height">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="font" type="GdkFont*"/>
+				<parameter name="text" type="gchar*"/>
+				<parameter name="text_length" type="gint"/>
+			</parameters>
+		</function>
+		<function name="text_measure" symbol="gdk_text_measure">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="font" type="GdkFont*"/>
+				<parameter name="text" type="gchar*"/>
+				<parameter name="text_length" type="gint"/>
+			</parameters>
+		</function>
 		<function name="text_property_to_text_list" symbol="gdk_text_property_to_text_list">
 			<return-type type="gint"/>
 			<parameters>
@@ -1138,6 +1308,22 @@
 				<parameter name="list" type="gchar***"/>
 			</parameters>
 		</function>
+		<function name="text_width" symbol="gdk_text_width">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="font" type="GdkFont*"/>
+				<parameter name="text" type="gchar*"/>
+				<parameter name="text_length" type="gint"/>
+			</parameters>
+		</function>
+		<function name="text_width_wc" symbol="gdk_text_width_wc">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="font" type="GdkFont*"/>
+				<parameter name="text" type="GdkWChar*"/>
+				<parameter name="text_length" type="gint"/>
+			</parameters>
+		</function>
 		<function name="threads_add_idle" symbol="gdk_threads_add_idle">
 			<return-type type="guint"/>
 			<parameters>
@@ -1239,6 +1425,18 @@
 				<parameter name="str" type="gchar*"/>
 			</parameters>
 		</function>
+		<function name="wcstombs" symbol="gdk_wcstombs">
+			<return-type type="gchar*"/>
+			<parameters>
+				<parameter name="src" type="GdkWChar*"/>
+			</parameters>
+		</function>
+		<callback name="GdkDestroyNotify">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="data" type="gpointer"/>
+			</parameters>
+		</callback>
 		<callback name="GdkEventFunc">
 			<return-type type="void"/>
 			<parameters>
@@ -1777,11 +1975,88 @@
 			<field name="x2" type="gint"/>
 			<field name="y2" type="gint"/>
 		</struct>
+		<struct name="GdkSelection">
+			<method name="convert" symbol="gdk_selection_convert">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="requestor" type="GdkWindow*"/>
+					<parameter name="selection" type="GdkAtom"/>
+					<parameter name="target" type="GdkAtom"/>
+					<parameter name="time_" type="guint32"/>
+				</parameters>
+			</method>
+			<method name="owner_get" symbol="gdk_selection_owner_get">
+				<return-type type="GdkWindow*"/>
+				<parameters>
+					<parameter name="selection" type="GdkAtom"/>
+				</parameters>
+			</method>
+			<method name="owner_get_for_display" symbol="gdk_selection_owner_get_for_display">
+				<return-type type="GdkWindow*"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="selection" type="GdkAtom"/>
+				</parameters>
+			</method>
+			<method name="owner_set" symbol="gdk_selection_owner_set">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="owner" type="GdkWindow*"/>
+					<parameter name="selection" type="GdkAtom"/>
+					<parameter name="time_" type="guint32"/>
+					<parameter name="send_event" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="owner_set_for_display" symbol="gdk_selection_owner_set_for_display">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="owner" type="GdkWindow*"/>
+					<parameter name="selection" type="GdkAtom"/>
+					<parameter name="time_" type="guint32"/>
+					<parameter name="send_event" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="property_get" symbol="gdk_selection_property_get">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="requestor" type="GdkWindow*"/>
+					<parameter name="data" type="guchar**"/>
+					<parameter name="prop_type" type="GdkAtom*"/>
+					<parameter name="prop_format" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="send_notify" symbol="gdk_selection_send_notify">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="requestor" type="GdkNativeWindow"/>
+					<parameter name="selection" type="GdkAtom"/>
+					<parameter name="target" type="GdkAtom"/>
+					<parameter name="property" type="GdkAtom"/>
+					<parameter name="time_" type="guint32"/>
+				</parameters>
+			</method>
+			<method name="send_notify_for_display" symbol="gdk_selection_send_notify_for_display">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="requestor" type="GdkNativeWindow"/>
+					<parameter name="selection" type="GdkAtom"/>
+					<parameter name="target" type="GdkAtom"/>
+					<parameter name="property" type="GdkAtom"/>
+					<parameter name="time_" type="guint32"/>
+				</parameters>
+			</method>
+		</struct>
+		<struct name="GdkSelectionType">
+		</struct>
 		<struct name="GdkSpan">
 			<field name="x" type="gint"/>
 			<field name="y" type="gint"/>
 			<field name="width" type="gint"/>
 		</struct>
+		<struct name="GdkTarget">
+		</struct>
 		<struct name="GdkTimeCoord">
 			<field name="time" type="guint32"/>
 			<field name="axes" type="gdouble[]"/>
@@ -1838,6 +2113,27 @@
 		<struct name="GdkXEvent">
 		</struct>
 		<boxed name="GdkColor" type-name="GdkColor" get-type="gdk_color_get_type">
+			<method name="alloc" symbol="gdk_color_alloc">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="colormap" type="GdkColormap*"/>
+					<parameter name="color" type="GdkColor*"/>
+				</parameters>
+			</method>
+			<method name="black" symbol="gdk_color_black">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="colormap" type="GdkColormap*"/>
+					<parameter name="color" type="GdkColor*"/>
+				</parameters>
+			</method>
+			<method name="change" symbol="gdk_color_change">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="colormap" type="GdkColormap*"/>
+					<parameter name="color" type="GdkColor*"/>
+				</parameters>
+			</method>
 			<method name="copy" symbol="gdk_color_copy">
 				<return-type type="GdkColor*"/>
 				<parameters>
@@ -1876,12 +2172,25 @@
 					<parameter name="color" type="GdkColor*"/>
 				</parameters>
 			</method>
+			<method name="white" symbol="gdk_color_white">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="colormap" type="GdkColormap*"/>
+					<parameter name="color" type="GdkColor*"/>
+				</parameters>
+			</method>
 			<field name="pixel" type="guint32"/>
 			<field name="red" type="guint16"/>
 			<field name="green" type="guint16"/>
 			<field name="blue" type="guint16"/>
 		</boxed>
 		<boxed name="GdkCursor" type-name="GdkCursor" get-type="gdk_cursor_get_type">
+			<method name="get_cursor_type" symbol="gdk_cursor_get_cursor_type">
+				<return-type type="GdkCursorType"/>
+				<parameters>
+					<parameter name="cursor" type="GdkCursor*"/>
+				</parameters>
+			</method>
 			<method name="get_display" symbol="gdk_cursor_get_display">
 				<return-type type="GdkDisplay*"/>
 				<parameters>
@@ -1981,6 +2290,12 @@
 					<parameter name="y_win" type="gdouble*"/>
 				</parameters>
 			</method>
+			<method name="get_graphics_expose" symbol="gdk_event_get_graphics_expose">
+				<return-type type="GdkEvent*"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
 			<method name="get_root_coords" symbol="gdk_event_get_root_coords">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -2095,6 +2410,12 @@
 					<parameter name="fontb" type="GdkFont*"/>
 				</parameters>
 			</method>
+			<method name="from_description" symbol="gdk_font_from_description">
+				<return-type type="GdkFont*"/>
+				<parameters>
+					<parameter name="font_desc" type="PangoFontDescription*"/>
+				</parameters>
+			</method>
 			<method name="from_description_for_display" symbol="gdk_font_from_description_for_display">
 				<return-type type="GdkFont*"/>
 				<parameters>
@@ -2102,12 +2423,24 @@
 					<parameter name="font_desc" type="PangoFontDescription*"/>
 				</parameters>
 			</method>
+			<method name="get_display" symbol="gdk_font_get_display">
+				<return-type type="GdkDisplay*"/>
+				<parameters>
+					<parameter name="font" type="GdkFont*"/>
+				</parameters>
+			</method>
 			<method name="id" symbol="gdk_font_id">
 				<return-type type="gint"/>
 				<parameters>
 					<parameter name="font" type="GdkFont*"/>
 				</parameters>
 			</method>
+			<method name="load" symbol="gdk_font_load">
+				<return-type type="GdkFont*"/>
+				<parameters>
+					<parameter name="font_name" type="gchar*"/>
+				</parameters>
+			</method>
 			<method name="load_for_display" symbol="gdk_font_load_for_display">
 				<return-type type="GdkFont*"/>
 				<parameters>
@@ -2723,6 +3056,9 @@
 			<method name="get_system" symbol="gdk_colormap_get_system">
 				<return-type type="GdkColormap*"/>
 			</method>
+			<method name="get_system_size" symbol="gdk_colormap_get_system_size">
+				<return-type type="gint"/>
+			</method>
 			<method name="get_visual" symbol="gdk_colormap_get_visual">
 				<return-type type="GdkVisual*"/>
 				<parameters>
@@ -2744,6 +3080,18 @@
 					<parameter name="result" type="GdkColor*"/>
 				</parameters>
 			</method>
+			<method name="ref" symbol="gdk_colormap_ref">
+				<return-type type="GdkColormap*"/>
+				<parameters>
+					<parameter name="cmap" type="GdkColormap*"/>
+				</parameters>
+			</method>
+			<method name="unref" symbol="gdk_colormap_unref">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cmap" type="GdkColormap*"/>
+				</parameters>
+			</method>
 			<field name="size" type="gint"/>
 			<field name="colors" type="GdkColor*"/>
 			<field name="visual" type="GdkVisual*"/>
@@ -2808,6 +3156,12 @@
 					<parameter name="device" type="GdkDevice*"/>
 				</parameters>
 			</method>
+			<method name="get_n_axes" symbol="gdk_device_get_n_axes">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="device" type="GdkDevice*"/>
+				</parameters>
+			</method>
 			<method name="get_name" symbol="gdk_device_get_name">
 				<return-type type="gchar*"/>
 				<parameters>
@@ -2975,6 +3329,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>
@@ -3234,6 +3594,18 @@
 			<constructor name="new" symbol="gdk_drag_context_new">
 				<return-type type="GdkDragContext*"/>
 			</constructor>
+			<method name="ref" symbol="gdk_drag_context_ref">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GdkDragContext*"/>
+				</parameters>
+			</method>
+			<method name="unref" symbol="gdk_drag_context_unref">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GdkDragContext*"/>
+				</parameters>
+			</method>
 			<field name="protocol" type="GdkDragProtocol"/>
 			<field name="is_source" type="gboolean"/>
 			<field name="source_window" type="GdkWindow*"/>
@@ -3271,6 +3643,13 @@
 					<parameter name="drawable" type="GdkDrawable*"/>
 				</parameters>
 			</method>
+			<method name="get_data" symbol="gdk_drawable_get_data">
+				<return-type type="gpointer"/>
+				<parameters>
+					<parameter name="drawable" type="GdkDrawable*"/>
+					<parameter name="key" type="gchar*"/>
+				</parameters>
+			</method>
 			<method name="get_depth" symbol="gdk_drawable_get_depth">
 				<return-type type="gint"/>
 				<parameters>
@@ -3319,6 +3698,12 @@
 					<parameter name="drawable" type="GdkDrawable*"/>
 				</parameters>
 			</method>
+			<method name="ref" symbol="gdk_drawable_ref">
+				<return-type type="GdkDrawable*"/>
+				<parameters>
+					<parameter name="drawable" type="GdkDrawable*"/>
+				</parameters>
+			</method>
 			<method name="set_colormap" symbol="gdk_drawable_set_colormap">
 				<return-type type="void"/>
 				<parameters>
@@ -3326,6 +3711,21 @@
 					<parameter name="colormap" type="GdkColormap*"/>
 				</parameters>
 			</method>
+			<method name="set_data" symbol="gdk_drawable_set_data">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="drawable" type="GdkDrawable*"/>
+					<parameter name="key" type="gchar*"/>
+					<parameter name="data" type="gpointer"/>
+					<parameter name="destroy_func" type="GDestroyNotify"/>
+				</parameters>
+			</method>
+			<method name="unref" symbol="gdk_drawable_unref">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="drawable" type="GdkDrawable*"/>
+				</parameters>
+			</method>
 			<vfunc name="create_cairo_surface">
 				<return-type type="cairo_surface_t*"/>
 				<parameters>
@@ -3663,6 +4063,12 @@
 					<parameter name="y_offset" type="gint"/>
 				</parameters>
 			</method>
+			<method name="ref" symbol="gdk_gc_ref">
+				<return-type type="GdkGC*"/>
+				<parameters>
+					<parameter name="gc" type="GdkGC*"/>
+				</parameters>
+			</method>
 			<method name="set_background" symbol="gdk_gc_set_background">
 				<return-type type="void"/>
 				<parameters>
@@ -3729,6 +4135,13 @@
 					<parameter name="fill" type="GdkFill"/>
 				</parameters>
 			</method>
+			<method name="set_font" symbol="gdk_gc_set_font">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="gc" type="GdkGC*"/>
+					<parameter name="font" type="GdkFont*"/>
+				</parameters>
+			</method>
 			<method name="set_foreground" symbol="gdk_gc_set_foreground">
 				<return-type type="void"/>
 				<parameters>
@@ -3804,6 +4217,12 @@
 					<parameter name="values_mask" type="GdkGCValuesMask"/>
 				</parameters>
 			</method>
+			<method name="unref" symbol="gdk_gc_unref">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="gc" type="GdkGC*"/>
+				</parameters>
+			</method>
 			<vfunc name="get_values">
 				<return-type type="void"/>
 				<parameters>
@@ -3835,6 +4254,16 @@
 			<field name="colormap" type="GdkColormap*"/>
 		</object>
 		<object name="GdkImage" parent="GObject" type-name="GdkImage" get-type="gdk_image_get_type">
+			<method name="get" symbol="gdk_image_get">
+				<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_bits_per_pixel" symbol="gdk_image_get_bits_per_pixel">
 				<return-type type="guint16"/>
 				<parameters>
@@ -3891,6 +4320,12 @@
 					<parameter name="y" type="gint"/>
 				</parameters>
 			</method>
+			<method name="get_pixels" symbol="gdk_image_get_pixels">
+				<return-type type="gpointer"/>
+				<parameters>
+					<parameter name="image" type="GdkImage*"/>
+				</parameters>
+			</method>
 			<method name="get_visual" symbol="gdk_image_get_visual">
 				<return-type type="GdkVisual*"/>
 				<parameters>
@@ -3921,6 +4356,12 @@
 					<parameter name="pixel" type="guint32"/>
 				</parameters>
 			</method>
+			<method name="ref" symbol="gdk_image_ref">
+				<return-type type="GdkImage*"/>
+				<parameters>
+					<parameter name="image" type="GdkImage*"/>
+				</parameters>
+			</method>
 			<method name="set_colormap" symbol="gdk_image_set_colormap">
 				<return-type type="void"/>
 				<parameters>
@@ -3928,6 +4369,12 @@
 					<parameter name="colormap" type="GdkColormap*"/>
 				</parameters>
 			</method>
+			<method name="unref" symbol="gdk_image_unref">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="image" type="GdkImage*"/>
+				</parameters>
+			</method>
 			<field name="type" type="GdkImageType"/>
 			<field name="visual" type="GdkVisual*"/>
 			<field name="byte_order" type="GdkByteOrder"/>
@@ -4681,6 +5128,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>
@@ -4767,19 +5223,10 @@
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
-			<method name="get_back_pixmap" symbol="gdk_window_get_back_pixmap">
-				<return-type type="void"/>
-				<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"/>
+			<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="color" type="GdkColor*"/>
 				</parameters>
 			</method>
 			<method name="get_children" symbol="gdk_window_get_children">
@@ -4939,6 +5386,9 @@
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
+			<method name="get_toplevels" symbol="gdk_window_get_toplevels">
+				<return-type type="GList*"/>
+			</method>
 			<method name="get_type_hint" symbol="gdk_window_get_type_hint">
 				<return-type type="GdkWindowTypeHint"/>
 				<parameters>
@@ -4964,6 +5414,12 @@
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
+			<method name="has_native" symbol="gdk_window_has_native">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
 			<method name="hide" symbol="gdk_window_hide">
 				<return-type type="void"/>
 				<parameters>
@@ -5293,6 +5749,19 @@
 					<parameter name="leader" type="GdkWindow*"/>
 				</parameters>
 			</method>
+			<method name="set_hints" symbol="gdk_window_set_hints">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="x" type="gint"/>
+					<parameter name="y" type="gint"/>
+					<parameter name="min_width" type="gint"/>
+					<parameter name="min_height" type="gint"/>
+					<parameter name="max_width" type="gint"/>
+					<parameter name="max_height" type="gint"/>
+					<parameter name="flags" type="gint"/>
+				</parameters>
+			</method>
 			<method name="set_icon" symbol="gdk_window_set_icon">
 				<return-type type="void"/>
 				<parameters>
diff --git a/vapi/packages/gdk-2.0/gdk-2.0.metadata b/vapi/packages/gdk-2.0/gdk-2.0.metadata
index f8f0ee6..2a80a57 100644
--- a/vapi/packages/gdk-2.0/gdk-2.0.metadata
+++ b/vapi/packages/gdk-2.0/gdk-2.0.metadata
@@ -2,7 +2,6 @@ Gdk cheader_filename="gdk/gdk.h" gir_namespace="Gdk" gir_version="2.0"
 gdk_add_client_message_filter.data hidden="1"
 GdkAppLaunchContextClass hidden="1"
 GdkAtom is_value_type="1" simple_type="1"
-gdk_bitmap_create_from_data transfer_ownership="1"
 gdk_cairo_create transfer_ownership="1"
 GdkColor is_value_type="1"
 gdk_color_parse.color is_out="1"
@@ -96,7 +95,6 @@ gdk_region_get_rectangles.rectangles is_array="1" is_out="1" transfer_ownership=
 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"
 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"
@@ -130,6 +128,7 @@ gdk_window_at_pointer.win_x is_out="1"
 gdk_window_at_pointer.win_y is_out="1"
 gdk_window_constrain_size.new_width is_out="1"
 gdk_window_constrain_size.new_height is_out="1"
+gdk_window_create_similar_surface transfer_ownership="1"
 gdk_window_get_decorations.decorations is_out="1"
 gdk_window_get_deskrelative_origin.x is_out="1"
 gdk_window_get_deskrelative_origin.y is_out="1"
@@ -169,3 +168,82 @@ GdkXEvent is_value_type="1"
 
 gdk_devices_list type_arguments="Device"
 gdk_list_visuals type_arguments="unowned Visual" transfer_ownership="1"
+
+# Deprecated before vapi was created
+gdk_*_ref hidden="1"
+gdk_*_unref hidden="1"
+gdk_colormap_get_system_size hidden="1"
+gdk_drawable_get_data hidden="1"
+gdk_drawable_set_data hidden="1"
+gdk_event_get_graphics_expose hidden="1"
+gdk_font_from_description hidden="1"
+gdk_font_get_display hidden="1"
+gdk_font_load hidden="1"
+gdk_gc_set_font hidden="1"
+gdk_image_get hidden="1"
+GdkGC.parent_instance hidden="1"
+GdkGCClass hidden="1"
+GdkSelection hidden="1"
+GdkSelectionType hidden="1"
+GdkTarget hidden="1"
+gdk_window_get_toplevels hidden="1"
+gdk_window_set_hints hidden="1"
+gdk_color_alloc hidden="1"
+gdk_color_black hidden="1"
+gdk_color_change hidden="1"
+gdk_color_white hidden="1"
+GdkDestroyNotify hidden="1"
+gdk_char_height hidden="1"
+gdk_char_measure hidden="1"
+gdk_char_width hidden="1"
+gdk_char_width_wc hidden="1"
+gdk_colors_store hidden="1"
+gdk_draw_string hidden="1"
+gdk_exit hidden="1"
+gdk_fontset_load hidden="1"
+gdk_get_use_xshm hidden="1"
+gdk_image_get_pixels hidden="1"
+gdk_input_add hidden="1"
+gdk_input_add_full hidden="1"
+gdk_input_remove hidden="1"
+gdk_mbstowcs hidden="1"
+gdk_Pango.Context pango_context_get_for_screen hidden="1"
+gdk_pango_context_set_colormap hidden="1"
+gdk_Gdk.Region pango_layout_get_clip_region hidden="1"
+gdk_Gdk.Region pango_layout_line_get_clip_region hidden="1"
+gdk_pixbuf_render_to_drawable hidden="1"
+gdk_pixbuf_render_to_drawable_alpha hidden="1"
+gdk_rgb_gc_set_background hidden="1"
+gdk_rgb_gc_set_foreground hidden="1"
+gdk_rgb_init hidden="1"
+gdk_rgb_xpixel_from_rgb hidden="1"
+gdk_set_use_xshm hidden="1"
+gdk_string_extents hidden="1"
+gdk_string_height hidden="1"
+gdk_string_measure hidden="1"
+gdk_string_width hidden="1"
+gdk_text_extents hidden="1"
+gdk_text_extents_wc hidden="1"
+gdk_text_height hidden="1"
+gdk_text_measure hidden="1"
+gdk_text_width hidden="1"
+gdk_text_width_wc hidden="1"
+gdk_wcstombs hidden="1"
+
+# Deprecated since 2.22
+gdk_bitmap_create_from_data transfer_ownership="1" deprecated_since="2.22"
+gdk_drawable_copy_to_image deprecated="1" deprecated_since="2.22"
+GdkGC deprecated="1" deprecated_since="2.22"
+GdkImage deprecated="1" deprecated_since="2.22"
+gdk_pixmap_colormap_create_from_xpm* deprecated="1" deprecated_since="2.22"
+gdk_pixmap_create_from_* deprecated="1" deprecated_since="2.22"
+gdk_screen_polygon deprecated="1" deprecated_since="2.22"
+gdk_screen_rect_equal deprecated="1" deprecated_since="2.22"
+gdk_screen_shrink deprecated="1" deprecated_since="2.22"
+gdk_screen_spans_intersect_foreach deprecated="1" deprecated_since="2.22"
+gdk_window_get_back_pixmap deprecated="1" deprecated_since="2.22"
+gdk_window_get_background deprecated="1" deprecated_since="2.22"
+GdkRgbCmap is_value_type="1" deprecated="1" deprecated_since="2.22"
+GdkSpanFunc deprecated="1" deprecated_since="2.22"
+gdk_draw_* deprecated="1" deprecated_since="2.22"
+gdk_rgb_* deprecated="1" deprecated_since="2.22"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]