From: Jürg Billeter <j@bitron.ch>
Date: Mon, 17 Dec 2012 19:37:25 +0000 (+0100)
Subject: gtk+-3.0: Update to 3.6.2
X-Git-Tag: 0.19.0~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9453155bf99500f9a6ed505847dbf9e42fc58d12;p=thirdparty%2Fvala.git

gtk+-3.0: Update to 3.6.2
---

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 4ebda9ca3..1751bc867 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -312,6 +312,7 @@ namespace Gtk {
 		public unowned Gtk.Widget get_accel_widget ();
 		public uint get_accel_width ();
 		public bool refetch ();
+		public void set_accel (uint accelerator_key, Gdk.ModifierType accelerator_mods);
 		public void set_accel_closure ([CCode (type = "GClosure*")] owned Gtk.AccelGroupActivate accel_closure);
 		public void set_accel_widget (Gtk.Widget accel_widget);
 		[NoAccessorMethod]
@@ -437,16 +438,19 @@ namespace Gtk {
 		public void add_radio_actions_full (Gtk.RadioActionEntry[] entries, int value, [CCode (type = "GCallback")] Gtk.RadioActionCallback on_change, GLib.DestroyNotify? destroy);
 		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 ();
 		public virtual unowned Gtk.Action get_action (string action_name);
 		public bool get_sensitive ();
 		public bool get_visible ();
 		public GLib.List<weak Gtk.Action> list_actions ();
 		public void remove_action (Gtk.Action action);
+		public void set_accel_group (Gtk.AccelGroup accel_group);
 		public void set_sensitive (bool sensitive);
 		public void set_translate_func (owned Gtk.TranslateFunc func);
 		public void set_translation_domain (string domain);
 		public void set_visible (bool visible);
 		public unowned string translate_string (string str);
+		public Gtk.AccelGroup accel_group { get; set; }
 		public string name { get; construct; }
 		public bool sensitive { get; set; }
 		public bool visible { get; set; }
@@ -572,6 +576,7 @@ namespace Gtk {
 		public Application (string application_id, GLib.ApplicationFlags flags);
 		public void add_accelerator (string accelerator, string action_name, GLib.Variant? parameter);
 		public void add_window (Gtk.Window window);
+		public unowned Gtk.Window get_active_window ();
 		public unowned GLib.MenuModel get_app_menu ();
 		public unowned GLib.MenuModel get_menubar ();
 		public unowned Gtk.Window get_window_by_id (uint id);
@@ -583,6 +588,7 @@ namespace Gtk {
 		public void set_app_menu (GLib.MenuModel app_menu);
 		public void set_menubar (GLib.MenuModel menubar);
 		public void uninhibit (uint cookie);
+		public Gtk.Window active_window { get; }
 		public GLib.MenuModel app_menu { get; set; }
 		public GLib.MenuModel menubar { get; set; }
 		[NoAccessorMethod]
@@ -1289,7 +1295,7 @@ namespace Gtk {
 		public CheckButton.with_mnemonic (string label);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CheckMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
+	public class CheckMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Actionable {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CheckMenuItem ();
 		[NoWrapper]
@@ -1642,10 +1648,13 @@ namespace Gtk {
 		public Entry ();
 		public bool get_activates_default ();
 		public float get_alignment ();
+		public unowned Pango.AttrList get_attributes ();
 		public unowned Gtk.EntryBuffer get_buffer ();
 		public unowned Gtk.EntryCompletion get_completion ();
 		public int get_current_icon_drag_source ();
 		public unowned Gtk.Adjustment get_cursor_hadjustment ();
+		[NoWrapper]
+		public virtual void get_frame_size (int x, int y, int width, int height);
 		public bool get_has_frame ();
 		public bool get_icon_activatable (Gtk.EntryIconPosition icon_pos);
 		public void get_icon_area (Gtk.EntryIconPosition icon_pos, Gdk.Rectangle icon_area);
@@ -1659,6 +1668,8 @@ namespace Gtk {
 		public unowned string get_icon_tooltip_markup (Gtk.EntryIconPosition icon_pos);
 		public unowned string get_icon_tooltip_text (Gtk.EntryIconPosition icon_pos);
 		public unowned Gtk.Border? get_inner_border ();
+		public Gtk.InputHints get_input_hints ();
+		public Gtk.InputPurpose get_input_purpose ();
 		public unichar get_invisible_char ();
 		public unowned Pango.Layout get_layout ();
 		public void get_layout_offsets (out int x, out int y);
@@ -1680,6 +1691,7 @@ namespace Gtk {
 		public void reset_im_context ();
 		public void set_activates_default (bool setting);
 		public void set_alignment (float xalign);
+		public void set_attributes (Pango.AttrList attrs);
 		public void set_buffer (Gtk.EntryBuffer buffer);
 		public void set_completion (Gtk.EntryCompletion completion);
 		public void set_cursor_hadjustment (Gtk.Adjustment adjustment);
@@ -1695,6 +1707,8 @@ namespace Gtk {
 		public void set_icon_tooltip_text (Gtk.EntryIconPosition icon_pos, string? tooltip);
 		[Deprecated (since = "3.4")]
 		public void set_inner_border (Gtk.Border border);
+		public void set_input_hints (Gtk.InputHints hints);
+		public void set_input_purpose (Gtk.InputPurpose purpose);
 		public void set_invisible_char (unichar ch);
 		public void set_max_length (int max);
 		public void set_overwrite_mode (bool overwrite);
@@ -1709,6 +1723,7 @@ namespace Gtk {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Entry.with_buffer (Gtk.EntryBuffer buffer);
 		public bool activates_default { get; set; }
+		public Pango.AttrList attributes { get; set; }
 		public Gtk.EntryBuffer buffer { get; set construct; }
 		[NoAccessorMethod]
 		public bool caps_lock_warning { get; set; }
@@ -1722,6 +1737,8 @@ namespace Gtk {
 		public string im_module { owned get; set; }
 		[Deprecated (since = "3.4")]
 		public Gtk.Border inner_border { get; set; }
+		public Gtk.InputHints input_hints { get; set; }
+		public Gtk.InputPurpose input_purpose { get; set; }
 		public uint invisible_char { get; set; }
 		[NoAccessorMethod]
 		public bool invisible_char_set { get; set; }
@@ -2178,6 +2195,10 @@ namespace Gtk {
 		public virtual void set_cursor_location (Gdk.Rectangle area);
 		public virtual void set_surrounding (string text, int len, int cursor_index);
 		public virtual void set_use_preedit (bool use_preedit);
+		[NoAccessorMethod]
+		public Gtk.InputHints input_hints { get; set; }
+		[NoAccessorMethod]
+		public Gtk.InputPurpose input_purpose { get; set; }
 		public virtual signal void commit (string str);
 		[HasEmitter]
 		public virtual signal bool delete_surrounding (int offset, int n_chars);
@@ -2445,7 +2466,7 @@ namespace Gtk {
 		public bool use_fallback { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImageMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
+	public class ImageMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Actionable {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ImageMenuItem ();
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
@@ -2756,19 +2777,21 @@ namespace Gtk {
 		public MenuButton ();
 		public unowned Gtk.Widget get_align_widget ();
 		public Gtk.ArrowType get_direction ();
-		public unowned Gtk.Menu get_menu ();
 		public unowned GLib.MenuModel get_menu_model ();
+		public unowned Gtk.Menu get_popup ();
 		public void set_align_widget (Gtk.Widget align_widget);
 		public void set_direction (Gtk.ArrowType direction);
-		public void set_menu (Gtk.Widget menu);
 		public void set_menu_model (GLib.MenuModel menu_model);
+		public void set_popup (Gtk.Widget popup);
 		public Gtk.Container align_widget { get; set; }
 		public Gtk.ArrowType direction { get; set; }
-		public Gtk.Menu menu { get; set; }
+		[NoAccessorMethod]
+		public Gtk.Menu menu { owned get; set; }
 		public GLib.MenuModel menu_model { get; set; }
+		public Gtk.Menu popup { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class MenuItem : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
+	public class MenuItem : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Actionable {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public MenuItem ();
 		public unowned string get_accel_path ();
@@ -2810,6 +2833,7 @@ namespace Gtk {
 		protected MenuShell ();
 		public void activate_item (Gtk.Widget menu_item, bool force_deactivate);
 		public void append ([CCode (type = "GtkWidget*")] Gtk.MenuItem child);
+		public void bind_model (GLib.MenuModel model, string action_namespace, bool with_separators);
 		public void deselect ();
 		public unowned Gtk.Widget get_parent_shell ();
 		[NoWrapper]
@@ -3351,7 +3375,7 @@ namespace Gtk {
 		public virtual signal void group_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RadioMenuItem : Gtk.CheckMenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
+	public class RadioMenuItem : Gtk.CheckMenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Actionable {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioMenuItem (GLib.SList<Gtk.RadioMenuItem>? group);
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
@@ -3738,7 +3762,7 @@ namespace Gtk {
 		public Separator (Gtk.Orientation orientation);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class SeparatorMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
+	public class SeparatorMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Actionable {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public SeparatorMenuItem ();
 	}
@@ -3855,6 +3879,8 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public string gtk_modules { owned get; set; }
 		[NoAccessorMethod]
+		public bool gtk_primary_button_warps_slider { get; set; }
+		[NoAccessorMethod]
 		public string gtk_print_backends { owned get; set; }
 		[NoAccessorMethod]
 		public string gtk_print_preview_command { owned get; set; }
@@ -3941,7 +3967,7 @@ namespace Gtk {
 		public virtual signal bool plug_removed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class SpinButton : Gtk.Entry, Atk.Implementor, Gtk.Buildable, Gtk.Editable, Gtk.CellEditable {
+	public class SpinButton : Gtk.Entry, Atk.Implementor, Gtk.Buildable, Gtk.Editable, Gtk.CellEditable, Gtk.Orientable {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public SpinButton (Gtk.Adjustment adjustment, double climb_rate, uint digits);
 		public void configure (Gtk.Adjustment adjustment, double climb_rate, uint digits);
@@ -4387,7 +4413,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	[Deprecated (since = "3.4")]
-	public class TearoffMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
+	public class TearoffMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Actionable {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TearoffMenuItem ();
 	}
@@ -4733,6 +4759,8 @@ namespace Gtk {
 		public bool get_editable ();
 		public unowned Gtk.Adjustment get_hadjustment ();
 		public int get_indent ();
+		public Gtk.InputHints get_input_hints ();
+		public Gtk.InputPurpose get_input_purpose ();
 		public void get_iter_at_location (out Gtk.TextIter iter, int x, int y);
 		public void get_iter_at_position (out Gtk.TextIter iter, out int trailing, int x, int y);
 		public void get_iter_location (Gtk.TextIter iter, out Gdk.Rectangle location);
@@ -4766,6 +4794,8 @@ namespace Gtk {
 		public void set_cursor_visible (bool setting);
 		public void set_editable (bool setting);
 		public void set_indent (int indent);
+		public void set_input_hints (Gtk.InputHints hints);
+		public void set_input_purpose (Gtk.InputPurpose purpose);
 		public void set_justification (Gtk.Justification justification);
 		public void set_left_margin (int left_margin);
 		public void set_overwrite (bool overwrite);
@@ -4786,6 +4816,8 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public string im_module { owned get; set; }
 		public int indent { get; set; }
+		public Gtk.InputHints input_hints { get; set; }
+		public Gtk.InputPurpose input_purpose { get; set; }
 		public Gtk.Justification justification { get; set; }
 		public int left_margin { get; set; }
 		public bool overwrite { get; set; }
@@ -5650,6 +5682,7 @@ namespace Gtk {
 		public bool hide_on_delete ();
 		public bool in_destruction ();
 		public void input_shape_combine_region (Cairo.Region region);
+		public void insert_action_group (string name, GLib.ActionGroup group);
 		[CCode (cname = "gtk_widget_class_install_style_property")]
 		public class void install_style_property (GLib.ParamSpec pspec);
 		[CCode (cname = "gtk_widget_class_install_style_property_parser")]
@@ -6830,7 +6863,8 @@ namespace Gtk {
 		RULESET,
 		SELECTOR,
 		DECLARATION,
-		VALUE
+		VALUE,
+		KEYFRAMES
 	}
 	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_DEBUG_")]
 	[Flags]
@@ -6988,6 +7022,32 @@ namespace Gtk {
 		ICON_NAME,
 		GICON
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_INPUT_HINT_")]
+	[Flags]
+	public enum InputHints {
+		NONE,
+		SPELLCHECK,
+		NO_SPELLCHECK,
+		WORD_COMPLETION,
+		LOWERCASE,
+		UPPERCASE_CHARS,
+		UPPERCASE_WORDS,
+		UPPERCASE_SENTENCES,
+		INHIBIT_OSK
+	}
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_INPUT_PURPOSE_")]
+	public enum InputPurpose {
+		FREE_FORM,
+		ALPHA,
+		DIGITS,
+		NUMBER,
+		PHONE,
+		URL,
+		EMAIL,
+		NAME,
+		PASSWORD,
+		PIN
+	}
 	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_JUNCTION_")]
 	[Flags]
 	public enum JunctionSides {
@@ -8100,6 +8160,8 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STYLE_CLASS_COMBOBOX_ENTRY;
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STYLE_CLASS_CURSOR_HANDLE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STYLE_CLASS_DEFAULT;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STYLE_CLASS_DIM_LABEL;
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.gi b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
index d80ceb55b..12b19679a 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.gi
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
@@ -4619,6 +4619,7 @@
 			<member name="GTK_CSS_SECTION_SELECTOR" value="5"/>
 			<member name="GTK_CSS_SECTION_DECLARATION" value="6"/>
 			<member name="GTK_CSS_SECTION_VALUE" value="7"/>
+			<member name="GTK_CSS_SECTION_KEYFRAMES" value="8"/>
 		</enum>
 		<enum name="GtkDeleteType" type-name="GtkDeleteType" get-type="gtk_delete_type_get_type">
 			<member name="GTK_DELETE_CHARS" value="0"/>
@@ -4713,6 +4714,18 @@
 			<member name="GTK_IMAGE_ICON_NAME" value="5"/>
 			<member name="GTK_IMAGE_GICON" value="6"/>
 		</enum>
+		<enum name="GtkInputPurpose" type-name="GtkInputPurpose" get-type="gtk_input_purpose_get_type">
+			<member name="GTK_INPUT_PURPOSE_FREE_FORM" value="0"/>
+			<member name="GTK_INPUT_PURPOSE_ALPHA" value="1"/>
+			<member name="GTK_INPUT_PURPOSE_DIGITS" value="2"/>
+			<member name="GTK_INPUT_PURPOSE_NUMBER" value="3"/>
+			<member name="GTK_INPUT_PURPOSE_PHONE" value="4"/>
+			<member name="GTK_INPUT_PURPOSE_URL" value="5"/>
+			<member name="GTK_INPUT_PURPOSE_EMAIL" value="6"/>
+			<member name="GTK_INPUT_PURPOSE_NAME" value="7"/>
+			<member name="GTK_INPUT_PURPOSE_PASSWORD" value="8"/>
+			<member name="GTK_INPUT_PURPOSE_PIN" value="9"/>
+		</enum>
 		<enum name="GtkJustification" type-name="GtkJustification" get-type="gtk_justification_get_type">
 			<member name="GTK_JUSTIFY_LEFT" value="0"/>
 			<member name="GTK_JUSTIFY_RIGHT" value="1"/>
@@ -5181,6 +5194,17 @@
 			<member name="GTK_ICON_LOOKUP_GENERIC_FALLBACK" value="8"/>
 			<member name="GTK_ICON_LOOKUP_FORCE_SIZE" value="16"/>
 		</flags>
+		<flags name="GtkInputHints" type-name="GtkInputHints" get-type="gtk_input_hints_get_type">
+			<member name="GTK_INPUT_HINT_NONE" value="0"/>
+			<member name="GTK_INPUT_HINT_SPELLCHECK" value="1"/>
+			<member name="GTK_INPUT_HINT_NO_SPELLCHECK" value="2"/>
+			<member name="GTK_INPUT_HINT_WORD_COMPLETION" value="4"/>
+			<member name="GTK_INPUT_HINT_LOWERCASE" value="8"/>
+			<member name="GTK_INPUT_HINT_UPPERCASE_CHARS" value="16"/>
+			<member name="GTK_INPUT_HINT_UPPERCASE_WORDS" value="32"/>
+			<member name="GTK_INPUT_HINT_UPPERCASE_SENTENCES" value="64"/>
+			<member name="GTK_INPUT_HINT_INHIBIT_OSK" value="128"/>
+		</flags>
 		<flags name="GtkJunctionSides" type-name="GtkJunctionSides" get-type="gtk_junction_sides_get_type">
 			<member name="GTK_JUNCTION_NONE" value="0"/>
 			<member name="GTK_JUNCTION_CORNER_TOPLEFT" value="1"/>
@@ -5634,6 +5658,14 @@
 					<parameter name="accel_label" type="GtkAccelLabel*"/>
 				</parameters>
 			</method>
+			<method name="set_accel" symbol="gtk_accel_label_set_accel">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="accel_label" type="GtkAccelLabel*"/>
+					<parameter name="accelerator_key" type="guint"/>
+					<parameter name="accelerator_mods" type="GdkModifierType"/>
+				</parameters>
+			</method>
 			<method name="set_accel_closure" symbol="gtk_accel_label_set_accel_closure">
 				<return-type type="void"/>
 				<parameters>
@@ -6200,6 +6232,12 @@
 					<parameter name="destroy" type="GDestroyNotify"/>
 				</parameters>
 			</method>
+			<method name="get_accel_group" symbol="gtk_action_group_get_accel_group">
+				<return-type type="GtkAccelGroup*"/>
+				<parameters>
+					<parameter name="action_group" type="GtkActionGroup*"/>
+				</parameters>
+			</method>
 			<method name="get_action" symbol="gtk_action_group_get_action">
 				<return-type type="GtkAction*"/>
 				<parameters>
@@ -6244,6 +6282,13 @@
 					<parameter name="action" type="GtkAction*"/>
 				</parameters>
 			</method>
+			<method name="set_accel_group" symbol="gtk_action_group_set_accel_group">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="action_group" type="GtkActionGroup*"/>
+					<parameter name="accel_group" type="GtkAccelGroup*"/>
+				</parameters>
+			</method>
 			<method name="set_sensitive" symbol="gtk_action_group_set_sensitive">
 				<return-type type="void"/>
 				<parameters>
@@ -6281,6 +6326,7 @@
 					<parameter name="string" type="gchar*"/>
 				</parameters>
 			</method>
+			<property name="accel-group" type="GtkAccelGroup*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
 			<property name="sensitive" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="visible" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -6793,6 +6839,12 @@
 					<parameter name="window" type="GtkWindow*"/>
 				</parameters>
 			</method>
+			<method name="get_active_window" symbol="gtk_application_get_active_window">
+				<return-type type="GtkWindow*"/>
+				<parameters>
+					<parameter name="application" type="GtkApplication*"/>
+				</parameters>
+			</method>
 			<method name="get_app_menu" symbol="gtk_application_get_app_menu">
 				<return-type type="GMenuModel*"/>
 				<parameters>
@@ -6877,6 +6929,7 @@
 					<parameter name="cookie" type="guint"/>
 				</parameters>
 			</method>
+			<property name="active-window" type="GtkWindow*" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="app-menu" type="GMenuModel*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="menubar" type="GMenuModel*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="register-session" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -9343,6 +9396,7 @@
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
 				<interface name="GtkActivatable"/>
+				<interface name="GtkActionable"/>
 			</implements>
 			<method name="get_active" symbol="gtk_check_menu_item_get_active">
 				<return-type type="gboolean"/>
@@ -10894,6 +10948,12 @@
 					<parameter name="entry" type="GtkEntry*"/>
 				</parameters>
 			</method>
+			<method name="get_attributes" symbol="gtk_entry_get_attributes">
+				<return-type type="PangoAttrList*"/>
+				<parameters>
+					<parameter name="entry" type="GtkEntry*"/>
+				</parameters>
+			</method>
 			<method name="get_buffer" symbol="gtk_entry_get_buffer">
 				<return-type type="GtkEntryBuffer*"/>
 				<parameters>
@@ -11009,6 +11069,18 @@
 					<parameter name="entry" type="GtkEntry*"/>
 				</parameters>
 			</method>
+			<method name="get_input_hints" symbol="gtk_entry_get_input_hints">
+				<return-type type="GtkInputHints"/>
+				<parameters>
+					<parameter name="entry" type="GtkEntry*"/>
+				</parameters>
+			</method>
+			<method name="get_input_purpose" symbol="gtk_entry_get_input_purpose">
+				<return-type type="GtkInputPurpose"/>
+				<parameters>
+					<parameter name="entry" type="GtkEntry*"/>
+				</parameters>
+			</method>
 			<method name="get_invisible_char" symbol="gtk_entry_get_invisible_char">
 				<return-type type="gunichar"/>
 				<parameters>
@@ -11139,6 +11211,13 @@
 					<parameter name="xalign" type="gfloat"/>
 				</parameters>
 			</method>
+			<method name="set_attributes" symbol="gtk_entry_set_attributes">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="entry" type="GtkEntry*"/>
+					<parameter name="attrs" type="PangoAttrList*"/>
+				</parameters>
+			</method>
 			<method name="set_buffer" symbol="gtk_entry_set_buffer">
 				<return-type type="void"/>
 				<parameters>
@@ -11247,6 +11326,20 @@
 					<parameter name="border" type="GtkBorder*"/>
 				</parameters>
 			</method>
+			<method name="set_input_hints" symbol="gtk_entry_set_input_hints">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="entry" type="GtkEntry*"/>
+					<parameter name="hints" type="GtkInputHints"/>
+				</parameters>
+			</method>
+			<method name="set_input_purpose" symbol="gtk_entry_set_input_purpose">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="entry" type="GtkEntry*"/>
+					<parameter name="purpose" type="GtkInputPurpose"/>
+				</parameters>
+			</method>
 			<method name="set_invisible_char" symbol="gtk_entry_set_invisible_char">
 				<return-type type="void"/>
 				<parameters>
@@ -11324,6 +11417,7 @@
 				</parameters>
 			</method>
 			<property name="activates-default" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="attributes" type="PangoAttrList*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="buffer" type="GtkEntryBuffer*" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="caps-lock-warning" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="completion" type="GtkEntryCompletion*" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -11332,6 +11426,8 @@
 			<property name="has-frame" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="im-module" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="inner-border" type="GtkBorder*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="input-hints" type="GtkInputHints" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="input-purpose" type="GtkInputPurpose" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="invisible-char" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="invisible-char-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="max-length" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -11456,6 +11552,16 @@
 					<parameter name="entry" type="GtkEntry*"/>
 				</parameters>
 			</signal>
+			<vfunc name="get_frame_size">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="entry" type="GtkEntry*"/>
+					<parameter name="x" type="gint*"/>
+					<parameter name="y" type="gint*"/>
+					<parameter name="width" type="gint*"/>
+					<parameter name="height" type="gint*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="get_text_area_size">
 				<return-type type="void"/>
 				<parameters>
@@ -12962,6 +13068,8 @@
 					<parameter name="use_preedit" type="gboolean"/>
 				</parameters>
 			</method>
+			<property name="input-hints" type="GtkInputHints" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="input-purpose" type="GtkInputPurpose" readable="1" writable="1" construct="0" construct-only="0"/>
 			<signal name="commit" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -14029,6 +14137,7 @@
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
 				<interface name="GtkActivatable"/>
+				<interface name="GtkActionable"/>
 			</implements>
 			<method name="get_always_show_image" symbol="gtk_image_menu_item_get_always_show_image">
 				<return-type type="gboolean"/>
@@ -15324,14 +15433,14 @@
 					<parameter name="menu_button" type="GtkMenuButton*"/>
 				</parameters>
 			</method>
-			<method name="get_menu" symbol="gtk_menu_button_get_menu">
-				<return-type type="GtkMenu*"/>
+			<method name="get_menu_model" symbol="gtk_menu_button_get_menu_model">
+				<return-type type="GMenuModel*"/>
 				<parameters>
 					<parameter name="menu_button" type="GtkMenuButton*"/>
 				</parameters>
 			</method>
-			<method name="get_menu_model" symbol="gtk_menu_button_get_menu_model">
-				<return-type type="GMenuModel*"/>
+			<method name="get_popup" symbol="gtk_menu_button_get_popup">
+				<return-type type="GtkMenu*"/>
 				<parameters>
 					<parameter name="menu_button" type="GtkMenuButton*"/>
 				</parameters>
@@ -15353,30 +15462,32 @@
 					<parameter name="direction" type="GtkArrowType"/>
 				</parameters>
 			</method>
-			<method name="set_menu" symbol="gtk_menu_button_set_menu">
+			<method name="set_menu_model" symbol="gtk_menu_button_set_menu_model">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="menu_button" type="GtkMenuButton*"/>
-					<parameter name="menu" type="GtkWidget*"/>
+					<parameter name="menu_model" type="GMenuModel*"/>
 				</parameters>
 			</method>
-			<method name="set_menu_model" symbol="gtk_menu_button_set_menu_model">
+			<method name="set_popup" symbol="gtk_menu_button_set_popup">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="menu_button" type="GtkMenuButton*"/>
-					<parameter name="menu_model" type="GMenuModel*"/>
+					<parameter name="popup" type="GtkWidget*"/>
 				</parameters>
 			</method>
 			<property name="align-widget" type="GtkContainer*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="direction" type="GtkArrowType" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="menu" type="GtkMenu*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="menu-model" type="GMenuModel*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="popup" type="GtkMenu*" readable="1" writable="1" construct="0" construct-only="0"/>
 		</object>
 		<object name="GtkMenuItem" parent="GtkBin" type-name="GtkMenuItem" get-type="gtk_menu_item_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
 				<interface name="GtkActivatable"/>
+				<interface name="GtkActionable"/>
 			</implements>
 			<method name="activate" symbol="gtk_menu_item_activate">
 				<return-type type="void"/>
@@ -15580,6 +15691,15 @@
 					<parameter name="child" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="bind_model" symbol="gtk_menu_shell_bind_model">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="menu_shell" type="GtkMenuShell*"/>
+					<parameter name="model" type="GMenuModel*"/>
+					<parameter name="action_namespace" type="gchar*"/>
+					<parameter name="with_separators" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="cancel" symbol="gtk_menu_shell_cancel">
 				<return-type type="void"/>
 				<parameters>
@@ -17963,6 +18083,7 @@
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
 				<interface name="GtkActivatable"/>
+				<interface name="GtkActionable"/>
 			</implements>
 			<method name="get_group" symbol="gtk_radio_menu_item_get_group">
 				<return-type type="GSList*"/>
@@ -19097,6 +19218,7 @@
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
 				<interface name="GtkActivatable"/>
+				<interface name="GtkActionable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_separator_menu_item_new">
 				<return-type type="GtkWidget*"/>
@@ -19234,6 +19356,7 @@
 			<property name="gtk-menu-popdown-delay" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-menu-popup-delay" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-modules" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gtk-primary-button-warps-slider" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-print-backends" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-print-preview-command" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-recent-files-limit" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -19367,6 +19490,7 @@
 				<interface name="GtkBuildable"/>
 				<interface name="GtkEditable"/>
 				<interface name="GtkCellEditable"/>
+				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="configure" symbol="gtk_spin_button_configure">
 				<return-type type="void"/>
@@ -21090,6 +21214,7 @@
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
 				<interface name="GtkActivatable"/>
+				<interface name="GtkActionable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_tearoff_menu_item_new">
 				<return-type type="GtkWidget*"/>
@@ -22132,6 +22257,18 @@
 					<parameter name="text_view" type="GtkTextView*"/>
 				</parameters>
 			</method>
+			<method name="get_input_hints" symbol="gtk_text_view_get_input_hints">
+				<return-type type="GtkInputHints"/>
+				<parameters>
+					<parameter name="text_view" type="GtkTextView*"/>
+				</parameters>
+			</method>
+			<method name="get_input_purpose" symbol="gtk_text_view_get_input_purpose">
+				<return-type type="GtkInputPurpose"/>
+				<parameters>
+					<parameter name="text_view" type="GtkTextView*"/>
+				</parameters>
+			</method>
 			<method name="get_iter_at_location" symbol="gtk_text_view_get_iter_at_location">
 				<return-type type="void"/>
 				<parameters>
@@ -22382,6 +22519,20 @@
 					<parameter name="indent" type="gint"/>
 				</parameters>
 			</method>
+			<method name="set_input_hints" symbol="gtk_text_view_set_input_hints">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="text_view" type="GtkTextView*"/>
+					<parameter name="hints" type="GtkInputHints"/>
+				</parameters>
+			</method>
+			<method name="set_input_purpose" symbol="gtk_text_view_set_input_purpose">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="text_view" type="GtkTextView*"/>
+					<parameter name="purpose" type="GtkInputPurpose"/>
+				</parameters>
+			</method>
 			<method name="set_justification" symbol="gtk_text_view_set_justification">
 				<return-type type="void"/>
 				<parameters>
@@ -22469,6 +22620,8 @@
 			<property name="editable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="im-module" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="indent" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="input-hints" type="GtkInputHints" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="input-purpose" type="GtkInputPurpose" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="justification" type="GtkJustification" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="left-margin" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="overwrite" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -26714,6 +26867,14 @@
 					<parameter name="region" type="cairo_region_t*"/>
 				</parameters>
 			</method>
+			<method name="insert_action_group" symbol="gtk_widget_insert_action_group">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="name" type="gchar*"/>
+					<parameter name="group" type="GActionGroup*"/>
+				</parameters>
+			</method>
 			<method name="intersect" symbol="gtk_widget_intersect">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -31406,15 +31567,15 @@
 				</parameters>
 			</vfunc>
 		</interface>
-		<constant name="GTK_BINARY_AGE" type="int" value="509"/>
+		<constant name="GTK_BINARY_AGE" type="int" value="602"/>
 		<constant name="GTK_INPUT_ERROR" type="int" value="-1"/>
-		<constant name="GTK_INTERFACE_AGE" type="int" value="0"/>
+		<constant name="GTK_INTERFACE_AGE" type="int" value="2"/>
 		<constant name="GTK_LEVEL_BAR_OFFSET_HIGH" type="char*" value="high"/>
 		<constant name="GTK_LEVEL_BAR_OFFSET_LOW" type="char*" value="low"/>
 		<constant name="GTK_MAJOR_VERSION" type="int" value="3"/>
 		<constant name="GTK_MAX_COMPOSE_LEN" type="int" value="7"/>
-		<constant name="GTK_MICRO_VERSION" type="int" value="9"/>
-		<constant name="GTK_MINOR_VERSION" type="int" value="5"/>
+		<constant name="GTK_MICRO_VERSION" type="int" value="2"/>
+		<constant name="GTK_MINOR_VERSION" type="int" value="6"/>
 		<constant name="GTK_PAPER_NAME_A3" type="char*" value="iso_a3"/>
 		<constant name="GTK_PAPER_NAME_A4" type="char*" value="iso_a4"/>
 		<constant name="GTK_PAPER_NAME_A5" type="char*" value="iso_a5"/>
@@ -31570,6 +31731,7 @@
 		<constant name="GTK_STYLE_CLASS_CELL" type="char*" value="cell"/>
 		<constant name="GTK_STYLE_CLASS_CHECK" type="char*" value="check"/>
 		<constant name="GTK_STYLE_CLASS_COMBOBOX_ENTRY" type="char*" value="combobox-entry"/>
+		<constant name="GTK_STYLE_CLASS_CURSOR_HANDLE" type="char*" value="cursor-handle"/>
 		<constant name="GTK_STYLE_CLASS_DEFAULT" type="char*" value="default"/>
 		<constant name="GTK_STYLE_CLASS_DIM_LABEL" type="char*" value="dim-label"/>
 		<constant name="GTK_STYLE_CLASS_DND" type="char*" value="dnd"/>