gdk-2.0: Fix virtual methods in Gdk.Drawable class

Fixes bug 591288.

diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi
index 9000b4c137ca40b3645686bb9677bc3011c008f9..9f5904915f2239ff0a69f6e5fad51c2a3cdce313 100644 (file)
--- a/vapi/gdk-2.0.vapi
+++ b/vapi/gdk-2.0.vapi
@@ -137,7 +137,7 @@ namespace Gdk {
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class DisplayManager : GLib.Object {
-               public static unowned Gdk.DisplayManager get ();
+               public static unowned Gdk.DisplayManager @get ();
                public unowned Gdk.Display get_default_display ();
                public unowned GLib.SList list_displays ();
                public void set_default_display (Gdk.Display display);
@@ -171,33 +171,33 @@ namespace Gdk {
                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 Gdk.GC create_gc (Gdk.GCValues values, Gdk.GCValuesMask mask);
-               [NoWrapper]
+               [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);
-               [NoWrapper]
+               [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);
-               [NoWrapper]
+               [CCode (cname = "gdk_draw_glyphs")]
                public virtual void draw_glyphs (Gdk.GC gc, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
-               [NoWrapper]
+               [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);
-               [NoWrapper]
+               [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);
-               [NoWrapper]
-               public virtual void draw_lines (Gdk.GC gc, Gdk.Point points, int npoints);
-               [NoWrapper]
+               [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);
-               [NoWrapper]
-               public virtual void draw_points (Gdk.GC gc, Gdk.Point points, int npoints);
-               [NoWrapper]
-               public virtual void draw_polygon (Gdk.GC gc, bool filled, Gdk.Point points, int npoints);
-               [NoWrapper]
+               [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);
-               [NoWrapper]
-               public virtual void draw_segments (Gdk.GC gc, Gdk.Segment segs, int nsegs);
-               [NoWrapper]
+               [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);
-               [NoWrapper]
+               [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);
-               [NoWrapper]
+               [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 ();
@@ -239,7 +239,7 @@ namespace Gdk {
                public Gdk.EventVisibility visibility;
                public Gdk.EventWindowState window_state;
                public Gdk.Event copy ();
-               public static unowned Gdk.Event get ();
+               public static unowned Gdk.Event @get ();
                public bool get_axis (Gdk.AxisUse axis_use, out double value);
                public bool get_coords (out double x_win, out double y_win);
                public static unowned Gdk.Event get_graphics_expose (Gdk.Window window);

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 12a64c592b903a55e3d42dc45a04f76b0b77200a..9a34e359084b3eb5b620d89a11fa9b2f1e750ffb 100644 (file)
--- a/vapi/packages/gdk-2.0/gdk-2.0-custom.vala
+++ b/vapi/packages/gdk-2.0/gdk-2.0-custom.vala
@@ -28,4 +28,35 @@ namespace Gdk {
        [CCode (ref_function = "g_object_ref", unref_function = "g_object_unref")]
        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);
+       }
 }

diff --git a/vapi/packages/gdk-2.0/gdk-2.0.metadata b/vapi/packages/gdk-2.0/gdk-2.0.metadata
index 2eec9b0882a97f6a03fef7c0dc1764c82637889d..aae1f0cccf4e9a90a6e95fc6eca9e0c3ccc6349d 100644 (file)
--- a/vapi/packages/gdk-2.0/gdk-2.0.metadata
+++ b/vapi/packages/gdk-2.0/gdk-2.0.metadata
@@ -26,7 +26,7 @@ gdk_display_get_pointer.x is_out="1"
 gdk_display_get_pointer.y is_out="1"
 gdk_display_get_pointer.mask is_out="1"
 gdk_display_peek_event transfer_ownership="1"
-gdk_drawable_draw_pixbuf.gc nullable="1"
+gdk_drawable_draw_* hidden="1"
 gdk_drawable_get_size.width is_out="1"
 gdk_drawable_get_size.height is_out="1"
 gdk_draw_rgb*_image*.buf no_array_length="1"