From: Evan Nemerson Date: Sat, 21 Nov 2009 03:54:35 +0000 (-0800) Subject: gtk+-2.0: nullability fixes for GtkToolButton and descendants. X-Git-Tag: 0.7.9~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da38f798be61e76209d2f941f77fa74b7154d85d;p=thirdparty%2Fvala.git gtk+-2.0: nullability fixes for GtkToolButton and descendants. Fixes bug 602273. --- diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index 677776209..db8ba6fd7 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -2458,7 +2458,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public class MenuToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { [CCode (type = "GtkToolItem*", has_construct_function = false)] - public MenuToolButton (Gtk.Widget icon_widget, string label); + public MenuToolButton (Gtk.Widget? icon_widget, string? label); [CCode (type = "GtkToolItem*", has_construct_function = false)] public MenuToolButton.from_stock (string stock_id); public unowned Gtk.Widget get_menu (); @@ -3017,7 +3017,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public class RadioToolButton : Gtk.ToggleToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { [CCode (type = "GtkToolItem*", has_construct_function = false)] - public RadioToolButton (GLib.SList group); + public RadioToolButton (GLib.SList? group); [CCode (type = "GtkToolItem*", has_construct_function = false)] public RadioToolButton.from_stock (GLib.SList group, string stock_id); [CCode (type = "GtkToolItem*", has_construct_function = false)] @@ -4489,7 +4489,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public class ToolButton : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { [CCode (type = "GtkToolItem*", has_construct_function = false)] - public ToolButton (Gtk.Widget icon_widget, string label); + public ToolButton (Gtk.Widget? icon_widget, string? label); [CCode (type = "GtkToolItem*", has_construct_function = false)] public ToolButton.from_stock (string stock_id); public unowned string get_icon_name (); diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata index dd3f1dae1..5ed6fd999 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata @@ -245,6 +245,8 @@ GtkMenuShell.children type_arguments="MenuItem" weak="0" GtkMenuShell::cancel has_emitter="1" GtkMenuShell::deactivate has_emitter="1" gtk_menu_shell_append.child type_name="MenuItem" ctype="GtkWidget*" +gtk_menu_tool_button_new.icon_widget nullable="1" +gtk_menu_tool_button_new.label nullable="1" gtk_message_dialog_new ellipsis="1" printf_format="1" gtk_message_dialog_new.parent nullable="1" gtk_message_dialog_new_with_markup ellipsis="1" @@ -352,6 +354,7 @@ GtkRadioActionEntry is_value_type="1" gtk_radio_button_new.group nullable="1" gtk_radio_button_new_with_label.group nullable="1" gtk_radio_button_new_with_mnemonic.group nullable="1" +gtk_radio_tool_button_new.group nullable="1" GtkRecentData is_value_type="1" has_copy_function="0" has_destroy_function="0" GtkRecentData.display_name weak="0" GtkRecentData.description weak="0" @@ -470,6 +473,8 @@ GtkToggleActionEntry.callback type_name="ActionCallback" ctype="GCallback" GtkToggleButton::toggled has_emitter="1" GtkToolbar.GtkTooltips hidden="1" GtkToolbar.gpointer hidden="1" +gtk_tool_button_new.icon_widget nullable="1" +gtk_tool_button_new.label nullable="1" gtk_tool_item_toolbar_reconfigured hidden="1" GtkToolItem::set_tooltip hidden="1" GtkTreeIter is_value_type="1"