gtk3 vapi: GtkApplication additions

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 4460977c5476d8ef59043013d9d5a319ce88b2b9..a7dd2a9f2f62cc53d1458339aeaab700706730c8 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -557,16 +557,32 @@ namespace Gtk {
                public virtual signal void populate_popup (Gtk.Menu menu, GLib.AppInfo app_info);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class Application : GLib.Application, GLib.ActionGroup {
+       public class Application : GLib.Application, GLib.ActionGroup, GLib.ActionMap {
                [CCode (has_construct_function = false)]
                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 GLib.MenuModel get_app_menu ();
+               public unowned GLib.MenuModel get_menubar ();
                public unowned GLib.List<weak Gtk.Window> get_windows ();
+               public void remove_accelerator (string action_name, GLib.Variant parameter);
                public void remove_window (Gtk.Window window);
+               public void set_app_menu (GLib.MenuModel model);
+               public void set_menubar (GLib.MenuModel model);
+               public GLib.MenuModel app_menu { get; set; }
+               public GLib.MenuModel menubar { get; set; }
                public virtual signal void window_added (Gtk.Window window);
                public virtual signal void window_removed (Gtk.Window window);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
+       public class ApplicationWindow : Gtk.Window, Atk.Implementor, Gtk.Buildable, GLib.ActionGroup, GLib.ActionMap {
+               [CCode (has_construct_function = false, type = "GtkWidget*")]
+               public ApplicationWindow (Gtk.Application application);
+               public bool get_show_menubar ();
+               public void set_show_menubar (bool show_menubar);
+               public bool show_menubar { get; set construct; }
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public class Arrow : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Arrow (Gtk.ArrowType arrow_type, Gtk.ShadowType shadow_type);
@@ -3731,6 +3747,10 @@ namespace Gtk {
                [NoAccessorMethod]
                public Gtk.CornerType gtk_scrolled_window_placement { get; set; }
                [NoAccessorMethod]
+               public bool gtk_shell_shows_app_menu { get; set; }
+               [NoAccessorMethod]
+               public bool gtk_shell_shows_menubar { get; set; }
+               [NoAccessorMethod]
                public bool gtk_show_input_method_menu { get; set; }
                [NoAccessorMethod]
                public bool gtk_show_unicode_menu { get; set; }

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.gi b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
index 29ba5aa2ab2d72d72866c3684ab36f22a0ae05ee..81a969f8840caea10fb0df14cf0e522f5fec7973 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.gi
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
@@ -6666,7 +6666,17 @@
                <object name="GtkApplication" parent="GApplication" type-name="GtkApplication" get-type="gtk_application_get_type">
                        <implements>
                                <interface name="GActionGroup"/>
+                               <interface name="GActionMap"/>
                        </implements>
+                       <method name="add_accelerator" symbol="gtk_application_add_accelerator">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="application" type="GtkApplication*"/>
+                                       <parameter name="accelerator" type="gchar*"/>
+                                       <parameter name="action_name" type="gchar*"/>
+                                       <parameter name="parameter" type="GVariant*"/>
+                               </parameters>
+                       </method>
                        <method name="add_window" symbol="gtk_application_add_window">
                                <return-type type="void"/>
                                <parameters>
@@ -6674,6 +6684,18 @@
                                        <parameter name="window" type="GtkWindow*"/>
                                </parameters>
                        </method>
+                       <method name="get_app_menu" symbol="gtk_application_get_app_menu">
+                               <return-type type="GMenuModel*"/>
+                               <parameters>
+                                       <parameter name="application" type="GtkApplication*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_menubar" symbol="gtk_application_get_menubar">
+                               <return-type type="GMenuModel*"/>
+                               <parameters>
+                                       <parameter name="application" type="GtkApplication*"/>
+                               </parameters>
+                       </method>
                        <method name="get_windows" symbol="gtk_application_get_windows">
                                <return-type type="GList*"/>
                                <parameters>
@@ -6687,6 +6709,14 @@
                                        <parameter name="flags" type="GApplicationFlags"/>
                                </parameters>
                        </constructor>
+                       <method name="remove_accelerator" symbol="gtk_application_remove_accelerator">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="application" type="GtkApplication*"/>
+                                       <parameter name="action_name" type="gchar*"/>
+                                       <parameter name="parameter" type="GVariant*"/>
+                               </parameters>
+                       </method>
                        <method name="remove_window" symbol="gtk_application_remove_window">
                                <return-type type="void"/>
                                <parameters>
@@ -6694,6 +6724,22 @@
                                        <parameter name="window" type="GtkWindow*"/>
                                </parameters>
                        </method>
+                       <method name="set_app_menu" symbol="gtk_application_set_app_menu">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="application" type="GtkApplication*"/>
+                                       <parameter name="model" type="GMenuModel*"/>
+                               </parameters>
+                       </method>
+                       <method name="set_menubar" symbol="gtk_application_set_menubar">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="application" type="GtkApplication*"/>
+                                       <parameter name="model" type="GMenuModel*"/>
+                               </parameters>
+                       </method>
+                       <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"/>
                        <signal name="window-added" when="FIRST">
                                <return-type type="void"/>
                                <parameters>
@@ -6709,6 +6755,34 @@
                                </parameters>
                        </signal>
                </object>
+               <object name="GtkApplicationWindow" parent="GtkWindow" type-name="GtkApplicationWindow" get-type="gtk_application_window_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                               <interface name="GActionGroup"/>
+                               <interface name="GActionMap"/>
+                       </implements>
+                       <method name="get_show_menubar" symbol="gtk_application_window_get_show_menubar">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="window" type="GtkApplicationWindow*"/>
+                               </parameters>
+                       </method>
+                       <constructor name="new" symbol="gtk_application_window_new">
+                               <return-type type="GtkWidget*"/>
+                               <parameters>
+                                       <parameter name="application" type="GtkApplication*"/>
+                               </parameters>
+                       </constructor>
+                       <method name="set_show_menubar" symbol="gtk_application_window_set_show_menubar">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="window" type="GtkApplicationWindow*"/>
+                                       <parameter name="show_menubar" type="gboolean"/>
+                               </parameters>
+                       </method>
+                       <property name="show-menubar" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+               </object>
                <object name="GtkArrow" parent="GtkMisc" type-name="GtkArrow" get-type="gtk_arrow_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
@@ -18781,6 +18855,8 @@
                        <property name="gtk-recent-files-limit" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="gtk-recent-files-max-age" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="gtk-scrolled-window-placement" type="GtkCornerType" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-shell-shows-app-menu" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="gtk-shell-shows-menubar" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="gtk-show-input-method-menu" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="gtk-show-unicode-menu" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="gtk-sound-theme-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>