Make 3.0 parallel-installable to 2.x

[~andy/gtk] / docs / reference / gtk / tmpl / gtkmenu.sgml

diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml
index bcdb163cb66654a2786d2e3368fb49de7a4f52c1..d0497ae5680118f690fad136175cfafc6472f385 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenu.sgml
@@ -79,6 +79,9 @@ my_popup_handler (GtkWidget *widget, GdkEvent *event)
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkMenu ##### -->
 <para>
 The #GtkMenu struct contains private data only, and
@@ -119,6 +122,11 @@ should be accessed using the functions below.
 
 </para>
 
+<!-- ##### ARG GtkMenu:reserve-toggle-size ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkMenu:tearoff-state ##### -->
 <para>
 
@@ -149,6 +157,16 @@ should be accessed using the functions below.
 
 </para>
 
+<!-- ##### ARG GtkMenu:arrow-placement ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMenu:arrow-scaling ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkMenu:double-arrows ##### -->
 <para>
 
@@ -179,6 +197,7 @@ should be accessed using the functions below.
 Creates a new #GtkMenu.
 </para>
 
+@void: 
 @Returns: a new #GtkMenu.
 
 
@@ -191,39 +210,6 @@ Creates a new #GtkMenu.
 @screen: 
 
 
-<!-- ##### MACRO gtk_menu_append ##### -->
-<para>
-Adds a new #GtkMenuItem to the end of the menu's item list.
-</para>
-
-@menu: a #GtkMenu.
-@child: The #GtkMenuItem to add.
-@Deprecated: Use gtk_menu_shell_append() instead.
-
-
-<!-- ##### MACRO gtk_menu_prepend ##### -->
-<para>
-Adds a new #GtkMenuItem to the beginning of the menu's item list.
-</para>
-
-@menu: a #GtkMenu.
-@child: The #GtkMenuItem to add.
-@Deprecated: Use gtk_menu_shell_prepend() instead.
-
-
-<!-- ##### MACRO gtk_menu_insert ##### -->
-<para>
-Adds a new #GtkMenuItem to the menu's item list at the position
-indicated by @position. 
-</para>
-
-@menu: a #GtkMenu.
-@child: The #GtkMenuItem to add.
-@pos: The position in the item list where @child is added.
-      Positions are numbered from 0 to n-1.
-@Deprecated: Use gtk_menu_shell_insert() instead.
-
-
 <!-- ##### FUNCTION gtk_menu_reorder_child ##### -->
 <para>
 Moves a #GtkMenuItem to a new position within the #GtkMenu.
@@ -291,6 +277,15 @@ See gtk_menu_set_accel_group().
 @accel_path: 
 
 
+<!-- ##### FUNCTION gtk_menu_get_accel_path ##### -->
+<para>
+
+</para>
+
+@menu: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_menu_set_title ##### -->
 <para>
 </para>
@@ -299,6 +294,33 @@ See gtk_menu_set_accel_group().
 @title: 
 
 
+<!-- ##### FUNCTION gtk_menu_get_title ##### -->
+<para>
+
+</para>
+
+@menu: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_menu_set_monitor ##### -->
+<para>
+
+</para>
+
+@menu: 
+@monitor_num: 
+
+
+<!-- ##### FUNCTION gtk_menu_get_monitor ##### -->
+<para>
+
+</para>
+
+@menu: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_menu_get_tearoff_state ##### -->
 <para>
 
@@ -308,7 +330,16 @@ See gtk_menu_set_accel_group().
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_menu_get_title ##### -->
+<!-- ##### FUNCTION gtk_menu_set_reserve_toggle_size ##### -->
+<para>
+
+</para>
+
+@menu: 
+@reserve_toggle_size: 
+
+
+<!-- ##### FUNCTION gtk_menu_get_reserve_toggle_size ##### -->
 <para>
 
 </para>
@@ -412,6 +443,8 @@ Returns the #GtkWidget that the menu is attached to.
 A user function supplied when calling gtk_menu_popup() which controls the
 positioning of the menu when it is displayed.  The function sets the @x
 and @y parameters to the coordinates where the menu is to be drawn.
+To make the menu appear on a different monitor than the mouse pointer,
+gtk_menu_set_monitor() must be called.
 </para>
 
 @menu: a #GtkMenu.
@@ -420,7 +453,7 @@ menu shall be drawn.  This is an output parameter.
 @y: address of the #gint representing the vertical position where the
 menu shall be drawn.  This is an output parameter.
 @push_in: This parameter controls how menus placed outside the monitor are handled.
-        If this is set to TRUE and part of the menu is outside the monitor then
+        If this is set to %TRUE and part of the menu is outside the monitor then
         GTK+ pushes the window into the visible area, effectively modifying the
         popup position.
         Note that moving and possibly resizing the menu around will alter the
@@ -429,9 +462,6 @@ menu shall be drawn.  This is an output parameter.
         In practice, this behavior is only useful for combobox popups or option
         menus and cannot be used to simply confine a menu to monitor boundaries.
         In that case, changing the scroll offset is not desirable.
-        To simply constrain the menu within the monitor, get its size with
-        gtk_widget_size_request() before showing it, and alter the coordinates
-        passed to gtk_menu_popup() accordingly.
 @user_data: the data supplied by the user in the gtk_menu_popup() @data
 parameter.
 
@@ -446,12 +476,3 @@ will be called when the menu is later detached from the widget.
 @menu: the #GtkMenu being detached.
 
 
-<!-- ##### FUNCTION gtk_menu_set_monitor ##### -->
-<para>
-
-</para>
-
-@menu: 
-@monitor_num: 
-
-