AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix wrong refencences in the docs

Browse Source 
Replace all references to g_application_set_app_menu and
g_application_set_menubar by their gtk variants, which
actually exist. Pointed out in bug 667546
This commit is contained in:
Matthias Clasen 2012-01-09 17:30:09 -05:00
parent 64f3347cd7
commit 9cb4518a24
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkapplication.c
View File

@ -76,10 +76,10 @@
* 'open' #GApplication methods. * 'open' #GApplication methods.
* *
* To set an application menu on a GtkApplication, use * To set an application menu on a GtkApplication, use
* g_application_set_app_menu(). The #GMenuModel that this function * gtk_application_set_app_menu(). The #GMenuModel that this function
* expects is usually constructed using #GtkBuilder, as seen in the * expects is usually constructed using #GtkBuilder, as seen in the
* following example. To set a menubar that will be automatically picked * following example. To set a menubar that will be automatically picked
* up by #GApplicationWindows, use g_application_set_menubar(). GTK+ * up by #GApplicationWindows, use gtk_application_set_menubar(). GTK+
* makes these menus appear as expected, depending on the platform * makes these menus appear as expected, depending on the platform
* the application is running on. * the application is running on.
* *
@ -855,8 +855,8 @@ gtk_application_get_windows (GtkApplication *application)
* with a "win." prefix. * with a "win." prefix.
* *
* GtkApplication also extracts accelerators out of 'accel' attributes * GtkApplication also extracts accelerators out of 'accel' attributes
* in the #GMenuModels passed to g_application_set_app_menu() and * in the #GMenuModels passed to gtk_application_set_app_menu() and
* g_application_set_menubar(), which is usually more convenient * gtk_application_set_menubar(), which is usually more convenient
* than calling this function for each accelerator. * than calling this function for each accelerator.
* *
* Since: 3.4 * Since: 3.4
@ -958,7 +958,7 @@ gtk_application_set_app_menu (GtkApplication *application,
* @application: a #GtkApplication * @application: a #GtkApplication
* *
* Returns the menu model that has been set with * Returns the menu model that has been set with
* g_application_set_app_menu(). * gtk_application_set_app_menu().
* *
* Returns: (transfer none): the application menu of @application * Returns: (transfer none): the application menu of @application
* *
@ -1008,7 +1008,7 @@ gtk_application_set_menubar (GtkApplication *application,
* @application: a #GtkApplication * @application: a #GtkApplication
* *
* Returns the menu model that has been set with * Returns the menu model that has been set with
* g_application_set_menubar(). * gtk_application_set_menubar().
* *
* Returns: (transfer none): the menubar for windows of @application * Returns: (transfer none): the menubar for windows of @application
* *

12
gtk/gtkapplicationwindow.c
View File

@ -43,8 +43,8 @@
* GtkApplicationWindow is a #GtkWindow subclass that offers some * GtkApplicationWindow is a #GtkWindow subclass that offers some
* extra functionality for better integration with #GtkApplication * extra functionality for better integration with #GtkApplication
* features. Notably, it can handle both the application menu as well * features. Notably, it can handle both the application menu as well
* as the menubar. See g_application_set_app_menu() and * as the menubar. See gtk_application_set_app_menu() and
* g_application_set_menubar(). * gtk_application_set_menubar().
* *
* This class implements the #GActionGroup and #GActionMap interfaces, * This class implements the #GActionGroup and #GActionMap interfaces,
* to let you add window-specific actions that will be exported by the * to let you add window-specific actions that will be exported by the
@ -88,8 +88,8 @@
* " </submenu>" * " </submenu>"
* " </menu>" * " </menu>"
* "</interface>"); * "</interface>");
* g_application_set_menubar (G_APPLICATION (app), * gtk_application_set_menubar (G_APPLICATION (app),
* G_MENU_MODEL (gtk_builder_get_object (builder, "menubar"))); * G_MENU_MODEL (gtk_builder_get_object (builder, "menubar")));
* g_object_unref (builder); * g_object_unref (builder);
* *
* ... * ...
@ -902,8 +902,8 @@ gtk_application_window_class_init (GtkApplicationWindowClass *class)
* *
* If this property is %TRUE, the window will display a menubar * If this property is %TRUE, the window will display a menubar
* that includes the app menu and menubar, unless these are * that includes the app menu and menubar, unless these are
* shown by the desktop shell. See g_application_set_app_menu() * shown by the desktop shell. See gtk_application_set_app_menu()
* and g_application_set_menubar(). * and gtk_application_set_menubar().
* *
* If %FALSE, the window will not display a menubar, regardless * If %FALSE, the window will not display a menubar, regardless
* of whether the desktop shell is showing the menus or not. * of whether the desktop shell is showing the menus or not.