From: Emmanuele Bassi Date: Tue, 5 Apr 2011 12:47:09 +0000 (+0100) Subject: vapi: Update clutter-gtk-1.0 bindings X-Git-Tag: 0.12.1~66 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=456236684efb694fb0892bef8287a65ba14716b6;p=thirdparty%2Fvala.git vapi: Update clutter-gtk-1.0 bindings The metadata and files of clutter-gtk-1.0 were still referencing clutter-gtk-0.10 includes and shared object. The clutter-gtk-1.0 metadata has been regenerated against the current 1.0.0 tarball. --- diff --git a/vapi/clutter-gtk-1.0.vapi b/vapi/clutter-gtk-1.0.vapi index baadc2734..16d458e91 100644 --- a/vapi/clutter-gtk-1.0.vapi +++ b/vapi/clutter-gtk-1.0.vapi @@ -2,6 +2,17 @@ [CCode (cprefix = "GtkClutter", lower_case_cprefix = "gtk_clutter_")] namespace GtkClutter { + [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] + public class Actor : Clutter.Actor, Clutter.Scriptable, Clutter.Animatable, Atk.Implementor, Clutter.Container { + [CCode (type = "ClutterActor*", has_construct_function = false)] + public Actor (); + public unowned Gtk.Widget get_contents (); + public unowned Gtk.Widget get_widget (); + [CCode (type = "ClutterActor*", has_construct_function = false)] + public Actor.with_contents (Gtk.Widget contents); + [NoAccessorMethod] + public Gtk.Widget contents { owned get; set construct; } + } [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] public class Embed : Gtk.Container, Atk.Implementor, Gtk.Buildable { [CCode (type = "GtkWidget*", has_construct_function = false)] @@ -9,66 +20,40 @@ namespace GtkClutter { public unowned Clutter.Actor get_stage (); } [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public class Viewport : Clutter.Actor, Clutter.Scriptable, Clutter.Animatable, Atk.Implementor, Clutter.Container, GtkClutter.Scrollable, GtkClutter.Zoomable { + public class Texture : Clutter.Texture, Clutter.Scriptable, Clutter.Animatable, Atk.Implementor { [CCode (type = "ClutterActor*", has_construct_function = false)] - public Viewport (Gtk.Adjustment h_adjust, Gtk.Adjustment v_adjust, Gtk.Adjustment z_adjust); - public void get_origin (float x, float y, float z); - [NoAccessorMethod] - public Clutter.Actor child { owned get; set; } - public Clutter.Vertex origin { get; } - } - [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public interface Scrollable { - public abstract void get_adjustments (out unowned Gtk.Adjustment h_adjust, out unowned Gtk.Adjustment v_adjust); - public abstract void set_adjustments (Gtk.Adjustment h_adjust, Gtk.Adjustment v_adjust); + public Texture (); + public static GLib.Quark error_quark (); + public bool set_from_icon_name (Gtk.Widget widget, string icon_name, Gtk.IconSize icon_size) throws GLib.Error; + public bool set_from_pixbuf (Gdk.Pixbuf pixbuf) throws GLib.Error; + public bool set_from_stock (Gtk.Widget widget, string stock_id, Gtk.IconSize icon_size) throws GLib.Error; } [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public interface Zoomable { - public abstract unowned Gtk.Adjustment get_adjustment (); - public abstract void set_adjustment (Gtk.Adjustment z_adjust); - } - [CCode (cprefix = "CLUTTER_INIT_ERROR_", has_type_id = false, cheader_filename = "clutter-gtk/clutter-gtk.h")] - public enum ClutterGtkInitError { - LAST, - GTK + public class Window : Gtk.Window, Atk.Implementor, Gtk.Buildable { + [CCode (type = "GtkWidget*", has_construct_function = false)] + public Window (); + public unowned Clutter.Actor get_stage (); } - [CCode (cprefix = "CLUTTER_GTK_TEXTURE_", has_type_id = false, cheader_filename = "clutter-gtk/clutter-gtk.h")] - public enum ClutterGtkTextureError { - INVALID_STOCK_ID, - ERROR_LAST + [CCode (cprefix = "GTK_CLUTTER_TEXTURE_ERROR_INVALID_STOCK_", has_type_id = false, cheader_filename = "clutter-gtk/clutter-gtk.h")] + public enum TextureError { + ID } [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public static void get_base_color (Gtk.Widget widget, Gtk.StateType state, out Clutter.Color color); - [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public static void get_bg_color (Gtk.Widget widget, Gtk.StateType state, out Clutter.Color color); + public const int CLUTTER_GTK_MAJOR_VERSION; [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public static void get_dark_color (Gtk.Widget widget, Gtk.StateType state, out Clutter.Color color); + public const int CLUTTER_GTK_MICRO_VERSION; [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public static void get_fg_color (Gtk.Widget widget, Gtk.StateType state, out Clutter.Color color); + public const int CLUTTER_GTK_MINOR_VERSION; [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public static void get_light_color (Gtk.Widget widget, Gtk.StateType state, out Clutter.Color color); + public const int CLUTTER_GTK_VERSION_HEX; [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public static void get_mid_color (Gtk.Widget widget, Gtk.StateType state, out Clutter.Color color); + public const string CLUTTER_GTK_VERSION_S; [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public static void get_text_aa_color (Gtk.Widget widget, Gtk.StateType state, out Clutter.Color color); + public static bool check_version (uint major, uint minor, uint micro); [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public static void get_text_color (Gtk.Widget widget, Gtk.StateType state, out Clutter.Color color); + public static unowned GLib.OptionGroup get_option_group (); [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] public static Clutter.InitError init ([CCode (array_length_pos = 0.9)] ref unowned string[] argv); [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] public static Clutter.InitError init_with_args ([CCode (array_length_pos = 0.9)] ref unowned string[] argv, string parameter_string, [CCode (array_length = false)] GLib.OptionEntry[] entries, string? translation_domain) throws GLib.Error; - [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public static GLib.Quark texture_error_quark (); - [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public static unowned Clutter.Actor texture_new_from_icon_name (Gtk.Widget widget, string icon_name, Gtk.IconSize size); - [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public static unowned Clutter.Actor texture_new_from_pixbuf (Gdk.Pixbuf pixbuf); - [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public static unowned Clutter.Actor texture_new_from_stock (Gtk.Widget widget, string stock_id, Gtk.IconSize size); - [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public static bool texture_set_from_icon_name (Clutter.Texture texture, Gtk.Widget widget, string icon_name, Gtk.IconSize size) throws GLib.Error; - [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public static bool texture_set_from_pixbuf (Clutter.Texture texture, Gdk.Pixbuf pixbuf) throws GLib.Error; - [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] - public static bool texture_set_from_stock (Clutter.Texture texture, Gtk.Widget widget, string stock_id, Gtk.IconSize size) throws GLib.Error; } diff --git a/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.files b/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.files index e0f5b2ceb..6573bfe35 100644 --- a/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.files +++ b/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.files @@ -1,2 +1,2 @@ -include/clutter-1.0/clutter-gtk -lib/libclutter-gtk-0.10.so +include/clutter-gtk-1.0/clutter-gtk +lib/libclutter-gtk-1.0.so diff --git a/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.gi b/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.gi index 81c548486..1106d16b7 100644 --- a/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.gi +++ b/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.gi @@ -1,69 +1,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - + + + - - - - - - - + + @@ -83,67 +30,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -159,96 +78,66 @@ - + - - - - - - - - - - - + + - + - - - - - - - - - - - + + - - - + + + + + - - + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - + + + + + - - + + + + + + + + - - + - - - - - - - - - - - - - - + + + + + + + + + diff --git a/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.metadata b/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.metadata index 2d843bc75..1e61a8d60 100644 --- a/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.metadata +++ b/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.metadata @@ -1,12 +1,4 @@ GtkClutter cheader_filename="clutter-gtk/clutter-gtk.h" -gtk_clutter_get_fg_color.color is_out="1" -gtk_clutter_get_bg_color.color is_out="1" -gtk_clutter_get_dark_color.color is_out="1" -gtk_clutter_get_base_color.color is_out="1" -gtk_clutter_get_text_color.color is_out="1" -gtk_clutter_get_text_aa_color.color is_out="1" -gtk_clutter_get_light_color.color is_out="1" -gtk_clutter_get_mid_color.color is_out="1" gtk_clutter_init.argc hidden="1" gtk_clutter_init.argv is_array="1" is_ref="1" array_length_pos="0.9" gtk_clutter_init_with_args.argc hidden="1"