s/columns/rows/ in docs. (#70199)

[~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 b8f6c879354f39e68fa2b852deeb6fbb9f7d7dc5..fd266c3f822d9ed70090b954464ad67fb76e88eb 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenu.sgml
@@ -32,8 +32,8 @@ can pop up a menu when the 3rd mouse button is pressed.
 <title>Connecting the popup signal handler.</title>
 <programlisting>
     /* connect our handler which will popup the menu */
-    gtk_signal_connect_object(GTK_OBJECT(window), "button_press_event",
-       GTK_SIGNAL_FUNC (my_popup_handler), GTK_OBJECT(menu));
+    g_signal_connect_swapped (GTK_OBJECT (window), "button_press_event",
+       G_CALLBACK (my_popup_handler), GTK_OBJECT (menu));
 </programlisting>
 </example>
 
@@ -41,7 +41,7 @@ can pop up a menu when the 3rd mouse button is pressed.
 <title>Signal handler which displays a popup menu.</title>
 <programlisting>
 static gint
-my_popup_handler(GtkWidget *widget, GdkEvent *event)
+my_popup_handler (GtkWidget *widget, GdkEvent *event)
 {
   GtkMenu *menu;
   GdkEventButton *event_button;
@@ -51,7 +51,7 @@ my_popup_handler(GtkWidget *widget, GdkEvent *event)
   g_return_val_if_fail (event != NULL, FALSE);
 
   /* The "widget" is the menu that was supplied when 
-   * gtk_signal_connect_object was called.
+   * g_signal_connect_swapped() was called.
    */
   menu = GTK_MENU (widget);
 
@@ -78,7 +78,7 @@ my_popup_handler(GtkWidget *widget, GdkEvent *event)
 
 <!-- ##### STRUCT GtkMenu ##### -->
 <para>
-The #GtkMenu-struct struct contains private data only, and
+The #GtkMenu struct contains private data only, and
 should be accessed using the functions below.
 </para>
 
@@ -145,7 +145,7 @@ Moves a #GtkMenuItem to a new position within the #GtkMenu.
 <para>
 Displays a menu and makes it available for selection.  Applications can use
 this function to display context-sensitive menus, and will typically supply
-NULL for the @parent_menu_shell, @parent_menu_item, @func and @data 
+%NULL for the @parent_menu_shell, @parent_menu_item, @func and @data 
 parameters.  The default menu positioning function will position the menu
 at the current pointer position.
 </para>
@@ -162,6 +162,9 @@ at the current pointer position.
 <!-- ##### FUNCTION gtk_menu_set_accel_group ##### -->
 <para>
 Set the #GtkAccelGroup which holds global accelerators for the menu.
+This accelerator group needs to also be added to all windows that
+this menu is being used in with gtk_window_add_accel_group(), in order
+for those windows to support all the accelerators contained in this group.
 </para>
 
 @menu: a #GtkMenu.
@@ -170,21 +173,29 @@ Set the #GtkAccelGroup which holds global accelerators for the menu.
 
 <!-- ##### FUNCTION gtk_menu_get_accel_group ##### -->
 <para>
+Gets the #GtkAccelGroup which holds global accelerators for the menu.
+See gtk_menu_set_accel_group().
+</para>
+
+@menu: a #GtkMenu.
+@Returns: the #GtkAccelGroup associated with the menu.
+
+
+<!-- ##### FUNCTION gtk_menu_set_accel_path ##### -->
+<para>
 
 </para>
 
 @menu: 
-@Returns: 
+@accel_path: 
 
 
 <!-- ##### FUNCTION gtk_menu_set_title ##### -->
 <para>
-Sets the title string for the menu.  The title is displayed when the menu
-is shown as a tearoff menu.
 </para>
 
-@menu: a #GtkMenu.
-@title: a string containing the title for the menu.
+@menu: 
+@title: 
 
 
 <!-- ##### FUNCTION gtk_menu_get_tearoff_state ##### -->
@@ -235,7 +246,7 @@ selection has not yet been made, the first menu item is selected.
 <!-- ##### FUNCTION gtk_menu_set_active ##### -->
 <para>
 Selects the specified menu item within the menu.  This is used by the
-#GtkOptionMenu.
+#GtkOptionMenu and should not be used by anyone else.
 </para>
 
 @menu: a #GtkMenu.
@@ -252,7 +263,7 @@ or reattached.
 </para>
 
 @menu: a #GtkMenu.
-@torn_off: If TRUE, menu is displayed as a tearoff menu.
+@torn_off: If %TRUE, menu is displayed as a tearoff menu.
 
 
 <!-- ##### FUNCTION gtk_menu_attach_to_widget ##### -->