From 0be9770e45331c6c437cad8d112b12c714e5420b Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Sun, 22 Nov 2015 12:40:36 +0100 Subject: [PATCH] gtk+-3.0: Update to 3.19.2 --- vapi/gtk+-3.0.vapi | 70 +++++-- vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala | 2 +- vapi/packages/gtk+-3.0/gtk+-3.0.gi | 207 ++++++++++++++++++-- vapi/packages/gtk+-3.0/gtk+-3.0.metadata | 13 ++ 4 files changed, 262 insertions(+), 30 deletions(-) diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index 0fcab5b40..9b76df990 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -790,6 +790,7 @@ namespace Gtk { public void connect_signals_full (Gtk.BuilderConnectFunc func); public static GLib.Quark error_quark (); public void expose_object (string name, GLib.Object object); + public uint extend_with_template (Gtk.Widget widget, GLib.Type template_type, string buffer, size_t length) throws GLib.Error; [CCode (has_construct_function = false)] public Builder.from_file (string filename); [CCode (has_construct_function = false)] @@ -840,7 +841,6 @@ namespace Gtk { [CCode (has_construct_function = false, type = "GtkWidget*")] public Button.with_mnemonic (string label); public bool always_show_image { get; set construct; } - public bool focus_on_click { get; set; } public Gtk.Widget image { get; set; } public Gtk.PositionType image_position { get; set; } public string label { get; set construct; } @@ -1571,7 +1571,6 @@ namespace Gtk { public Gtk.CellArea cell_area { owned get; construct; } public int column_span_column { get; set; } public int entry_text_column { get; set; } - public bool focus_on_click { get; set; } public bool has_entry { get; construct; } [NoAccessorMethod] public bool has_frame { get; set; } @@ -2080,7 +2079,6 @@ namespace Gtk { [CCode (has_construct_function = false, type = "GtkWidget*")] public FileChooserButton.with_dialog (Gtk.Dialog dialog); public Gtk.FileChooser dialog { construct; } - public bool focus_on_click { get; set; } public string title { get; set; } public int width_chars { get; set; } public virtual signal void file_set (); @@ -2090,6 +2088,17 @@ namespace Gtk { [CCode (has_construct_function = false, type = "GtkWidget*")] public FileChooserDialog (string? title, Gtk.Window? parent, Gtk.FileChooserAction action, ...); } + [CCode (cheader_filename = "gtk/gtk.h")] + public class FileChooserNative : Gtk.NativeDialog, Gtk.FileChooser { + [CCode (has_construct_function = false)] + public FileChooserNative (string? title, Gtk.Window? parent, Gtk.FileChooserAction action, string? accept_label, string? cancel_label); + public unowned string? get_accept_label (); + public unowned string? get_cancel_label (); + public void set_accept_label (string? accept_label); + public void set_cancel_label (string? cancel_label); + public string? accept_label { get; set; } + public string? cancel_label { get; set; } + } [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_file_chooser_widget_get_type ()")] public class FileChooserWidget : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.FileChooser, Gtk.FileChooserEmbed { [CCode (has_construct_function = false, type = "GtkWidget*")] @@ -2577,7 +2586,7 @@ namespace Gtk { public void set_show_close_button (bool setting); public void set_subtitle (string? subtitle); public void set_title (string? title); - public Gtk.Widget custom_title { get; set construct; } + public Gtk.Widget custom_title { get; set; } public string decoration_layout { get; set; } [NoAccessorMethod] public bool decoration_layout_set { get; set; } @@ -3519,6 +3528,28 @@ namespace Gtk { public Gtk.Window parent { get; set; } public Gdk.Screen screen { get; set; } } + [CCode (cheader_filename = "gtk/gtk.h")] + public class NativeDialog : GLib.Object { + [CCode (has_construct_function = false)] + protected NativeDialog (); + public void destroy (); + public bool get_modal (); + public unowned string get_title (); + public unowned Gtk.Window get_transient_for (); + public bool get_visible (); + public virtual void hide (); + public int run (); + public void set_modal (bool modal); + public void set_title (string title); + public void set_transient_for (Gtk.Window parent); + public virtual void show (); + public bool modal { get; set; } + public string? title { get; set; } + public Gtk.Window? transient_for { get; set construct; } + [NoAccessorMethod] + public bool visible { get; set; } + public virtual signal void response (int response_id); + } [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_notebook_get_type ()")] public class Notebook : Gtk.Container, Atk.Implementor, Gtk.Buildable { [CCode (has_construct_function = false, type = "GtkWidget*")] @@ -4758,6 +4789,8 @@ namespace Gtk { [NoAccessorMethod] public string accelerator { owned get; set; } [NoAccessorMethod] + public Gtk.TextDirection direction { get; set; } + [NoAccessorMethod] public string title { owned get; set; } [NoAccessorMethod] public Gtk.SizeGroup title_size_group { set; } @@ -4884,13 +4917,13 @@ namespace Gtk { public void set_visible_child (Gtk.Widget child); public void set_visible_child_full (string name, Gtk.StackTransitionType transition); public void set_visible_child_name (string name); - public bool hhomogeneous { get; set construct; } + public bool hhomogeneous { get; set; } public bool homogeneous { get; set; } - public bool interpolate_size { get; } - public uint transition_duration { get; set construct; } + public bool interpolate_size { get; set; } + public uint transition_duration { get; set; } public bool transition_running { get; } - public Gtk.StackTransitionType transition_type { get; set construct; } - public bool vhomogeneous { get; set construct; } + public Gtk.StackTransitionType transition_type { get; set; } + public bool vhomogeneous { get; set; } public Gtk.Widget visible_child { get; set; } public string visible_child_name { get; set; } } @@ -4908,6 +4941,8 @@ namespace Gtk { public StackSwitcher (); public unowned Gtk.Stack get_stack (); public void set_stack (Gtk.Stack stack); + [NoAccessorMethod] + public int icon_size { get; set; } public Gtk.Stack stack { get; set construct; } } [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_status_icon_get_type ()")] @@ -5371,9 +5406,9 @@ namespace Gtk { public bool get_has_selection (); public unowned Gtk.TextMark get_insert (); public void get_iter_at_child_anchor (out Gtk.TextIter iter, Gtk.TextChildAnchor anchor); - public bool get_iter_at_line (out Gtk.TextIter iter, int line_number); - public bool get_iter_at_line_index (out Gtk.TextIter iter, int line_number, int byte_index); - public bool get_iter_at_line_offset (out Gtk.TextIter iter, int line_number, int char_offset); + public void get_iter_at_line (out Gtk.TextIter iter, int line_number); + public void get_iter_at_line_index (out Gtk.TextIter iter, int line_number, int byte_index); + public void get_iter_at_line_offset (out Gtk.TextIter iter, int line_number, int char_offset); public void get_iter_at_mark (out Gtk.TextIter iter, Gtk.TextMark mark); public void get_iter_at_offset (out Gtk.TextIter iter, int char_offset); public int get_line_count (); @@ -6550,6 +6585,7 @@ namespace Gtk { public unowned GLib.ActionGroup? get_action_group (string prefix); public int get_allocated_baseline (); public int get_allocated_height (); + public void get_allocated_size (out Gtk.Allocation allocation, out int baseline); public int get_allocated_width (); public void get_allocation (out Gtk.Allocation allocation); public unowned Gtk.Widget get_ancestor (GLib.Type widget_type); @@ -6573,6 +6609,7 @@ namespace Gtk { public unowned Gdk.Display get_display (); public bool get_double_buffered (); public int get_events (); + public bool get_focus_on_click (); public unowned Pango.FontMap get_font_map (); public unowned Cairo.FontOptions get_font_options (); public unowned Gdk.FrameClock get_frame_clock (); @@ -6697,6 +6734,7 @@ namespace Gtk { public void path (out uint path_length, out string path, out string path_reversed); public static void pop_composite_child (); public static void push_composite_child (); + public void queue_allocate (); public void queue_compute_expand (); public void queue_draw (); public void queue_draw_area (int x, int y, int width, int height); @@ -6738,6 +6776,7 @@ namespace Gtk { public void set_direction (Gtk.TextDirection dir); public void set_double_buffered (bool double_buffered); public void set_events (int events); + public void set_focus_on_click (bool focus_on_click); public void set_font_map (Pango.FontMap font_map); public void set_font_options (Cairo.FontOptions? options); public void set_halign (Gtk.Align align); @@ -6805,6 +6844,7 @@ namespace Gtk { public Gdk.EventMask events { get; set; } [NoAccessorMethod] public bool expand { get; set; } + public bool focus_on_click { get; set; } public Gtk.Align halign { get; set; } [NoAccessorMethod] public bool has_default { get; set; } @@ -7279,7 +7319,7 @@ namespace Gtk { public signal void insert_text (string new_text, int new_text_length, ref int position); } [CCode (cheader_filename = "gtk/gtk.h")] - public interface FileChooser : Gtk.Widget { + public interface FileChooser : GLib.Object { public void add_filter (owned Gtk.FileFilter filter); public bool add_shortcut_folder (string folder) throws GLib.Error; public bool add_shortcut_folder_uri (string uri) throws GLib.Error; @@ -8623,7 +8663,9 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TEXT_VIEW_LAYER_")] public enum TextViewLayer { BELOW, - ABOVE + ABOVE, + BELOW_TEXT, + ABOVE_TEXT } [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TEXT_WINDOW_")] public enum TextWindowType { 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 9805bdb44..10093b173 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala +++ b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala @@ -105,7 +105,7 @@ namespace Gtk { public interface FileChooserEmbed : GLib.Object { } - public interface FileChooser: Gtk.Widget { + public interface FileChooser: GLib.Object { public GLib.SList get_files (); } diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.gi b/vapi/packages/gtk+-3.0/gtk+-3.0.gi index 7cca8320b..60045da6c 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.gi +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.gi @@ -5248,6 +5248,8 @@ + + @@ -7816,6 +7818,17 @@ + + + + + + + + + + + @@ -8112,7 +8125,6 @@ - @@ -10759,7 +10771,6 @@ - @@ -12832,7 +12843,6 @@ - @@ -12858,6 +12868,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -14770,7 +14823,7 @@ - + @@ -18652,6 +18705,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22732,6 +22879,7 @@ + @@ -23258,13 +23406,13 @@ - + - - + + - - + + @@ -23313,6 +23461,7 @@ + @@ -25086,7 +25235,7 @@ - + @@ -25094,7 +25243,7 @@ - + @@ -25103,7 +25252,7 @@ - + @@ -30261,6 +30410,14 @@ + + + + + + + + @@ -30376,6 +30533,12 @@ + + + + + + @@ -31040,6 +31203,12 @@ + + + + + + @@ -31274,6 +31443,13 @@ + + + + + + + @@ -31673,6 +31849,7 @@ + @@ -34149,7 +34326,7 @@ - + @@ -35910,14 +36087,14 @@ - + - + diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata index 36bc291d8..3a3f73be5 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata @@ -419,6 +419,11 @@ gtk_file_chooser_dialog_new.title nullable="1" gtk_file_chooser_dialog_new.parent nullable="1" gtk_file_chooser_dialog_new_with_backend.title nullable="1" gtk_file_chooser_dialog_new_with_backend.parent nullable="1" +gtk_file_chooser_native_new.* nullable="1" +gtk_file_chooser_native_new.action nullable="0" +gtk_file_chooser_native_get_* nullable="1" +gtk_file_chooser_native_set_*.* nullable="1" +GtkFileChooserNative:* nullable="1" gtk_file_filter_add_custom.func transfer_ownership="1" gtk_file_filter_add_custom.data hidden="1" gtk_file_filter_add_custom.notify hidden="1" @@ -766,6 +771,12 @@ GtkModuleInitFunc.argv is_array="1" nullable="1" transfer_ownership="1" array_le gtk_mount_operation_is_showing hidden="1" gtk_mount_operation_new.parent nullable="1" gtk_mount_operation_set_parent.parent nullable="1" +GtkNativeDialog:title nullable="1" +GtkNativeDialog:transient-for nullable="1" +gtk_native_dialog_get_title nullable"1" +gtk_native_dialog_get_transient_for nullable"1" +gtk_native_dialog_set_title.* nullable"1" +gtk_native_dialog_set_transient_for.* nullable"1" GtkNotebook.focus_tab hidden="1" gtk_notebook_append_page.tab_label nullable="1" default_value="null" gtk_notebook_append_page_menu.tab_label nullable="1" @@ -1611,6 +1622,8 @@ gtk_widget_dispatch_child_properties_changed.pspecs is_array="1" array_length_po gtk_widget_ensure_style deprecated_since="3.0" replacement="StyleContext" GtkWidget::event has_emitter="1" gtk_widget_get_action_group nullable="1" +gtk_widget_get_allocated_size.allocation is_out="1" +gtk_widget_get_allocated_size.baseline is_out="1" gtk_widget_get_allocation.allocation is_out="1" gtk_widget_get_child_requisition deprecated_since="3.0" replacement="get_preferred_size" gtk_widget_get_child_requisition.requisition is_out="1" -- 2.47.2