Show off some menus

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 4e64367666453592503b529ef07bb9d7b2722058..29c6fb40447364fb7e491f9383d4b9a64c770fbd 100644 (file)
--- 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 (file)
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 (file)
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 7ff1ed0a4aa518497b1a7f179bd6c911c28cc0e4..7663dd84483bd9e440b8cea35dd56e57fc2e6ab6 100644 (file)
--- 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>