From: Rico Tzschichholz Date: Mon, 1 Feb 2016 12:47:44 +0000 (+0100) Subject: gtk+-3.0: Further syncing with introspection annotations X-Git-Tag: 0.31.1~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4dbfb73fe5aa1643ec2bd3a312993a141b625ee;p=thirdparty%2Fvala.git gtk+-3.0: Further syncing with introspection annotations --- diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index d45669e0b..52edfd354 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -447,7 +447,7 @@ namespace Gtk { public void add_actions (Gtk.ActionEntry[] entries, void* user_data); public void add_actions_full (Gtk.ActionEntry[] entries, void* user_data, GLib.DestroyNotify? destroy); public void add_radio_actions (Gtk.RadioActionEntry[] entries, int value, [CCode (type = "GCallback")] Gtk.RadioActionCallback on_change); - public void add_radio_actions_full (Gtk.RadioActionEntry[] entries, int value, [CCode (type = "GCallback")] Gtk.RadioActionCallback on_change, GLib.DestroyNotify? destroy); + public void add_radio_actions_full (Gtk.RadioActionEntry[] entries, int value, [CCode (type = "GCallback")] owned Gtk.RadioActionCallback on_change); public void add_toggle_actions (Gtk.ToggleActionEntry[] entries, void* user_data); public void add_toggle_actions_full (Gtk.ToggleActionEntry[] entries, void* user_data, GLib.DestroyNotify? destroy); public unowned Gtk.AccelGroup get_accel_group (); @@ -984,7 +984,7 @@ namespace Gtk { public virtual bool is_activatable (); public bool is_focus_sibling (Gtk.CellRenderer renderer, Gtk.CellRenderer sibling); [CCode (cname = "gtk_cell_area_class_list_cell_properties")] - public class unowned GLib.ParamSpec list_cell_properties (uint n_properties); + public class (unowned GLib.ParamSpec)[] list_cell_properties (); public virtual void remove (Gtk.CellRenderer renderer); public void remove_focus_sibling (Gtk.CellRenderer renderer, Gtk.CellRenderer sibling); public virtual void render (Gtk.CellAreaContext context, Gtk.Widget widget, Cairo.Context cr, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags, bool paint_focus); @@ -1628,8 +1628,8 @@ namespace Gtk { public void child_set_property (Gtk.Widget child, string property_name, GLib.Value value); public void child_set_valist (Gtk.Widget child, string first_property_name, va_list var_args); public virtual GLib.Type child_type (); - public static unowned GLib.ParamSpec class_find_child_property (GLib.ObjectClass cclass, string property_name); - public static unowned GLib.ParamSpec class_list_child_properties (GLib.ObjectClass cclass, uint n_properties); + public class unowned GLib.ParamSpec class_find_child_property (string property_name); + public class (unowned GLib.ParamSpec)[] class_list_child_properties (); [NoWrapper] public virtual unowned string composite_name (Gtk.Widget child); public void forall (Gtk.Callback callback); @@ -2731,7 +2731,7 @@ namespace Gtk { public void add_resource_path (string path); public void append_search_path (string path); public Gtk.IconInfo? choose_icon ([CCode (array_length = false, array_null_terminated = true)] string[] icon_names, int size, Gtk.IconLookupFlags flags); - public Gtk.IconInfo? choose_icon_for_scale (string[] icon_names, int size, int scale, Gtk.IconLookupFlags flags); + public Gtk.IconInfo? choose_icon_for_scale ([CCode (array_length = false, array_null_terminated = true)] string[] icon_names, int size, int scale, Gtk.IconLookupFlags flags); public static GLib.Quark error_quark (); public static unowned Gtk.IconTheme get_default (); public string? get_example_icon_name (); @@ -2769,8 +2769,8 @@ namespace Gtk { public int get_column_spacing (); public int get_columns (); public bool get_cursor (out Gtk.TreePath path, out unowned Gtk.CellRenderer cell); - public bool get_dest_item_at_pos (int drag_x, int drag_y, out unowned Gtk.TreePath path, Gtk.IconViewDropPosition pos); - public void get_drag_dest_item (out unowned Gtk.TreePath path, Gtk.IconViewDropPosition pos); + public bool get_dest_item_at_pos (int drag_x, int drag_y, out unowned Gtk.TreePath path, out Gtk.IconViewDropPosition pos); + public void get_drag_dest_item (out unowned Gtk.TreePath path, out Gtk.IconViewDropPosition pos); public bool get_item_at_pos (int x, int y, out unowned Gtk.TreePath path, out unowned Gtk.CellRenderer cell); public int get_item_column (Gtk.TreePath path); public Gtk.Orientation get_item_orientation (); @@ -3237,7 +3237,7 @@ namespace Gtk { public ListStore.newv ([CCode (array_length_pos = 0.9)] GLib.Type[] types); public void prepend (out Gtk.TreeIter iter); public bool remove (Gtk.TreeIter iter); - public void reorder ([CCode (array_length = false, array_null_terminated = true)] int[] new_order); + public void reorder ([CCode (array_length = false)] int[] new_order); [CCode (sentinel = "-1")] public void @set (Gtk.TreeIter iter, ...); public void set_column_types ([CCode (array_length_pos = 0.9)] GLib.Type[] types); @@ -3289,7 +3289,7 @@ namespace Gtk { public unowned string get_title (); public void popdown (); public void popup (Gtk.Widget? parent_menu_shell, Gtk.Widget? parent_menu_item, [CCode (scope = "async")] Gtk.MenuPositionFunc? func, uint button, uint32 activate_time); - public void popup_for_device (Gdk.Device device, Gtk.Widget parent_menu_shell, Gtk.Widget parent_menu_item, Gtk.MenuPositionFunc func, void* data, GLib.DestroyNotify destroy, uint button, uint32 activate_time); + public void popup_for_device (Gdk.Device device, Gtk.Widget parent_menu_shell, Gtk.Widget parent_menu_item, owned Gtk.MenuPositionFunc func, uint button, uint32 activate_time); public void reorder_child (Gtk.Widget child, int position); public void reposition (); public void set_accel_group (Gtk.AccelGroup? accel_group); @@ -6222,13 +6222,13 @@ namespace Gtk { public TreeStore.newv ([CCode (array_length_pos = 0.9)] GLib.Type[] types); public void prepend (out Gtk.TreeIter iter, Gtk.TreeIter? parent); public bool remove (ref Gtk.TreeIter iter); - public void reorder (Gtk.TreeIter? parent, int new_order); + public void reorder (Gtk.TreeIter? parent, [CCode (array_length = false)] int[] new_order); [CCode (sentinel = "-1")] public void @set (Gtk.TreeIter iter, ...); public void set_column_types ([CCode (array_length_pos = 0.9)] GLib.Type[] types); - public void set_valist (Gtk.TreeIter iter, void* var_args); + public void set_valist (Gtk.TreeIter iter, va_list var_args); public void set_value (Gtk.TreeIter iter, int column, GLib.Value value); - public void set_valuesv (Gtk.TreeIter iter, int columns, GLib.Value[] values); + public void set_valuesv (Gtk.TreeIter iter, [CCode (array_length_pos = 3.1)] int[] columns, [CCode (array_length_pos = 3.1)] GLib.Value[] values); public void swap (Gtk.TreeIter a, Gtk.TreeIter b); } [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_tree_view_get_type ()")] @@ -6576,7 +6576,7 @@ namespace Gtk { public void destroyed (out unowned Gtk.Widget widget_pointer); public bool device_is_shadowed (Gdk.Device device); [NoWrapper] - public virtual void dispatch_child_properties_changed ([CCode (array_length_pos = 0.5)] out GLib.ParamSpec[] pspecs); + public virtual void dispatch_child_properties_changed ([CCode (array_length_pos = 0.5)] GLib.ParamSpec[] pspecs); [Version (deprecated_since = "3.0", replacement = "StyleContext")] public void ensure_style (); public void error_bell (); @@ -7545,7 +7545,7 @@ namespace Gtk { public abstract int get_n_columns (); public abstract Gtk.TreePath? get_path (Gtk.TreeIter iter); public string get_string_from_iter (Gtk.TreeIter iter); - public void get_valist (Gtk.TreeIter iter, void* var_args); + public void get_valist (Gtk.TreeIter iter, va_list var_args); public abstract void get_value (Gtk.TreeIter iter, int column, out GLib.Value value); public abstract bool iter_children (out Gtk.TreeIter iter, Gtk.TreeIter? parent); public abstract bool iter_has_child (Gtk.TreeIter iter); @@ -7566,7 +7566,7 @@ namespace Gtk { [HasEmitter] public signal void row_inserted (Gtk.TreePath path, Gtk.TreeIter iter); [HasEmitter] - public signal void rows_reordered (Gtk.TreePath path, Gtk.TreeIter? iter, void* new_order); + public signal void rows_reordered (Gtk.TreePath path, Gtk.TreeIter? iter, [CCode (array_length = false)] int[] new_order); } [CCode (cheader_filename = "gtk/gtk.h")] public interface TreeSortable : Gtk.TreeModel, GLib.Object { diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala index 630027f4a..b64fc2eb4 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala +++ b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala @@ -48,6 +48,8 @@ namespace Gtk { [CCode (vfunc_name = "forall")] [NoWrapper] public virtual void forall_internal(bool include_internal, Gtk.Callback callback); + public class unowned GLib.ParamSpec class_find_child_property (string property_name); + public class (unowned GLib.ParamSpec)[] class_list_child_properties (); } public class CssProvider { diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata index c406c6fb8..6d8dd7ccf 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata @@ -60,8 +60,8 @@ gtk_action_group_add_actions.user_data hidden="0" gtk_action_group_add_actions_full.user_data hidden="0" gtk_action_group_add_actions_full.destroy nullable="1" gtk_action_group_add_radio_actions.on_change type_name="RadioActionCallback" ctype="GCallback" -gtk_action_group_add_radio_actions_full.on_change type_name="RadioActionCallback" ctype="GCallback" -gtk_action_group_add_radio_actions_full.destroy nullable="1" +gtk_action_group_add_radio_actions_full.on_change type_name="RadioActionCallback" ctype="GCallback" transfer_ownership="1" +gtk_action_group_add_radio_actions_full.destroy hidden="1" gtk_action_group_add_toggle_actions.user_data hidden="0" gtk_action_group_add_toggle_actions_full.user_data hidden="0" gtk_action_group_add_toggle_actions_full.destroy nullable="1" @@ -173,6 +173,8 @@ gtk_calendar_set_detail_func.destroy hidden="1" GtkCalendarDetailFunc transfer_ownership="1" GtkCallbackMarshal hidden="1" GtkCell.u hidden="1" +gtk_cell_area_class_list_cell_properties is_array="1" transfer_container="1" +gtk_cell_area_class_list_cell_properties.n_properties hidden="1" GtkCellArea::apply_attributes has_emitter="1" gtk_cell_area_box_pack_start hidden="1" gtk_cell_area_box_pack_end hidden="1" @@ -329,6 +331,8 @@ gtk_container_get_focus_chain.focusable_widgets is_out="1" takes_ownership="1" t gtk_container_get_path_for_child transfer_ownership="1" gtk_container_set_focus_chain.focusable_widgets type_arguments="Widget" gtk_container_cell_accessible_get_children type_arguments="CellAccessible" +gtk_container_class_find_child_property hidden="1" +gtk_container_class_list_child_properties hidden="1" gtk_container_class_install_child_properties.n_pspecs hidden="1" gtk_container_class_install_child_properties.pspecs is_array="1" array_length_pos="0.5" gtk_css_provider_get_named.variant nullable="1" @@ -544,6 +548,8 @@ gtk_icon_info_load_symbolic_for_context_finish transfer_ownership="1" gtk_icon_info_load_symbolic_for_style transfer_ownership="1" deprecated_since="3.0" replacement="load_symbolic_for_context" gtk_icon_info_load_symbolic_for_style.was_symbolic is_out="1" default_value="null" gtk_icon_view_get_cursor.path transfer_ownership="1" +gtk_icon_view_get_dest_item_at_pos.pos is_out="1" +gtk_icon_view_get_drag_dest_item.pos is_out="1" gtk_icon_view_get_tooltip_context.iter is_out="1" gtk_icon_view_get_tooltip_context.x is_ref="1" gtk_icon_view_get_tooltip_context.y is_ref="1" @@ -583,6 +589,7 @@ gtk_icon_theme_load_surface.for_window nullable="1" gtk_icon_theme_choose_icon transfer_ownership="1" nullable="1" gtk_icon_theme_choose_icon.icon_names no_array_length="1" array_null_terminated="1" gtk_icon_theme_choose_icon_for_scale transfer_ownership="1" nullable="1" +gtk_icon_theme_choose_icon_for_scale.icon_names no_array_length="1" array_null_terminated="1" gtk_icon_theme_lookup_by_gicon transfer_ownership="1" nullable="1" gtk_icon_theme_lookup_by_gicon_for_scale transfer_ownership="1" nullable="1" gtk_icon_theme_lookup_icon transfer_ownership="1" nullable="1" @@ -704,7 +711,7 @@ gtk_list_store_move_after.position nullable="1" gtk_list_store_move_before.iter is_ref="1" gtk_list_store_move_before.position nullable="1" gtk_list_store_prepend.iter is_out="1" -gtk_list_store_reorder.new_order is_array="1" array_null_terminated="1" +gtk_list_store_reorder.new_order is_array="1" no_array_length="1" gtk_list_store_set_column_types.n_columns hidden="1" gtk_list_store_set_column_types.types array_length_pos="0.9" gtk_list_store_set ellipsis="1" sentinel="-1" @@ -727,6 +734,9 @@ gtk_menu_popup.data hidden="1" gtk_menu_popup.func nullable="1" scope="async" gtk_menu_popup.parent_menu_shell nullable="1" gtk_menu_popup.parent_menu_item nullable="1" +gtk_menu_popup_for_device.func transfer_ownership="1" +gtk_menu_popup_for_device.data hidden="1" +gtk_menu_popup_for_device.destroy hidden="1" gtk_menu_set_accel_group.accel_group nullable="1" gtk_menu_set_accel_path.accel_path nullable="1" GtkMenuPositionFunc.x is_ref="1" @@ -1389,6 +1399,7 @@ gtk_tree_model_get_iter_first.iter is_out="1" gtk_tree_model_get_iter_from_string.iter is_out="1" gtk_tree_model_get_path transfer_ownership="1" nullable="1" gtk_tree_model_get_string_from_iter transfer_ownership="1" +gtk_tree_model_get_valist.var_args type_name="va_list" gtk_tree_model_get_value.value is_out="1" gtk_tree_model_iter_children.iter is_out="1" gtk_tree_model_iter_children.parent nullable="1" @@ -1410,6 +1421,7 @@ GtkTreeModel::row_has_child_toggled has_emitter="1" GtkTreeModel::row_inserted has_emitter="1" GtkTreeModel::rows_reordered has_emitter="1" GtkTreeModel::rows_reordered.iter nullable="1" +GtkTreeModel::rows_reordered.new_order is_array="1" no_array_length="1" type_name="int[]" gtk_tree_model_filter_convert_child_path_to_path transfer_ownership="1" gtk_tree_model_filter_convert_child_iter_to_iter.filter_iter is_out="1" gtk_tree_model_filter_convert_iter_to_child_iter.child_iter is_out="1" @@ -1470,13 +1482,13 @@ gtk_tree_store_move_before.position nullable="1" gtk_tree_store_prepend.iter is_out="1" gtk_tree_store_prepend.parent nullable="1" gtk_tree_store_reorder.parent nullable="1" -gtk_list_store_reorder.new_order is_array="1" array_null_terminated="1" +gtk_tree_store_reorder.new_order is_array="1" no_array_length="1" gtk_tree_store_set ellipsis="1" sentinel="-1" gtk_tree_store_set_column_types.n_columns hidden="1" gtk_tree_store_set_column_types.types array_length_pos="0.9" -gtk_list_store_set_valist.var_args type_name="va_list" -gtk_list_store_set_valuesv.columns is_array="1" array_length_pos="3.1" array_length_cname="n_values" -gtk_list_store_set_valuesv.values is_array="1" array_length_pos="3.1" array_length_cname="n_values" +gtk_tree_store_set_valist.var_args type_name="va_list" +gtk_tree_store_set_valuesv.columns is_array="1" array_length_pos="3.1" array_length_cname="n_values" +gtk_tree_store_set_valuesv.values is_array="1" array_length_pos="3.1" array_length_cname="n_values" gtk_tree_store_remove.iter is_ref="1" gtk_tree_sortable_get_sort_column_id.sort_column_id is_out="1" gtk_tree_sortable_get_sort_column_id.order is_out="1" @@ -1621,7 +1633,7 @@ gtk_widget_create_pango_layout.text nullable="1" GtkWidget::destroy has_emitter="1" gtk_widget_destroy hidden="1" gtk_widget_dispatch_child_properties_changed.n_pspecs hidden="1" -gtk_widget_dispatch_child_properties_changed.pspecs is_array="1" array_length_pos="0.5" array_length_cname="n_pspecs" is_out="1" transfer_ownership="1" +gtk_widget_dispatch_child_properties_changed.pspecs is_array="1" array_length_pos="0.5" array_length_cname="n_pspecs" gtk_widget_ensure_style deprecated_since="3.0" replacement="StyleContext" GtkWidget::event has_emitter="1" gtk_widget_get_action_group nullable="1"