From: Rico Tzschichholz Date: Thu, 21 Aug 2014 12:02:47 +0000 (+0200) Subject: gtk+-2.0, gtk+-3.0: port more annotations from the GIR version X-Git-Tag: 0.25.2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bd895631cc2204126612a410904209b832c73fe;p=thirdparty%2Fvala.git gtk+-2.0, gtk+-3.0: port more annotations from the GIR version --- diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index 2b72beaec..9725868be 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -7550,9 +7550,9 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public delegate void ClipboardURIReceivedFunc (Gtk.Clipboard clipboard, [CCode (array_length = false, array_null_terminated = true)] string[] uris); [CCode (cheader_filename = "gtk/gtk.h", has_target = false)] - public delegate void ColorSelectionChangePaletteFunc (Gdk.Color colors, int n_colors); + public delegate void ColorSelectionChangePaletteFunc (Gdk.Color[] colors); [CCode (cheader_filename = "gtk/gtk.h", has_target = false)] - public delegate void ColorSelectionChangePaletteWithScreenFunc (Gdk.Screen screen, Gdk.Color colors, int n_colors); + public delegate void ColorSelectionChangePaletteWithScreenFunc (Gdk.Screen screen, Gdk.Color[] colors); [CCode (cheader_filename = "gtk/gtk.h")] public delegate bool EntryCompletionMatchFunc (Gtk.EntryCompletion completion, string key, Gtk.TreeIter iter); [CCode (cheader_filename = "gtk/gtk.h")] @@ -7561,8 +7561,8 @@ namespace Gtk { public delegate bool Function (); [CCode (cheader_filename = "gtk/gtk.h")] public delegate void IconViewForeachFunc (Gtk.IconView icon_view, Gtk.TreePath path); - [CCode (cheader_filename = "gtk/gtk.h", has_target = false)] - public delegate int KeySnoopFunc (Gtk.Widget grab_widget, Gdk.EventKey event, void* func_data); + [CCode (cheader_filename = "gtk/gtk.h", instance_pos = 2.9)] + public delegate int KeySnoopFunc (Gtk.Widget grab_widget, Gdk.EventKey event); [CCode (cheader_filename = "gtk/gtk.h")] public delegate void LinkButtonUriFunc (Gtk.LinkButton button, string link_); [CCode (cheader_filename = "gtk/gtk.h", has_target = false)] @@ -7572,7 +7572,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h", has_target = false)] public delegate void ModuleDisplayInitFunc (Gdk.Display display); [CCode (cheader_filename = "gtk/gtk.h", has_target = false)] - public delegate void ModuleInitFunc (int argc, string argv); + public delegate void ModuleInitFunc (string[]? argv); [CCode (cheader_filename = "gtk/gtk.h")] public delegate unowned Gtk.Notebook NotebookWindowCreationFunc (Gtk.Notebook source, Gtk.Widget page, int x, int y); [CCode (cheader_filename = "gtk/gtk.h")] @@ -7596,7 +7596,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public delegate void TextTagTableForeach (Gtk.TextTag tag); [CCode (cheader_filename = "gtk/gtk.h")] - public delegate unowned string TranslateFunc (string path); + public delegate string TranslateFunc (string path); [CCode (cheader_filename = "gtk/gtk.h")] public delegate void TreeCellDataFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter); [CCode (cheader_filename = "gtk/gtk.h")] @@ -7604,7 +7604,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public delegate int TreeIterCompareFunc (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b); [CCode (cheader_filename = "gtk/gtk.h")] - public delegate void TreeModelFilterModifyFunc (Gtk.TreeModel model, Gtk.TreeIter iter, GLib.Value value, int column); + public delegate void TreeModelFilterModifyFunc (Gtk.TreeModel model, Gtk.TreeIter iter, out GLib.Value value, int column); [CCode (cheader_filename = "gtk/gtk.h")] public delegate bool TreeModelFilterVisibleFunc (Gtk.TreeModel model, Gtk.TreeIter iter); [CCode (cheader_filename = "gtk/gtk.h")] @@ -8059,9 +8059,9 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static uint accelerator_get_default_mod_mask (); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string accelerator_get_label (uint accelerator_key, Gdk.ModifierType accelerator_mods); + public static string accelerator_get_label (uint accelerator_key, Gdk.ModifierType accelerator_mods); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string accelerator_name (uint accelerator_key, Gdk.ModifierType accelerator_mods); + public static string accelerator_name (uint accelerator_key, Gdk.ModifierType accelerator_mods); [CCode (cheader_filename = "gtk/gtk.h")] public static void accelerator_parse (string accelerator, out uint accelerator_key, out Gdk.ModifierType accelerator_mods); [CCode (cheader_filename = "gtk/gtk.h")] @@ -8163,7 +8163,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static uint32 get_current_event_time (); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned Pango.Language get_default_language (); + public static Pango.Language get_default_language (); [CCode (cheader_filename = "gtk/gtk.h")] public static unowned Gtk.Widget get_event_widget (Gdk.Event event); [CCode (cheader_filename = "gtk/gtk.h")] @@ -8197,7 +8197,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static bool 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 = "gtk/gtk.h")] - public static uint key_snooper_install (Gtk.KeySnoopFunc snooper, void* func_data); + public static uint key_snooper_install (Gtk.KeySnoopFunc snooper); [CCode (cheader_filename = "gtk/gtk.h")] public static void key_snooper_remove (uint snooper_handler_id); [CCode (cheader_filename = "gtk/gtk.h")] @@ -8255,7 +8255,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static void paint_vline (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int y1_, int y2_, int x); [CCode (cheader_filename = "gtk/gtk.h")] - public static bool parse_args (int argc, string[] argv); + public static bool parse_args ([CCode (array_length_pos = 0.5)] ref unowned string[] argv); [CCode (cheader_filename = "gtk/gtk.h")] public static GLib.Quark print_error_quark (); [CCode (cheader_filename = "gtk/gtk.h")] @@ -8275,33 +8275,33 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static void rc_add_default_file (string filename); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string rc_find_module_in_path (string module_file); - [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string rc_find_pixmap_in_path (Gtk.Settings settings, GLib.Scanner scanner, string pixmap_file); + public static string rc_find_module_in_path (string module_file); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string rc_get_default_files (); + public static string rc_find_pixmap_in_path (Gtk.Settings settings, GLib.Scanner scanner, string pixmap_file); + [CCode (array_length = false, array_null_terminated = true, cheader_filename = "gtk/gtk.h")] + public static unowned string[] rc_get_default_files (); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string rc_get_im_module_file (); + public static string rc_get_im_module_file (); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string rc_get_im_module_path (); + public static string rc_get_im_module_path (); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string rc_get_module_dir (); + public static string rc_get_module_dir (); [CCode (cheader_filename = "gtk/gtk.h")] public static unowned Gtk.Style rc_get_style (Gtk.Widget widget); [CCode (cheader_filename = "gtk/gtk.h")] public static unowned Gtk.Style? rc_get_style_by_paths (Gtk.Settings settings, string? widget_path, string? class_path, GLib.Type type); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string rc_get_theme_dir (); + public static string rc_get_theme_dir (); [CCode (cheader_filename = "gtk/gtk.h")] public static void rc_parse (string filename); [CCode (cheader_filename = "gtk/gtk.h")] - public static uint rc_parse_color (GLib.Scanner scanner, Gdk.Color color); + public static uint rc_parse_color (GLib.Scanner scanner, out Gdk.Color color); [CCode (cheader_filename = "gtk/gtk.h")] - public static uint rc_parse_color_full (GLib.Scanner scanner, Gtk.RcStyle style, Gdk.Color color); + public static uint rc_parse_color_full (GLib.Scanner scanner, Gtk.RcStyle style, out Gdk.Color color); [CCode (cheader_filename = "gtk/gtk.h")] public static uint rc_parse_priority (GLib.Scanner scanner, Gtk.PathPriorityType priority); [CCode (cheader_filename = "gtk/gtk.h")] - public static uint rc_parse_state (GLib.Scanner scanner, Gtk.StateType state); + public static uint rc_parse_state (GLib.Scanner scanner, out Gtk.StateType state); [CCode (cheader_filename = "gtk/gtk.h")] public static void rc_parse_string (string rc_string); [CCode (cheader_filename = "gtk/gtk.h")] @@ -8313,13 +8313,13 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static unowned GLib.Scanner rc_scanner_new (); [CCode (cheader_filename = "gtk/gtk.h")] - public static void rc_set_default_files (string filenames); + public static void rc_set_default_files ([CCode (array_length = false, array_null_terminated = true)] string[] filenames); [CCode (cheader_filename = "gtk/gtk.h")] public static void rgb_to_hsv (double r, double g, double b, out double h, out double s, out double v); [CCode (cheader_filename = "gtk/gtk.h")] public static void selection_add_target (Gtk.Widget widget, Gdk.Atom selection, Gdk.Atom target, uint info); [CCode (cheader_filename = "gtk/gtk.h")] - public static void selection_add_targets (Gtk.Widget widget, Gdk.Atom selection, Gtk.TargetEntry[] targets, uint ntargets); + public static void selection_add_targets (Gtk.Widget widget, Gdk.Atom selection, [CCode (array_length_pos = 3.1, array_length_type = "guint")] Gtk.TargetEntry[] targets); [CCode (cheader_filename = "gtk/gtk.h")] public static bool selection_clear (Gtk.Widget widget, Gdk.EventSelection event); [CCode (cheader_filename = "gtk/gtk.h")] @@ -8367,7 +8367,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static unowned Gtk.Widget test_create_widget (GLib.Type widget_type, ...); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned Gtk.Widget test_display_button_window (string window_title, string dialog_text, ...); + public static Gtk.Widget test_display_button_window (string window_title, string dialog_text, ...); [CCode (cheader_filename = "gtk/gtk.h")] public static unowned Gtk.Widget test_find_label (Gtk.Widget widget, string label_pattern); [CCode (cheader_filename = "gtk/gtk.h")] @@ -8376,8 +8376,8 @@ namespace Gtk { public static unowned Gtk.Widget test_find_widget (Gtk.Widget widget, string label_pattern, GLib.Type widget_type); [CCode (cheader_filename = "gtk/gtk.h")] public static void test_init ([CCode (array_length_pos = 0.9)] ref unowned string[] argvp, ...); - [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned GLib.Type[] test_list_all_types (uint n_types); + [CCode (array_length = false, array_length_type = "guint", array_null_terminated = true, cheader_filename = "gtk/gtk.h")] + public static unowned GLib.Type[] test_list_all_types (); [CCode (cheader_filename = "gtk/gtk.h")] public static void test_register_all_types (); [CCode (cheader_filename = "gtk/gtk.h")] @@ -8387,7 +8387,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static bool test_spin_button_click (Gtk.SpinButton spinner, uint button, bool upwards); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string test_text_get (Gtk.Widget widget); + public static string test_text_get (Gtk.Widget widget); [CCode (cheader_filename = "gtk/gtk.h")] public static void test_text_set (Gtk.Widget widget, string str); [CCode (cheader_filename = "gtk/gtk.h")] @@ -8395,7 +8395,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static bool test_widget_send_key (Gtk.Widget widget, uint keyval, Gdk.ModifierType modifiers); [CCode (cheader_filename = "gtk/gtk.h")] - public static bool tree_get_row_drag_data (Gtk.SelectionData selection_data, out unowned Gtk.TreeModel tree_model, out unowned Gtk.TreePath path); + public static bool tree_get_row_drag_data (Gtk.SelectionData selection_data, out Gtk.TreeModel tree_model, out Gtk.TreePath path); [CCode (cheader_filename = "gtk/gtk.h")] public static bool tree_set_row_drag_data (Gtk.SelectionData selection_data, Gtk.TreeModel tree_model, Gtk.TreePath path); } diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index c43e60136..41714653f 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -1490,6 +1490,7 @@ namespace Gtk { public void set_previous_color (Gdk.Color color); public void set_previous_rgba (Gdk.RGBA rgba); public uint current_alpha { get; set; } + [Deprecated (replacement = "current_rgba", since = "3.4")] public Gdk.Color current_color { get; set; } public Gdk.RGBA current_rgba { get; set; } public bool has_opacity_control { get; set; } @@ -8553,9 +8554,9 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public delegate void ClipboardURIReceivedFunc (Gtk.Clipboard clipboard, [CCode (array_length = false, array_null_terminated = true)] string[] uris); [CCode (cheader_filename = "gtk/gtk.h", has_target = false)] - public delegate void ColorSelectionChangePaletteFunc (Gdk.Color colors, int n_colors); + public delegate void ColorSelectionChangePaletteFunc (Gdk.Color[] colors); [CCode (cheader_filename = "gtk/gtk.h", has_target = false)] - public delegate void ColorSelectionChangePaletteWithScreenFunc (Gdk.Screen screen, Gdk.Color colors, int n_colors); + public delegate void ColorSelectionChangePaletteWithScreenFunc (Gdk.Screen screen, Gdk.Color[] colors); [CCode (cheader_filename = "gtk/gtk.h")] public delegate bool EntryCompletionMatchFunc (Gtk.EntryCompletion completion, string key, Gtk.TreeIter iter); [CCode (cheader_filename = "gtk/gtk.h")] @@ -8570,8 +8571,8 @@ namespace Gtk { public delegate bool FontFilterFunc (Pango.FontFamily family, Pango.FontFace face); [CCode (cheader_filename = "gtk/gtk.h")] public delegate void IconViewForeachFunc (Gtk.IconView icon_view, Gtk.TreePath path); - [CCode (cheader_filename = "gtk/gtk.h", has_target = false)] - public delegate int KeySnoopFunc (Gtk.Widget grab_widget, Gdk.EventKey event, void* func_data); + [CCode (cheader_filename = "gtk/gtk.h", instance_pos = 2.9)] + public delegate int KeySnoopFunc (Gtk.Widget grab_widget, Gdk.EventKey event); [CCode (cheader_filename = "gtk/gtk.h")] public delegate bool ListBoxFilterFunc (Gtk.ListBoxRow row); [CCode (cheader_filename = "gtk/gtk.h")] @@ -8587,7 +8588,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h", has_target = false)] public delegate void ModuleDisplayInitFunc (Gdk.Display display); [CCode (cheader_filename = "gtk/gtk.h", has_target = false)] - public delegate void ModuleInitFunc (int argc, string argv); + public delegate void ModuleInitFunc (string[]? argv); [CCode (cheader_filename = "gtk/gtk.h")] public delegate void PageSetupDoneFunc (Gtk.PageSetup page_setup); [CCode (cheader_filename = "gtk/gtk.h")] @@ -8613,7 +8614,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public delegate bool TickCallback (Gtk.Widget widget, Gdk.FrameClock frame_clock); [CCode (cheader_filename = "gtk/gtk.h")] - public delegate unowned string TranslateFunc (string path); + public delegate string TranslateFunc (string path); [CCode (cheader_filename = "gtk/gtk.h")] public delegate void TreeCellDataFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter); [CCode (cheader_filename = "gtk/gtk.h")] @@ -8621,7 +8622,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public delegate int TreeIterCompareFunc (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b); [CCode (cheader_filename = "gtk/gtk.h")] - public delegate void TreeModelFilterModifyFunc (Gtk.TreeModel model, Gtk.TreeIter iter, GLib.Value value, int column); + public delegate void TreeModelFilterModifyFunc (Gtk.TreeModel model, Gtk.TreeIter iter, out GLib.Value value, int column); [CCode (cheader_filename = "gtk/gtk.h")] public delegate bool TreeModelFilterVisibleFunc (Gtk.TreeModel model, Gtk.TreeIter iter); [CCode (cheader_filename = "gtk/gtk.h")] @@ -9260,17 +9261,17 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static Gdk.ModifierType accelerator_get_default_mod_mask (); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string accelerator_get_label (uint accelerator_key, Gdk.ModifierType accelerator_mods); + public static string accelerator_get_label (uint accelerator_key, Gdk.ModifierType accelerator_mods); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string accelerator_get_label_with_keycode (Gdk.Display display, uint accelerator_key, uint keycode, Gdk.ModifierType accelerator_mods); + public static string accelerator_get_label_with_keycode (Gdk.Display display, uint accelerator_key, uint keycode, Gdk.ModifierType accelerator_mods); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string accelerator_name (uint accelerator_key, Gdk.ModifierType accelerator_mods); + public static string accelerator_name (uint accelerator_key, Gdk.ModifierType accelerator_mods); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string accelerator_name_with_keycode (Gdk.Display display, uint accelerator_key, uint keycode, Gdk.ModifierType accelerator_mods); + public static string accelerator_name_with_keycode (Gdk.Display display, uint accelerator_key, uint keycode, Gdk.ModifierType accelerator_mods); [CCode (cheader_filename = "gtk/gtk.h")] public static void accelerator_parse (string accelerator, out uint accelerator_key, out Gdk.ModifierType accelerator_mods); [CCode (cheader_filename = "gtk/gtk.h")] - public static void accelerator_parse_with_keycode (string accelerator, uint accelerator_key, uint accelerator_codes, Gdk.ModifierType accelerator_mods); + public static void accelerator_parse_with_keycode (string accelerator, out uint accelerator_key, [CCode (array_length = false, array_null_terminated = true)] out uint[] accelerator_codes, out Gdk.ModifierType accelerator_mods); [CCode (cheader_filename = "gtk/gtk.h")] public static void accelerator_set_default_mod_mask (Gdk.ModifierType default_mod_mask); [CCode (cheader_filename = "gtk/gtk.h")] @@ -9387,7 +9388,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static uint get_debug_flags (); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned Pango.Language get_default_language (); + public static Pango.Language get_default_language (); [CCode (cheader_filename = "gtk/gtk.h")] public static unowned Gtk.Widget get_event_widget (Gdk.Event event); [CCode (cheader_filename = "gtk/gtk.h")] @@ -9428,7 +9429,7 @@ namespace Gtk { public static bool 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 = "gtk/gtk.h")] [Deprecated (since = "3.4")] - public static uint key_snooper_install (Gtk.KeySnoopFunc snooper, void* func_data); + public static uint key_snooper_install (Gtk.KeySnoopFunc snooper); [CCode (cheader_filename = "gtk/gtk.h")] [Deprecated (since = "3.4")] public static void key_snooper_remove (uint snooper_handler_id); @@ -9505,7 +9506,7 @@ namespace Gtk { [Deprecated (since = "3.0")] public static void paint_vline (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.Widget? widget, string? detail, int y1_, int y2_, int x); [CCode (cheader_filename = "gtk/gtk.h")] - public static bool parse_args (int argc, string[] argv); + public static bool parse_args ([CCode (array_length_pos = 0.5)] ref unowned string[] argv); [CCode (cheader_filename = "gtk/gtk.h")] public static GLib.Quark print_error_quark (); [CCode (cheader_filename = "gtk/gtk.h")] @@ -9517,33 +9518,33 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static void rc_add_default_file (string filename); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string rc_find_module_in_path (string module_file); - [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string rc_find_pixmap_in_path (Gtk.Settings settings, GLib.Scanner scanner, string pixmap_file); + public static string rc_find_module_in_path (string module_file); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string rc_get_default_files (); + public static string rc_find_pixmap_in_path (Gtk.Settings settings, GLib.Scanner scanner, string pixmap_file); + [CCode (array_length = false, array_null_terminated = true, cheader_filename = "gtk/gtk.h")] + public static unowned string[] rc_get_default_files (); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string rc_get_im_module_file (); + public static string rc_get_im_module_file (); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string rc_get_im_module_path (); + public static string rc_get_im_module_path (); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string rc_get_module_dir (); + public static string rc_get_module_dir (); [CCode (cheader_filename = "gtk/gtk.h")] public static unowned Gtk.Style rc_get_style (Gtk.Widget widget); [CCode (cheader_filename = "gtk/gtk.h")] public static unowned Gtk.Style? rc_get_style_by_paths (Gtk.Settings settings, string? widget_path, string? class_path, GLib.Type type); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string rc_get_theme_dir (); + public static string rc_get_theme_dir (); [CCode (cheader_filename = "gtk/gtk.h")] public static void rc_parse (string filename); [CCode (cheader_filename = "gtk/gtk.h")] - public static uint rc_parse_color (GLib.Scanner scanner, Gdk.Color color); + public static uint rc_parse_color (GLib.Scanner scanner, out Gdk.Color color); [CCode (cheader_filename = "gtk/gtk.h")] - public static uint rc_parse_color_full (GLib.Scanner scanner, Gtk.RcStyle style, Gdk.Color color); + public static uint rc_parse_color_full (GLib.Scanner scanner, Gtk.RcStyle style, out Gdk.Color color); [CCode (cheader_filename = "gtk/gtk.h")] public static uint rc_parse_priority (GLib.Scanner scanner, Gtk.PathPriorityType priority); [CCode (cheader_filename = "gtk/gtk.h")] - public static uint rc_parse_state (GLib.Scanner scanner, Gtk.StateType state); + public static uint rc_parse_state (GLib.Scanner scanner, out Gtk.StateType state); [CCode (cheader_filename = "gtk/gtk.h")] public static void rc_parse_string (string rc_string); [CCode (cheader_filename = "gtk/gtk.h")] @@ -9555,7 +9556,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static unowned GLib.Scanner rc_scanner_new (); [CCode (cheader_filename = "gtk/gtk.h")] - public static void rc_set_default_files (string filenames); + public static void rc_set_default_files ([CCode (array_length = false, array_null_terminated = true)] string[] filenames); [CCode (cheader_filename = "gtk/gtk.h")] [Deprecated (replacement = "StyleContext.render_activity", since = "vala-0.16")] public static void render_activity (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height); @@ -9613,7 +9614,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static void selection_add_target (Gtk.Widget widget, Gdk.Atom selection, Gdk.Atom target, uint info); [CCode (cheader_filename = "gtk/gtk.h")] - public static void selection_add_targets (Gtk.Widget widget, Gdk.Atom selection, Gtk.TargetEntry[] targets, uint ntargets); + public static void selection_add_targets (Gtk.Widget widget, Gdk.Atom selection, [CCode (array_length_pos = 3.1, array_length_type = "guint")] Gtk.TargetEntry[] targets); [CCode (cheader_filename = "gtk/gtk.h")] public static void selection_clear_targets (Gtk.Widget widget, Gdk.Atom selection); [CCode (cheader_filename = "gtk/gtk.h")] @@ -9659,7 +9660,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static unowned Gtk.Widget test_create_widget (GLib.Type widget_type, ...); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned Gtk.Widget test_display_button_window (string window_title, string dialog_text, ...); + public static Gtk.Widget test_display_button_window (string window_title, string dialog_text, ...); [CCode (cheader_filename = "gtk/gtk.h")] public static unowned Gtk.Widget test_find_label (Gtk.Widget widget, string label_pattern); [CCode (cheader_filename = "gtk/gtk.h")] @@ -9668,8 +9669,8 @@ namespace Gtk { public static unowned Gtk.Widget test_find_widget (Gtk.Widget widget, string label_pattern, GLib.Type widget_type); [CCode (cheader_filename = "gtk/gtk.h")] public static void test_init ([CCode (array_length_pos = 0.9)] ref unowned string[] argvp, ...); - [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned GLib.Type[] test_list_all_types (uint n_types); + [CCode (array_length = false, array_length_type = "guint", array_null_terminated = true, cheader_filename = "gtk/gtk.h")] + public static unowned GLib.Type[] test_list_all_types (); [CCode (cheader_filename = "gtk/gtk.h")] public static void test_register_all_types (); [CCode (cheader_filename = "gtk/gtk.h")] @@ -9679,7 +9680,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static bool test_spin_button_click (Gtk.SpinButton spinner, uint button, bool upwards); [CCode (cheader_filename = "gtk/gtk.h")] - public static unowned string test_text_get (Gtk.Widget widget); + public static string test_text_get (Gtk.Widget widget); [CCode (cheader_filename = "gtk/gtk.h")] public static void test_text_set (Gtk.Widget widget, string str); [CCode (cheader_filename = "gtk/gtk.h")] @@ -9689,7 +9690,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static void test_widget_wait_for_draw (Gtk.Widget widget); [CCode (cheader_filename = "gtk/gtk.h")] - public static bool tree_get_row_drag_data (Gtk.SelectionData selection_data, out unowned Gtk.TreeModel tree_model, out unowned Gtk.TreePath path); + public static bool tree_get_row_drag_data (Gtk.SelectionData selection_data, out Gtk.TreeModel tree_model, out Gtk.TreePath path); [CCode (cheader_filename = "gtk/gtk.h")] public static bool tree_set_row_drag_data (Gtk.SelectionData selection_data, Gtk.TreeModel tree_model, Gtk.TreePath path); } diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata index 8596159d7..c10f8e628 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata @@ -26,6 +26,8 @@ gtk_accel_label_get_accel.accelerator_key is_out="1" gtk_accel_label_get_accel.accelerator_mods is_out="1" gtk_accel_label_set_accel_closure.accel_closure type_name="AccelGroupActivate" transfer_ownership="1" ctype="GClosure*" gtk_accel_map_lookup_entry.key is_out="1" +gtk_accelerator_get_label transfer_ownership="1" +gtk_accelerator_name transfer_ownership="1" gtk_accelerator_parse.accelerator_key is_out="1" gtk_accelerator_parse.accelerator_mods is_out="1" gtk_action_get_proxies type_arguments="Widget" @@ -162,6 +164,10 @@ GtkClipboardRichTextReceivedFunc.text type_name="uint8" is_array="1" array_lengt GtkClipboardRichTextReceivedFunc.length hidden="1" GtkClipboardURIReceivedFunc.uris is_array="1" no_array_length"1" array_null_terminated="1" gtk_color_button_get_color.color is_out="1" +GtkColorSelectionChangePaletteFunc.colors is_array="1" array_length_cname="n_colors" array_length_pos="1.1" +GtkColorSelectionChangePaletteFunc.n_colors hidden="1" +GtkColorSelectionChangePaletteWithScreenFunc.colors is_array="1" array_length_cname="n_colors" array_length_pos="2.1" +GtkColorSelectionChangePaletteWithScreenFunc.n_colors hidden="1" gtk_color_selection_get_current_color.color is_out="1" gtk_color_selection_get_previous_color.color is_out="1" gtk_color_selection_dialog_get_color_selection type_name="Gtk.ColorSelection" @@ -272,6 +278,7 @@ gtk_hscale_new.adjustment nullable="1" GtkInfoBar::response has_emitter="1" gtk_get_current_event transfer_ownership="1" gtk_get_current_event_state.state is_out="1" +gtk_get_default_language transfer_ownership="1" gtk_get_option_group transfer_ownership="1" gtk_hscrollbar_new.adjustment nullable="1" gtk_hsv_get_*.* is_out="1" @@ -354,6 +361,9 @@ gtk_input_* parent="Input" GtkItem::deselect has_emitter="1" GtkItem::select has_emitter="1" GtkItem::toggle has_emitter="1" +gtk_key_snooper_install.func_data hidden="1" +GtkKeySnoopFunc has_target="1" instance_pos="2.9" +GtkKeySnoopFunc.func_data hidden="1" GtkLabel.text hidden="1" gtk_label_new.str nullable="1" gtk_label_get_layout_offsets.x is_out="1" @@ -429,6 +439,8 @@ gtk_message_dialog_new_with_markup ellipsis="1" printf_format="1" gtk_message_dialog_new_with_markup.parent nullable="1" gtk_message_dialog_format_secondary_markup ellipsis="1" printf_format="1" gtk_message_dialog_format_secondary_text ellipsis="1" printf_format="1" +GtkModuleInitFunc.argc hidden="1" +GtkModuleInitFunc.argv is_array="1" nullable="1" transfer_ownership="1" array_length_cname="argc" array_length_pos="0.5" gtk_mount_operation_is_showing hidden="1" gtk_mount_operation_new.parent nullable="1" GtkNotebook.focus_tab hidden="1" @@ -521,6 +533,8 @@ gtk_paint_vline.widget nullable="1" gtk_paint_vline.detail nullable="1" gtk_paper_size_copy transfer_ownership="1" gtk_paper_size_get_paper_sizes transfer_ownership="1" type_arguments="PaperSize" +gtk_parse_args.argc hidden="1" +gtk_parse_args.argv is_array="1" is_ref="1" transfer_ownership="0" array_length_cname="argc" array_length_pos="0.5" GtkPlug::embedded hidden="1" gtk_print_context_create_pango_context transfer_ownership="1" gtk_print_context_create_pango_layout transfer_ownership="1" @@ -567,6 +581,17 @@ gtk_radio_tool_button_new_from_stock.group nullable="1" type_arguments="RadioToo gtk_radio_tool_button_set_group.group type_arguments="RadioToolButton" gtk_range_get_slider_range.slider_start is_out="1" gtk_range_get_slider_range.slider_end is_out="1" +gtk_rc_find_module_in_path transfer_ownership="1" +gtk_rc_find_pixmap_in_path transfer_ownership="1" +gtk_rc_get_default_files is_array="1" no_array_length="1" array_null_terminated="1" +gtk_rc_get_im_module_file transfer_ownership="1" +gtk_rc_get_im_module_path transfer_ownership="1" +gtk_rc_get_module_dir transfer_ownership="1" +gtk_rc_get_theme_dir transfer_ownership="1" +gtk_rc_parse_color.color is_out="1" +gtk_rc_parse_color_full.color is_out="1" +gtk_rc_parse_state.state is_out="1" +gtk_rc_set_default_files.filenames is_array="1" no_array_length="1" array_null_terminated="1" gtk_recent_chooser_get_current_item transfer_ownership="1" gtk_recent_chooser_get_current_uri transfer_ownership="1" gtk_recent_chooser_get_uris is_array="1" array_length_pos="0.1" transfer_ownership="1" @@ -627,7 +652,8 @@ gtk_scrolled_window_get_policy.hscrollbar_policy is_out="1" gtk_scrolled_window_get_policy.vscrollbar_policy is_out="1" gtk_scrolled_window_new.hadjustment nullable="1" gtk_scrolled_window_new.vadjustment nullable="1" -gtk_selection_add_targets.targets is_array="1" +gtk_selection_add_targets.targets is_array="1" array_length_cname="ntargets" array_length_pos="3.1" array_length_type="guint" +gtk_selection_add_targets.ntargets hidden="1" gtk_selection_data_copy transfer_ownership="1" gtk_selection_data_get_data no_array_length="1" gtk_selection_data_get_pixbuf transfer_ownership="1" nullable="1" @@ -708,7 +734,10 @@ gtk_target_table_new_from_list.n_targets hidden="1" gtk_test_init ellipsis="1" gtk_test_init.argcp hidden="1" gtk_test_init.argvp is_array="1" is_ref="1" array_length_pos="0.9" -gtk_test_display_button_window ellipsis="1" +gtk_test_display_button_window ellipsis="1" transfer_ownership="1" +gtk_test_list_all_types array_length_pos="0.1" array_length_type="guint" array_null_terminated="1" +gtk_test_list_all_types.n_types hidden="1" +gtk_test_text_get transfer_ownership="1" gtk_text_attributes_copy transfer_ownership="1" GtkTextAppearance is_value_type="1" GtkTextAppearance.pad* hidden="1" @@ -826,8 +855,10 @@ gtk_tool_item_toolbar_reconfigured hidden="1" GtkToolItem::set_tooltip hidden="1" gtk_tool_palette_get_drag_target_group transfer_ownership="0" gtk_tool_palette_get_drag_target_item transfer_ownership="0" -GtkTranslateFunc has_target="1" +GtkTranslateFunc has_target="1" transfer_ownership="1" GtkTranslateFunc.func_data hidden="1" +gtk_tree_get_row_drag_data.path transfer_ownership="1" +gtk_tree_get_row_drag_data.tree_model transfer_ownership="1" GtkTreeIter is_value_type="1" gtk_tree_iter_copy hidden="1" gtk_tree_iter_free hidden="1" @@ -871,6 +902,7 @@ gtk_tree_model_filter_set_modify_func.destroy hidden="1" gtk_tree_model_filter_set_visible_func.func transfer_ownership="1" gtk_tree_model_filter_set_visible_func.data hidden="1" gtk_tree_model_filter_set_visible_func.destroy hidden="1" +GtkTreeModelFilterModifyFunc.value is_out="1" gtk_tree_model_sort_convert_child_iter_to_iter.sort_iter is_out="1" gtk_tree_model_sort_convert_child_path_to_path transfer_ownership="1" gtk_tree_model_sort_convert_iter_to_child_iter.child_iter is_out="1" diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata index 3ee36906c..e55f590e9 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata @@ -27,8 +27,15 @@ gtk_accel_label_get_accel.accelerator_key is_out="1" gtk_accel_label_get_accel.accelerator_mods is_out="1" gtk_accel_label_set_accel_closure.accel_closure type_name="AccelGroupActivate" transfer_ownership="1" ctype="GClosure*" gtk_accel_map_lookup_entry.key is_out="1" +gtk_accelerator_get_label transfer_ownership="1" +gtk_accelerator_get_label_with_keycode transfer_ownership="1" +gtk_accelerator_name transfer_ownership="1" +gtk_accelerator_name_with_keycode transfer_ownership="1" gtk_accelerator_parse.accelerator_key is_out="1" gtk_accelerator_parse.accelerator_mods is_out="1" +gtk_accelerator_parse_with_keycode.accelerator_key is_out="1" +gtk_accelerator_parse_with_keycode.accelerator_codes is_out="1" is_array="1" no_array_length="1" array_null_terminated="1" transfer_ownership="1" +gtk_accelerator_parse_with_keycode.accelerator_mods is_out="1" gtk_accessible_connect_widget_destroyed deprecated_since="3.4" replacement="Accessible.set_widget" gtk_action_get_proxies type_arguments="Widget" gtk_action_new.label nullable="1" @@ -250,7 +257,11 @@ gtk_color_chooser_get_rgba.color hidden="1" gtk_color_chooser_dialog_new.* nullable="1" gtk_color_chooser_add_palette.n_colors hidden="1" gtk_color_chooser_add_palette.colors is_array="1" nullable="1" array_length_pos="2.9" -GtiColorSelection:current-color deprecated_since="3.4" replacement="current_rgba" +GtkColorSelection:current-color deprecated_since="3.4" replacement="current_rgba" +GtkColorSelectionChangePaletteFunc.colors is_array="1" array_length_cname="n_colors" array_length_pos="1.1" +GtkColorSelectionChangePaletteFunc.n_colors hidden="1" +GtkColorSelectionChangePaletteWithScreenFunc.colors is_array="1" array_length_cname="n_colors" array_length_pos="2.1" +GtkColorSelectionChangePaletteWithScreenFunc.n_colors hidden="1" gtk_color_selection_get_current_color deprecated_since="3.4" replacement="get_current_rgba" gtk_color_selection_get_current_color.color is_out="1" gtk_color_selection_get_current_rgba type_name="Gdk.RGBA" @@ -415,6 +426,7 @@ gtk_header_bar_set_subtitle.subtitle nullable="1" GtkInfoBar::response has_emitter="1" gtk_get_current_event transfer_ownership="1" gtk_get_current_event_state.state is_out="1" +gtk_get_default_language transfer_ownership="1" gtk_get_option_group transfer_ownership="1" GtkGesture*Class hidden="1" GtkGesture.window nullable="1" @@ -553,6 +565,9 @@ GtkItem::deselect has_emitter="1" GtkItem::select has_emitter="1" GtkItem::toggle has_emitter="1" gtk_key_snooper_* deprecated_since="3.4" +gtk_key_snooper_install.func_data hidden="1" +GtkKeySnoopFunc has_target="1" instance_pos="2.9" +GtkKeySnoopFunc.func_data hidden="1" GtkLabel.text hidden="1" gtk_label_new.str nullable="1" gtk_label_get_layout_offsets.x is_out="1" @@ -648,6 +663,8 @@ gtk_misc_get_alignment.xalign is_out="1" gtk_misc_get_alignment.yalign is_out="1" gtk_misc_get_padding.xpad is_out="1" gtk_misc_get_padding.ypad is_out="1" +GtkModuleInitFunc.argc hidden="1" +GtkModuleInitFunc.argv is_array="1" nullable="1" transfer_ownership="1" array_length_cname="argc" array_length_pos="0.5" gtk_mount_operation_is_showing hidden="1" gtk_mount_operation_new.parent nullable="1" GtkNotebook.focus_tab hidden="1" @@ -750,6 +767,8 @@ gtk_paint_vline.widget nullable="1" gtk_paint_vline.detail nullable="1" gtk_paper_size_copy transfer_ownership="1" gtk_paper_size_get_paper_sizes transfer_ownership="1" type_arguments="PaperSize" +gtk_parse_args.argc hidden="1" +gtk_parse_args.argv is_array="1" is_ref="1" transfer_ownership="0" array_length_cname="argc" array_length_pos="0.5" gtk_places_sidebar_get_location transfer_ownership="1" gtk_places_sidebar_get_nth_bookmark transfer_ownership="1" gtk_places_sidebar_list_shortcuts transfer_ownership="1" type_arguments="GLib.File" @@ -815,6 +834,17 @@ gtk_range_get_slider_range.slider_start is_out="1" gtk_range_get_slider_range.slider_end is_out="1" gtk_range_get_range_rect type_name="Gdk.Rectangle" gtk_range_get_range_rect.range_rect hidden="1" +gtk_rc_find_module_in_path transfer_ownership="1" +gtk_rc_find_pixmap_in_path transfer_ownership="1" +gtk_rc_get_default_files is_array="1" no_array_length="1" array_null_terminated="1" +gtk_rc_get_im_module_file transfer_ownership="1" +gtk_rc_get_im_module_path transfer_ownership="1" +gtk_rc_get_module_dir transfer_ownership="1" +gtk_rc_get_theme_dir transfer_ownership="1" +gtk_rc_parse_color.color is_out="1" +gtk_rc_parse_color_full.color is_out="1" +gtk_rc_parse_state.state is_out="1" +gtk_rc_set_default_files.filenames is_array="1" no_array_length="1" array_null_terminated="1" gtk_recent_chooser_get_current_item transfer_ownership="1" gtk_recent_chooser_get_current_uri transfer_ownership="1" gtk_recent_chooser_get_uris is_array="1" array_length_pos="0.1" transfer_ownership="1" @@ -881,7 +911,8 @@ gtk_scrolled_window_get_policy.hscrollbar_policy is_out="1" gtk_scrolled_window_get_policy.vscrollbar_policy is_out="1" gtk_scrolled_window_new.hadjustment nullable="1" gtk_scrolled_window_new.vadjustment nullable="1" -gtk_selection_add_targets.targets is_array="1" +gtk_selection_add_targets.targets is_array="1" array_length_cname="ntargets" array_length_pos="3.1" array_length_type="guint" +gtk_selection_add_targets.ntargets hidden="1" gtk_selection_data_copy transfer_ownership="1" gtk_selection_data_get_data no_array_length="1" gtk_selection_data_get_data_with_length.length hidden="1" @@ -1003,7 +1034,10 @@ gtk_target_table_new_from_list.n_targets hidden="1" gtk_test_init ellipsis="1" gtk_test_init.argcp hidden="1" gtk_test_init.argvp is_array="1" is_ref="1" array_length_pos="0.9" -gtk_test_display_button_window ellipsis="1" +gtk_test_display_button_window ellipsis="1" transfer_ownership="1" +gtk_test_list_all_types array_length_pos="0.1" array_length_type="guint" array_null_terminated="1" +gtk_test_list_all_types.n_types hidden="1" +gtk_test_text_get transfer_ownership="1" gtk_text_attributes_copy transfer_ownership="1" GtkTextAppearance is_value_type="1" GtkTextAppearance.rgba weak="0" @@ -1155,8 +1189,10 @@ gtk_tool_item_toolbar_reconfigured hidden="1" GtkToolItem::set_tooltip hidden="1" gtk_tool_palette_get_drag_target_group transfer_ownership="0" gtk_tool_palette_get_drag_target_item transfer_ownership="0" -GtkTranslateFunc has_target="1" +GtkTranslateFunc has_target="1" transfer_ownership="1" GtkTranslateFunc.func_data hidden="1" +gtk_tree_get_row_drag_data.path transfer_ownership="1" +gtk_tree_get_row_drag_data.tree_model transfer_ownership="1" GtkTreeIter is_value_type="1" gtk_tree_iter_copy hidden="1" gtk_tree_iter_free hidden="1" @@ -1201,6 +1237,7 @@ gtk_tree_model_filter_set_modify_func.destroy hidden="1" gtk_tree_model_filter_set_visible_func.func transfer_ownership="1" gtk_tree_model_filter_set_visible_func.data hidden="1" gtk_tree_model_filter_set_visible_func.destroy hidden="1" +GtkTreeModelFilterModifyFunc.value is_out="1" gtk_tree_model_sort_convert_child_iter_to_iter.sort_iter is_out="1" gtk_tree_model_sort_convert_child_path_to_path transfer_ownership="1" gtk_tree_model_sort_convert_iter_to_child_iter.child_iter is_out="1"