summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2011-12-15 00:26:02 -0500
committerRyan Lortie <desrt@desrt.ca>2011-12-19 12:51:12 -0500
commit080007d7cbdfe75b52420658c287e665ea6f2366 (patch)
tree2f2734b4f8816bd86c09c68827a65d35d3299de8
parent06a75b7e1ff11a3bde914b1f1a1376f3c86a1098 (diff)
downloadgtk+-080007d7cbdfe75b52420658c287e665ea6f2366.tar.gz
Show off some menus
-rw-r--r--docs/reference/gtk/Makefile.am4
-rw-r--r--docs/reference/gtk/images/bloatpad-gnome.pngbin0 -> 42936 bytes
-rw-r--r--docs/reference/gtk/images/bloatpad-osx.pngbin0 -> 25036 bytes
-rw-r--r--gtk/gtkapplication.c20
4 files changed, 18 insertions, 6 deletions
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 4e64367666..29c6fb4044 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 0000000000..c07a181761
--- /dev/null
+++ b/docs/reference/gtk/images/bloatpad-gnome.png
Binary files differ
diff --git a/docs/reference/gtk/images/bloatpad-osx.png b/docs/reference/gtk/images/bloatpad-osx.png
new file mode 100644
index 0000000000..4ece5ec2ee
--- /dev/null
+++ b/docs/reference/gtk/images/bloatpad-osx.png
Binary files differ
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 7ff1ed0a4a..7663dd8448 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>