From: Thijs Vermeir Date: Sun, 24 Aug 2008 19:11:06 +0000 (+0000) Subject: Add Bitmap class to prevent it from being a compact class transfer X-Git-Tag: VALA_0_4_0~101 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7eed92413a76d20fe2eac3cd40b2edf68c05476c;p=thirdparty%2Fvala.git Add Bitmap class to prevent it from being a compact class transfer * vapi/packages/gdk-2.0/gdk-2.0-custom.vala: Add Bitmap class to prevent it from being a compact class * vapi/packages/gdk-2.0/gdk-2.0.metadata: transfer ownership on gdk_bitmap_create_from_data * vapi/gdk-2.0.vapi: Regenerated svn path=/trunk/; revision=1760 --- diff --git a/ChangeLog b/ChangeLog index b6ca192bc..9a62dfad0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-08-24 Thijs Vermeir + + * vapi/packages/gdk-2.0/gdk-2.0-custom.vala: + + Add Bitmap class to prevent it from being a compact class + + * vapi/packages/gdk-2.0/gdk-2.0.metadata: + transfer ownership on gdk_bitmap_create_from_data + + * vapi/gdk-2.0.vapi: Regenerated + 2008-08-24 Thijs Vermeir * vapi/packages/gdk-2.0/gdk-2.0.metadata: diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi index 2ecb291f6..05c94b017 100644 --- a/vapi/gdk-2.0.vapi +++ b/vapi/gdk-2.0.vapi @@ -1,4 +1,4 @@ -/* gdk-2.0.vapi generated by lt-vapigen, do not modify. */ +/* gdk-2.0.vapi generated by vapigen, do not modify. */ [CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")] namespace Gdk { @@ -530,11 +530,12 @@ namespace Gdk { ABOVE, BELOW } - [Compact] - [CCode (cheader_filename = "gdk/gdk.h")] + [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 weak Gdk.Bitmap create_from_data (Gdk.Drawable drawable, string data, int width, int height); + [CCode (array_length_pos = 0, delegate_target_pos = 0)] + public Bitmap (); + public static Gdk.Bitmap create_from_data (Gdk.Drawable drawable, string data, int width, int height); } [Compact] [CCode (cheader_filename = "gdk/gdk.h")] @@ -558,6 +559,7 @@ namespace Gdk { public void get_clipbox (out Gdk.Rectangle rectangle); public void get_rectangles (Gdk.Rectangle[] rectangles); public void intersect (Gdk.Region source2); + [CCode (array_length_pos = 0, delegate_target_pos = 0)] public Region (); public void offset (int dx, int dy); public bool point_in (int x, int y); @@ -578,10 +580,15 @@ namespace Gdk { public uint ref_count; public weak Gdk.Display get_display (); public weak Gdk.Pixbuf get_image (); + [CCode (array_length_pos = 0, delegate_target_pos = 0)] public Cursor (Gdk.CursorType cursor_type); + [CCode (array_length_pos = 0, delegate_target_pos = 0)] public Cursor.for_display (Gdk.Display display, Gdk.CursorType cursor_type); + [CCode (array_length_pos = 0, delegate_target_pos = 0)] public Cursor.from_name (Gdk.Display display, string name); + [CCode (array_length_pos = 0, delegate_target_pos = 0)] public Cursor.from_pixbuf (Gdk.Display display, Gdk.Pixbuf pixbuf, int x, int y); + [CCode (array_length_pos = 0, delegate_target_pos = 0)] public Cursor.from_pixmap (Gdk.Pixmap source, Gdk.Pixmap mask, Gdk.Color fg, Gdk.Color bg, int x, int y); } [Compact] @@ -597,6 +604,7 @@ namespace Gdk { } [CCode (cheader_filename = "gdk/gdk.h")] public class AppLaunchContext : GLib.AppLaunchContext { + [CCode (array_length_pos = 0, delegate_target_pos = 0)] public AppLaunchContext (); public void set_desktop (int desktop); public void set_display (Gdk.Display display); @@ -618,6 +626,7 @@ namespace Gdk { public weak Gdk.Screen get_screen (); public static weak Gdk.Colormap get_system (); public weak Gdk.Visual get_visual (); + [CCode (array_length_pos = 0, delegate_target_pos = 0)] public Colormap (Gdk.Visual visual, bool allocate); public void query_color (ulong pixel, out Gdk.Color _result); } @@ -724,6 +733,7 @@ namespace Gdk { public Gdk.DragAction action; public uint start_time; public void* windowing_data; + [CCode (array_length_pos = 0, delegate_target_pos = 0)] public DragContext (); } [CCode (cheader_filename = "gdk/gdk.h")] @@ -784,7 +794,9 @@ namespace Gdk { public void copy (Gdk.GC src_gc); public weak Gdk.Colormap get_colormap (); public weak Gdk.Screen get_screen (); + [CCode (array_length_pos = 0, delegate_target_pos = 0)] public GC (Gdk.Drawable drawable); + [CCode (array_length_pos = 0, delegate_target_pos = 0)] public GC.with_values (Gdk.Drawable drawable, Gdk.GCValues values, Gdk.GCValuesMask values_mask); public void offset (int x_offset, int y_offset); public void set_background (Gdk.Color color); @@ -824,6 +836,7 @@ namespace Gdk { public void* windowing_data; public weak Gdk.Colormap get_colormap (); public uint get_pixel (int x, int y); + [CCode (array_length_pos = 0, delegate_target_pos = 0)] public Image (Gdk.ImageType type, Gdk.Visual visual, int width, int height); public void put_pixel (int x, int y, uint pixel); public void set_colormap (Gdk.Colormap colormap); @@ -845,7 +858,7 @@ namespace Gdk { [CCode (cheader_filename = "gdk/gdk.h")] public class PangoRenderer : Pango.Renderer { public static weak Pango.Renderer get_default (Gdk.Screen screen); - [CCode (type = "PangoRenderer*")] + [CCode (array_length_pos = 0, delegate_target_pos = 0, type = "PangoRenderer*")] public PangoRenderer (Gdk.Screen screen); public void set_drawable (Gdk.Drawable drawable); public void set_gc (Gdk.GC gc); @@ -866,6 +879,7 @@ namespace Gdk { public static weak Gdk.Pixmap foreign_new_for_screen (Gdk.Screen screen, Gdk.NativeWindow anid, int width, int height, int depth); public static weak Gdk.Pixmap lookup (Gdk.NativeWindow anid); public static weak Gdk.Pixmap lookup_for_display (Gdk.Display display, Gdk.NativeWindow anid); + [CCode (array_length_pos = 0, delegate_target_pos = 0)] public Pixmap (Gdk.Drawable drawable, int width, int height, int depth); } [CCode (cheader_filename = "gdk/gdk.h")] @@ -1007,6 +1021,7 @@ 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 (array_length_pos = 0, delegate_target_pos = 0)] public Window (Gdk.Window parent, Gdk.WindowAttr attributes, int attributes_mask); public weak GLib.List peek_children (); public static void process_all_updates (); @@ -1331,21 +1346,21 @@ namespace Gdk { public struct PangoAttrEmbossColor { public weak Pango.Attribute attr; public Pango.Color color; - [CCode (cname = "gdk_pango_attr_emboss_color_new")] + [CCode (cname = "gdk_pango_attr_emboss_color_new", array_length_pos = 0, delegate_target_pos = 0)] public PangoAttrEmbossColor (Gdk.Color color); } [CCode (cheader_filename = "gdk/gdk.h")] public struct PangoAttrEmbossed { public weak Pango.Attribute attr; public bool embossed; - [CCode (cname = "gdk_pango_attr_embossed_new")] + [CCode (cname = "gdk_pango_attr_embossed_new", array_length_pos = 0, delegate_target_pos = 0)] public PangoAttrEmbossed (bool embossed); } [CCode (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")] + [CCode (cname = "gdk_pango_attr_stipple_new", array_length_pos = 0, delegate_target_pos = 0)] public PangoAttrStipple (Gdk.Bitmap stipple); } [CCode (cheader_filename = "gdk/gdk.h")] @@ -1360,7 +1375,7 @@ namespace Gdk { public int n_colors; public weak GLib.SList info_list; public void free (); - [CCode (cname = "gdk_rgb_cmap_new")] + [CCode (cname = "gdk_rgb_cmap_new", array_length_pos = 0, delegate_target_pos = 0)] public RgbCmap (uint[] colors); } [CCode (cheader_filename = "gdk/gdk.h")] @@ -1466,7 +1481,7 @@ namespace Gdk { public bool get_state (out Gdk.ModifierType state); public uint get_time (); public static void handler_set (Gdk.EventFunc func, void* data, GLib.DestroyNotify notify); - [CCode (cname = "gdk_event_new")] + [CCode (cname = "gdk_event_new", array_length_pos = 0, delegate_target_pos = 0)] public Event (Gdk.EventType type); public static Gdk.Event peek (); public void put (); 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 fb96fddca..ea2f42040 100644 --- a/vapi/packages/gdk-2.0/gdk-2.0-custom.vala +++ b/vapi/packages/gdk-2.0/gdk-2.0-custom.vala @@ -24,4 +24,8 @@ namespace Gdk { public const Atom SELECTION_PRIMARY; public const Atom SELECTION_SECONDARY; public const Atom SELECTION_CLIPBOARD; + + [CCode (ref_function = "g_object_ref", unref_function = "g_object_unref")] + public class Bitmap { + } } diff --git a/vapi/packages/gdk-2.0/gdk-2.0.metadata b/vapi/packages/gdk-2.0/gdk-2.0.metadata index 6645aa27c..5debdb5e2 100644 --- a/vapi/packages/gdk-2.0/gdk-2.0.metadata +++ b/vapi/packages/gdk-2.0/gdk-2.0.metadata @@ -1,6 +1,7 @@ Gdk cheader_filename="gdk/gdk.h" 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"