]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
clutter-1.0: use the specialized Cogl.Handle classes for the Clutter.Texture Cogl...
authorAli Sabil <ali.sabil@gmail.com>
Sat, 14 Nov 2009 19:03:18 +0000 (20:03 +0100)
committerAli Sabil <ali.sabil@gmail.com>
Sat, 14 Nov 2009 19:05:43 +0000 (20:05 +0100)
vapi/clutter-1.0.vapi
vapi/packages/clutter-1.0/clutter-1.0-custom.vala
vapi/packages/clutter-1.0/clutter-1.0.metadata

index a3b9cda377063c388601eaf5319652c6a5c4d780..a33e7810719e132d8eea5bdf815058137c315ace 100644 (file)
@@ -892,8 +892,8 @@ namespace Clutter {
                public bool set_from_rgb_data (uchar[] data, bool has_alpha, int width, int height, int rowstride, int bpp, Clutter.TextureFlags flags) throws GLib.Error;
                public bool set_from_yuv_data (uchar[] data, int width, int height, Clutter.TextureFlags flags) throws GLib.Error;
                public void set_repeat (bool repeat_x, bool repeat_y);
-               public Cogl.Handle cogl_material { get; set; }
-               public Cogl.Handle cogl_texture { get; set; }
+               public Cogl.Material cogl_material { get; set; }
+               public Cogl.Texture cogl_texture { get; set; }
                [NoAccessorMethod]
                public bool disable_slicing { get; construct; }
                [NoAccessorMethod]
index 5c533702da270756d12186c4ca1b1280d78efdd7..c3cfb8ef246ebdbbd42c7773796e303a3c4b0222 100644 (file)
@@ -92,6 +92,8 @@ namespace Clutter {
        public class Texture {
                [CCode (type = "ClutterActor*", has_construct_function = false)]
                public Texture.from_file (string filename) throws TextureError;
+               public Cogl.Material cogl_material { get; set; }
+               public Cogl.Texture cogl_texture { get; set; }
        }
 
        [CCode (cheader_filename = "clutter/clutter.h")]
index a1f04986114d76ede8361ea3023db92f5edac0a4..5f8bc4c0999b06f666193d8db580b65d88657bda 100644 (file)
@@ -364,6 +364,8 @@ clutter_text_set_text hidden="1"
 clutter_text_set_use_markup hidden="1"
 
 ClutterTextureError errordomain="1"
+ClutterTexture:cogl-texture hidden="1"
+ClutterTexture:cogl-material hidden="1"
 clutter_texture_new_from_file hidden="1"
 clutter_texture_get_base_size.* is_out="1"
 clutter_texture_get_cogl_* hidden="1"