From: Evan Nemerson Date: Tue, 23 Oct 2012 00:48:08 +0000 (-0700) Subject: gtk+-2.0, gtk+-3.0: assorted minor fixes X-Git-Tag: 0.19.0~96 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d59bc76627bf75900aecc3064d461da11530518f;p=thirdparty%2Fvala.git gtk+-2.0, gtk+-3.0: assorted minor fixes --- diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index 5bcbab5a7..9920cb341 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -1223,7 +1223,7 @@ namespace Gtk { public weak Gtk.Widget colorsel; [CCode (has_construct_function = false, type = "GtkWidget*")] public ColorSelectionDialog (string title); - public unowned Gtk.Widget get_color_selection (); + public unowned Gtk.ColorSelection get_color_selection (); [NoAccessorMethod] public Gtk.Widget cancel_button { owned get; } public Gtk.Widget color_selection { get; } @@ -2328,10 +2328,10 @@ namespace Gtk { [CCode (has_construct_function = false, type = "GtkWidget*")] public InfoBar (); public void add_action_widget (Gtk.Widget child, int response_id); - public unowned Gtk.Widget add_button (string button_text, int response_id); + public unowned Gtk.Button add_button (string button_text, int response_id); public void add_buttons (...); public unowned Gtk.Widget get_action_area (); - public unowned Gtk.Widget get_content_area (); + public unowned Gtk.Container get_content_area (); public Gtk.MessageType get_message_type (); public void set_default_response (int response_id); public void set_message_type (Gtk.MessageType message_type); @@ -2674,7 +2674,7 @@ namespace Gtk { public virtual signal void toggle_size_request (void* requisition); } [CCode (cheader_filename = "gtk/gtk.h")] - public class MenuShell : Gtk.Container, Atk.Implementor, Gtk.Buildable { + public abstract class MenuShell : Gtk.Container, Atk.Implementor, Gtk.Buildable { public uint32 activate_time; public uint active; public weak Gtk.Widget active_menu_item; @@ -3279,17 +3279,17 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public class RadioMenuItem : Gtk.CheckMenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { [CCode (has_construct_function = false, type = "GtkWidget*")] - public RadioMenuItem (GLib.SList group); + public RadioMenuItem (GLib.SList? group); [CCode (has_construct_function = false, type = "GtkWidget*")] public RadioMenuItem.from_widget (Gtk.RadioMenuItem group); - public unowned GLib.SList get_group (); - public void set_group (GLib.SList group); + public unowned GLib.SList? get_group (); + public void set_group (GLib.SList? group); [CCode (has_construct_function = false, type = "GtkWidget*")] - public RadioMenuItem.with_label (GLib.SList group, string label); + public RadioMenuItem.with_label (GLib.SList? group, string label); [CCode (has_construct_function = false, type = "GtkWidget*")] public RadioMenuItem.with_label_from_widget (Gtk.RadioMenuItem group, string label); [CCode (has_construct_function = false, type = "GtkWidget*")] - public RadioMenuItem.with_mnemonic (GLib.SList group, string label); + public RadioMenuItem.with_mnemonic (GLib.SList? group, string label); [CCode (has_construct_function = false, type = "GtkWidget*")] public RadioMenuItem.with_mnemonic_from_widget (Gtk.RadioMenuItem group, string label); public Gtk.RadioMenuItem group { set; } @@ -4057,7 +4057,7 @@ namespace Gtk { public Statusbar (); public uint get_context_id (string context_description); public bool get_has_resize_grip (); - public unowned Gtk.Widget get_message_area (); + public unowned Gtk.Container get_message_area (); public void pop (uint context_id); public uint push (uint context_id, string text); public void remove (uint context_id, uint message_id); diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index 8adea199f..611f07ebe 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -1421,7 +1421,7 @@ namespace Gtk { public class ColorSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable { [CCode (has_construct_function = false, type = "GtkWidget*")] public ColorSelectionDialog (string title); - public unowned Gtk.Widget get_color_selection (); + public unowned Gtk.ColorSelection get_color_selection (); [NoAccessorMethod] public Gtk.Widget cancel_button { owned get; } public Gtk.Widget color_selection { get; } @@ -2471,10 +2471,10 @@ namespace Gtk { [CCode (has_construct_function = false, type = "GtkWidget*")] public InfoBar (); public void add_action_widget (Gtk.Widget child, int response_id); - public unowned Gtk.Widget add_button (string button_text, int response_id); + public unowned Gtk.Button add_button (string button_text, int response_id); public void add_buttons (...); public unowned Gtk.Widget get_action_area (); - public unowned Gtk.Widget get_content_area (); + public unowned Gtk.Container get_content_area (); public Gtk.MessageType get_message_type (); public void set_default_response (int response_id); public void set_message_type (Gtk.MessageType message_type); @@ -2805,7 +2805,7 @@ namespace Gtk { public virtual signal void toggle_size_request (void* requisition); } [CCode (cheader_filename = "gtk/gtk.h")] - public class MenuShell : Gtk.Container, Atk.Implementor, Gtk.Buildable { + public abstract class MenuShell : Gtk.Container, Atk.Implementor, Gtk.Buildable { [CCode (has_construct_function = false)] protected MenuShell (); public void activate_item (Gtk.Widget menu_item, bool force_deactivate); @@ -3353,17 +3353,17 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public class RadioMenuItem : Gtk.CheckMenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { [CCode (has_construct_function = false, type = "GtkWidget*")] - public RadioMenuItem (GLib.SList group); + public RadioMenuItem (GLib.SList? group); [CCode (has_construct_function = false, type = "GtkWidget*")] public RadioMenuItem.from_widget (Gtk.RadioMenuItem group); public unowned GLib.SList get_group (); - public void set_group (GLib.SList group); + public void set_group (GLib.SList? group); [CCode (has_construct_function = false, type = "GtkWidget*")] - public RadioMenuItem.with_label (GLib.SList group, string label); + public RadioMenuItem.with_label (GLib.SList? group, string label); [CCode (has_construct_function = false, type = "GtkWidget*")] public RadioMenuItem.with_label_from_widget (Gtk.RadioMenuItem group, string label); [CCode (has_construct_function = false, type = "GtkWidget*")] - public RadioMenuItem.with_mnemonic (GLib.SList group, string label); + public RadioMenuItem.with_mnemonic (GLib.SList? group, string label); [CCode (has_construct_function = false, type = "GtkWidget*")] public RadioMenuItem.with_mnemonic_from_widget (Gtk.RadioMenuItem group, string label); public Gtk.RadioMenuItem group { set; } @@ -4070,7 +4070,7 @@ namespace Gtk { [CCode (has_construct_function = false, type = "GtkWidget*")] public Statusbar (); public uint get_context_id (string context_description); - public unowned Gtk.Widget get_message_area (); + public unowned Gtk.Container get_message_area (); public void pop (uint context_id); public uint push (uint context_id, string text); public void remove (uint context_id, uint message_id); diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata index 3f6389717..dadc6e48f 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata @@ -148,6 +148,7 @@ GtkClipboardURIReceivedFunc.uris is_array="1" no_array_length"1" array_null_term gtk_color_button_get_color.color is_out="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" gtk_combo_box_get_active_iter.iter is_out="1" gtk_combo_box_set_model.model nullable="1" gtk_combo_box_set_row_separator_func.func transfer_ownership="1" @@ -279,6 +280,8 @@ gtk_im_context_get_preedit_string.cursor_pos is_out="1" gtk_im_context_get_surrounding.text is_out="1" gtk_im_context_get_surrounding.cursor_index is_out="1" GtkIMContextInfo is_value_type="1" cheader_filename="gtk/gtk.h,gtk/gtkimmodule.h" +gtk_info_bar_add_button type_name="Gtk.Button" +gtk_info_bar_get_content_area type_name="Gtk.Container" gtk_init.argc hidden="1" gtk_init.argv is_array="1" is_ref="1" array_length_pos="0.9" nullable="1" gtk_init_add.data hidden="1" @@ -347,6 +350,7 @@ GtkMenuItem::activate has_emitter="1" GtkMenuItem::toggle_size_allocate has_emitter="1" GtkMenuItem::toggle_size_request has_emitter="1" gtk_menu_set_screen.screen nullable="1" +GtkMenuShell abstract="1" GtkMenuShell.children type_arguments="MenuItem" weak="0" GtkMenuShell::cancel has_emitter="1" GtkMenuShell::deactivate has_emitter="1" @@ -474,11 +478,11 @@ gtk_radio_button_new_*from_widget.radio_group_member nullable="1" gtk_radio_button_new_with_label.group nullable="1" type_arguments="RadioButton" gtk_radio_button_new_with_mnemonic.group nullable="1" type_arguments="RadioButton" gtk_radio_button_set_group.group type_arguments="RadioButton" -gtk_radio_menu_item_get_group type_arguments="RadioMenuItem" -gtk_radio_menu_item_new.group type_arguments="RadioMenuItem" -gtk_radio_menu_item_new_with_label.group type_arguments="RadioMenuItem" -gtk_radio_menu_item_new_with_mnemonic.group type_arguments="RadioMenuItem" -gtk_radio_menu_item_set_group.group type_arguments="RadioMenuItem" +gtk_radio_menu_item_get_group type_arguments="RadioMenuItem" nullable="1" +gtk_radio_menu_item_new.group type_arguments="RadioMenuItem" nullable="1" +gtk_radio_menu_item_new_with_label.group type_arguments="RadioMenuItem" nullable="1" +gtk_radio_menu_item_new_with_mnemonic.group type_arguments="RadioMenuItem" nullable="1" +gtk_radio_menu_item_set_group.group type_arguments="RadioMenuItem" nullable="1" gtk_radio_tool_button_get_group type_arguments="RadioToolButton" gtk_radio_tool_button_new.group nullable="1" type_arguments="RadioToolButton" gtk_radio_tool_button_new_from_stock.group nullable="1" type_arguments="RadioToolButton" @@ -550,6 +554,7 @@ gtk_spin_button_get_range.min is_out="1" gtk_spin_button_get_range.max is_out="1" GtkStatusIcon::button_press_event.event namespace_name="Gdk" type_name="EventButton" GtkStatusIcon::button_release_event.event namespace_name="Gdk" type_name="EventButton" +gtk_statusbar_get_message_area type_name="Gtk.Container" gtk_status_icon_get_geometry.area is_out="1" gtk_status_icon_get_geometry.orientation is_out="1" gtk_status_icon_position_menu hidden="1" diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata index 6e7fb347c..b044268af 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata @@ -209,6 +209,7 @@ gtk_color_selection_get_current_color deprecated_since="3.4" replacement="get_cu gtk_color_selection_get_current_color.color is_out="1" gtk_color_selection_get_previous_color.color is_out="1" gtk_color_selection_set_current_color deprecated_since="3.4" replacement="set_current_rgba" +gtk_color_selection_dialog_get_color_selection type_name="Gtk.ColorSelection" gtk_combo_box_get_active_iter.iter is_out="1" gtk_combo_box_set_model.model nullable="1" gtk_combo_box_set_row_separator_func.func transfer_ownership="1" @@ -379,6 +380,9 @@ GtkInfoBar:action-area-border deprecated_since="3.6" replacement="Container.set_ GtkInfoBar:button-spacing deprecated_since="3.6" replacement="Box.set_spacing" GtkInfoBar:content-area-border deprecated_since="3.6" replacement="Container.set_border_width" GtkInfoBar:content-area-spacing deprecated_since="3.6" replacement="Container.set_spacing" +gtk_info_bar_add_button type_name="Gtk.Button" +gtk_info_bar_get_content_area type_name="Gtk.Container" +gtk_color_selection_dialog_get_color_selection type_name="Gtk.ColorSelection" gtk_init.argc hidden="1" gtk_init.argv is_array="1" is_ref="1" array_length_pos="0.9" nullable="1" gtk_init_add.data hidden="1" @@ -450,6 +454,7 @@ GtkMenuItem::activate has_emitter="1" GtkMenuItem::toggle_size_allocate has_emitter="1" GtkMenuItem::toggle_size_request has_emitter="1" gtk_menu_set_screen.screen nullable="1" +GtkMenuShell abstract="1" GtkMenuShell.children type_arguments="MenuItem" weak="0" GtkMenuShell::cancel has_emitter="1" GtkMenuShell::deactivate has_emitter="1" @@ -594,10 +599,10 @@ gtk_radio_button_new_with_label.group nullable="1" type_arguments="RadioButton" gtk_radio_button_new_with_mnemonic.group nullable="1" type_arguments="RadioButton" gtk_radio_button_set_group.group type_arguments="RadioButton" gtk_radio_menu_item_get_group type_arguments="RadioMenuItem" -gtk_radio_menu_item_new.group type_arguments="RadioMenuItem" -gtk_radio_menu_item_new_with_label.group type_arguments="RadioMenuItem" -gtk_radio_menu_item_new_with_mnemonic.group type_arguments="RadioMenuItem" -gtk_radio_menu_item_set_group.group type_arguments="RadioMenuItem" +gtk_radio_menu_item_new.group type_arguments="RadioMenuItem" nullable="1" +gtk_radio_menu_item_new_with_label.group type_arguments="RadioMenuItem" nullable="1" +gtk_radio_menu_item_new_with_mnemonic.group type_arguments="RadioMenuItem" nullable="1" +gtk_radio_menu_item_set_group.group type_arguments="RadioMenuItem" nullable="1" gtk_radio_tool_button_get_group type_arguments="RadioToolButton" gtk_radio_tool_button_new.group nullable="1" type_arguments="RadioToolButton" gtk_radio_tool_button_new_from_stock.group nullable="1" type_arguments="RadioToolButton" @@ -678,6 +683,7 @@ gtk_spin_button_get_range.min is_out="1" gtk_spin_button_get_range.max is_out="1" GtkStatusIcon::button_press_event.event namespace_name="Gdk" type_name="EventButton" GtkStatusIcon::button_release_event.event namespace_name="Gdk" type_name="EventButton" +gtk_statusbar_get_message_area type_name="Gtk.Container" gtk_status_icon_get_geometry.area is_out="1" gtk_status_icon_get_geometry.orientation is_out="1" gtk_status_icon_position_menu hidden="1"