[gtk+/wip/gmenu] Show off some menus
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/gmenu] Show off some menus
- Date: Thu, 15 Dec 2011 05:26:46 +0000 (UTC)
commit 764827940e5c07028656b36334dda5b357435d6a
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Dec 15 00:26:02 2011 -0500
Show off some menus
docs/reference/gtk/Makefile.am | 4 +++-
docs/reference/gtk/images/bloatpad-gnome.png | Bin 0 -> 42936 bytes
docs/reference/gtk/images/bloatpad-osx.png | Bin 0 -> 25036 bytes
gtk/gtkapplication.c | 20 +++++++++++++++-----
4 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 4e64367..29c6fb4 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -365,7 +365,9 @@ HTML_IMAGES = \
$(srcdir)/images/handles.png \
$(srcdir)/images/extensions.png \
$(srcdir)/images/numerableicon.png \
- $(srcdir)/images/numerableicon2.png
+ $(srcdir)/images/numerableicon2.png \
+ $(srcdir)/images/bloatpad-osx.png \
+ $(srcdir)/images/bloatpad-gnome.png
# Extra options to supply to gtkdoc-fixref
FIXXREF_OPTIONS=--extra-dir=../gdk/html \
diff --git a/docs/reference/gtk/images/bloatpad-gnome.png b/docs/reference/gtk/images/bloatpad-gnome.png
new file mode 100644
index 0000000..c07a181
Binary files /dev/null and b/docs/reference/gtk/images/bloatpad-gnome.png differ
diff --git a/docs/reference/gtk/images/bloatpad-osx.png b/docs/reference/gtk/images/bloatpad-osx.png
new file mode 100644
index 0000000..4ece5ec
Binary files /dev/null and b/docs/reference/gtk/images/bloatpad-osx.png differ
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 7ff1ed0..7663dd8 100644
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -61,11 +61,21 @@
* While GtkApplication works fine with plain #GtkWindows, it is recommended
* to use it together with #GtkApplicationWindow.
*
- * To set an app menu on a GtkApplication, use g_application_set_app_menu().
- * The #GMenuModel that this function expects is usually constructed using
- * #GtkBuilder, as seen in the following example. To set a menubar that will
- * be automatically picked up by #GApplicationWindows, use
- * g_application_set_menubar().
+ * To set an application menu on a GtkApplication, use
+ * g_application_set_app_menu(). The #GMenuModel that this function
+ * expects is usually constructed using #GtkBuilder, as seen in the
+ * following example. To set a menubar that will be automatically picked
+ * up by #GApplicationWindows, use g_application_set_menubar(). GTK+
+ * makes these menus appear as expected, depending on the platform
+ * the application is running on.
+ *
+ * <figure label="Menu integration in OS X">
+ * <graphic fileref="bloatpad-osx.png" format="PNG"/>
+ * </figure>
+ *
+ * <figure label="Menu integration in GNOME">
+ * <graphic fileref="bloatpad-gnome.png" format="PNG"/>
+ * </figure>
*
* <example id="gtkapplication"><title>A simple application</title>
* <programlisting>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]