gdk-2.0: Fix gdk_window_new binding

diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi
index 9f5904915f2239ff0a69f6e5fad51c2a3cdce313..edb9c6f651daa2ff63804ab0e19db60446ee0479 100644 (file)
--- a/vapi/gdk-2.0.vapi
+++ b/vapi/gdk-2.0.vapi
@@ -24,6 +24,8 @@ namespace Gdk {
                public int size;
                public weak Gdk.Visual visual;
                public void* windowing_data;
+               [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 change (int ncolors);
@@ -31,8 +33,6 @@ namespace Gdk {
                public unowned Gdk.Screen get_screen ();
                public static unowned Gdk.Colormap get_system ();
                public unowned Gdk.Visual get_visual ();
-               [CCode (has_construct_function = false)]
-               public Colormap (Gdk.Visual visual, bool allocate);
                public void query_color (ulong pixel, out Gdk.Color _result);
        }
        [Compact]
@@ -41,6 +41,8 @@ namespace Gdk {
                public uint ref_count;
                public Gdk.CursorType type;
                [CCode (has_construct_function = false)]
+               public Cursor (Gdk.CursorType cursor_type);
+               [CCode (has_construct_function = false)]
                public Cursor.for_display (Gdk.Display display, Gdk.CursorType cursor_type);
                [CCode (has_construct_function = false)]
                public Cursor.from_name (Gdk.Display display, string name);
@@ -50,8 +52,6 @@ namespace Gdk {
                public Cursor.from_pixmap (Gdk.Pixmap source, Gdk.Pixmap mask, Gdk.Color fg, Gdk.Color bg, int x, int y);
                public unowned Gdk.Display get_display ();
                public unowned Gdk.Pixbuf get_image ();
-               [CCode (has_construct_function = false)]
-               public Cursor (Gdk.CursorType cursor_type);
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Device : GLib.Object {
@@ -238,6 +238,8 @@ namespace Gdk {
                public Gdk.EventType type;
                public Gdk.EventVisibility visibility;
                public Gdk.EventWindowState window_state;
+               [CCode (has_construct_function = false)]
+               public Event (Gdk.EventType type);
                public Gdk.Event copy ();
                public static unowned Gdk.Event @get ();
                public bool get_axis (Gdk.AxisUse axis_use, out double value);
@@ -248,8 +250,6 @@ namespace Gdk {
                public bool get_state (out Gdk.ModifierType state);
                public uint32 get_time ();
                public static void handler_set (owned Gdk.EventFunc func);
-               [CCode (has_construct_function = false)]
-               public Event (Gdk.EventType type);
                public static unowned Gdk.Event peek ();
                public void put ();
                public static void request_motions (Gdk.EventMotion event);
@@ -276,12 +276,12 @@ namespace Gdk {
                public weak Gdk.Colormap colormap;
                public int ts_x_origin;
                public int ts_y_origin;
+               [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 (Gdk.GCValues values);
-               [CCode (has_construct_function = false)]
-               public GC (Gdk.Drawable drawable);
                public void offset (int x_offset, int y_offset);
                public void set_background (Gdk.Color color);
                public void set_clip_mask (Gdk.Bitmap mask);
@@ -319,10 +319,10 @@ namespace Gdk {
                public weak Gdk.Visual visual;
                public int width;
                public void* windowing_data;
-               public unowned Gdk.Colormap get_colormap ();
-               public uint32 get_pixel (int x, int y);
                [CCode (has_construct_function = false)]
                public Image (Gdk.ImageType type, Gdk.Visual visual, int width, int height);
+               public unowned Gdk.Colormap get_colormap ();
+               public uint32 get_pixel (int x, int y);
                public void put_pixel (int x, int y, uint32 pixel);
                public void set_colormap (Gdk.Colormap colormap);
        }
@@ -344,9 +344,9 @@ namespace Gdk {
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class PangoRenderer : Pango.Renderer {
-               public static unowned Pango.Renderer get_default (Gdk.Screen screen);
                [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);
@@ -356,6 +356,8 @@ namespace Gdk {
        }
        [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);
@@ -366,8 +368,6 @@ namespace Gdk {
                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);
-               [CCode (has_construct_function = false)]
-               public Pixmap (Gdk.Drawable? drawable, int width, int height, int depth);
        }
        [Compact]
        [CCode (cheader_filename = "gdk/gdk.h")]
@@ -378,14 +378,14 @@ namespace Gdk {
        [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 (Gdk.Rectangle[] rectangles);
                public void intersect (Gdk.Region source2);
-               [CCode (has_construct_function = false)]
-               public Region ();
                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);
@@ -477,6 +477,8 @@ namespace Gdk {
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public class Window : Gdk.Drawable {
+               [CCode (has_construct_function = false)]
+               public Window (Gdk.Window? parent, Gdk.WindowAttr attributes, int attributes_mask);
                public void add_filter (Gdk.FilterFunc function);
                public static unowned Gdk.Window at_pointer (out int win_x, out int win_y);
                public void beep ();
@@ -536,8 +538,6 @@ namespace Gdk {
                public void move (int x, int y);
                public void move_region (Gdk.Region region, int dx, int dy);
                public void move_resize (int x, int y, int width, int height);
-               [CCode (has_construct_function = false)]
-               public Window (Gdk.Window parent, Gdk.WindowAttr attributes, int attributes_mask);
                public unowned GLib.List peek_children ();
                public static void process_all_updates ();
                public void process_updates (bool update_children);
@@ -912,9 +912,9 @@ namespace Gdk {
                public weak uint32[] colors;
                public int n_colors;
                public weak GLib.SList info_list;
-               public void free ();
                [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 {

diff --git a/vapi/packages/gdk-2.0/gdk-2.0.metadata b/vapi/packages/gdk-2.0/gdk-2.0.metadata
index aae1f0cccf4e9a90a6e95fc6eca9e0c3ccc6349d..7156c480f914cac7d796183cc4acea7001ea6920 100644 (file)
--- a/vapi/packages/gdk-2.0/gdk-2.0.metadata
+++ b/vapi/packages/gdk-2.0/gdk-2.0.metadata
@@ -135,4 +135,5 @@ gdk_window_get_position.y is_out="1"
 gdk_window_get_root_origin.x is_out="1"
 gdk_window_get_root_origin.y is_out="1"
 gdk_window_invalidate_rect.rect nullable="1"
+gdk_window_new.parent nullable="1"
 GdkXEvent is_value_type="1"