Add a note to the docs about how to use this in the context of changeable

Sat Mar  2 20:39:38 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkimagemenuitem.c (gtk_image_menu_item_new_from_stock):
        Add a note to the docs about how to use this in the
        context of changeable accelerators. (#72382, Mark Patton)

diff --git a/ChangeLog b/ChangeLog
index 5e4239a1bf98b96daf1733283202c63b55560d9e..cfd214a9cf530e81811872fa3f6aed685681b0c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+Sat Mar  2 20:39:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimagemenuitem.c (gtk_image_menu_item_new_from_stock): 
+       Add a note to the docs about how to use this in the 
+       context of changeable accelerators. (#72382, Mark Patton)
+
 Sat Mar  2 19:48:10 2002  Owen Taylor  <otaylor@redhat.com>
 
-       * configure.in: Add -lX11 into x_libs.
+       * configure.in: Fix missing -lX11 into x_libs with pangoxft.
 
 Fri Mar  1 00:46:49 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5e4239a1bf98b96daf1733283202c63b55560d9e..cfd214a9cf530e81811872fa3f6aed685681b0c3 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,6 +1,12 @@
+Sat Mar  2 20:39:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimagemenuitem.c (gtk_image_menu_item_new_from_stock): 
+       Add a note to the docs about how to use this in the 
+       context of changeable accelerators. (#72382, Mark Patton)
+
 Sat Mar  2 19:48:10 2002  Owen Taylor  <otaylor@redhat.com>
 
-       * configure.in: Add -lX11 into x_libs.
+       * configure.in: Fix missing -lX11 into x_libs with pangoxft.
 
 Fri Mar  1 00:46:49 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5e4239a1bf98b96daf1733283202c63b55560d9e..cfd214a9cf530e81811872fa3f6aed685681b0c3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,6 +1,12 @@
+Sat Mar  2 20:39:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimagemenuitem.c (gtk_image_menu_item_new_from_stock): 
+       Add a note to the docs about how to use this in the 
+       context of changeable accelerators. (#72382, Mark Patton)
+
 Sat Mar  2 19:48:10 2002  Owen Taylor  <otaylor@redhat.com>
 
-       * configure.in: Add -lX11 into x_libs.
+       * configure.in: Fix missing -lX11 into x_libs with pangoxft.
 
 Fri Mar  1 00:46:49 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5e4239a1bf98b96daf1733283202c63b55560d9e..cfd214a9cf530e81811872fa3f6aed685681b0c3 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,6 +1,12 @@
+Sat Mar  2 20:39:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimagemenuitem.c (gtk_image_menu_item_new_from_stock): 
+       Add a note to the docs about how to use this in the 
+       context of changeable accelerators. (#72382, Mark Patton)
+
 Sat Mar  2 19:48:10 2002  Owen Taylor  <otaylor@redhat.com>
 
-       * configure.in: Add -lX11 into x_libs.
+       * configure.in: Fix missing -lX11 into x_libs with pangoxft.
 
 Fri Mar  1 00:46:49 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5e4239a1bf98b96daf1733283202c63b55560d9e..cfd214a9cf530e81811872fa3f6aed685681b0c3 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,6 +1,12 @@
+Sat Mar  2 20:39:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimagemenuitem.c (gtk_image_menu_item_new_from_stock): 
+       Add a note to the docs about how to use this in the 
+       context of changeable accelerators. (#72382, Mark Patton)
+
 Sat Mar  2 19:48:10 2002  Owen Taylor  <otaylor@redhat.com>
 
-       * configure.in: Add -lX11 into x_libs.
+       * configure.in: Fix missing -lX11 into x_libs with pangoxft.
 
 Fri Mar  1 00:46:49 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5e4239a1bf98b96daf1733283202c63b55560d9e..cfd214a9cf530e81811872fa3f6aed685681b0c3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,6 +1,12 @@
+Sat Mar  2 20:39:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimagemenuitem.c (gtk_image_menu_item_new_from_stock): 
+       Add a note to the docs about how to use this in the 
+       context of changeable accelerators. (#72382, Mark Patton)
+
 Sat Mar  2 19:48:10 2002  Owen Taylor  <otaylor@redhat.com>
 
-       * configure.in: Add -lX11 into x_libs.
+       * configure.in: Fix missing -lX11 into x_libs with pangoxft.
 
 Fri Mar  1 00:46:49 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5e4239a1bf98b96daf1733283202c63b55560d9e..cfd214a9cf530e81811872fa3f6aed685681b0c3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,6 +1,12 @@
+Sat Mar  2 20:39:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimagemenuitem.c (gtk_image_menu_item_new_from_stock): 
+       Add a note to the docs about how to use this in the 
+       context of changeable accelerators. (#72382, Mark Patton)
+
 Sat Mar  2 19:48:10 2002  Owen Taylor  <otaylor@redhat.com>
 
-       * configure.in: Add -lX11 into x_libs.
+       * configure.in: Fix missing -lX11 into x_libs with pangoxft.
 
 Fri Mar  1 00:46:49 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c
index 19f8f41014daf434b7969ccfcb0e012de91cee6d..a51ccf0248021f9dfcafdbb376ca3b2aab62ae8b 100644 (file)
--- a/gtk/gtkimagemenuitem.c
+++ b/gtk/gtkimagemenuitem.c
@@ -350,12 +350,19 @@ gtk_image_menu_item_new_with_mnemonic (const gchar *label)
 /**
  * gtk_image_menu_item_new_from_stock:
  * @stock_id: the name of the stock item.
- * @accel_group: the #GtkAccelGroup to add the menu items accelerator to.
+ * @accel_group: the #GtkAccelGroup to add the menu items accelerator to,
+ *   or %NULL.
  * @returns: a new #GtkImageMenuItem.
  *
  * Creates a new #GtkImageMenuItem containing the image and text from a 
  * stock item. Some stock ids have preprocessor macros like #GTK_STOCK_OK 
  * and #GTK_STOCK_APPLY.
+ *
+ * If you want this menu item to have changeable accelerators, then
+ * pass in %NULL for @accel_group call gtk_menu_item_set_accel_path()
+ * with an appropriate path for the menu item, then use gtk_stock_lookup()
+ * too look up the standard accelerator for the stock item and
+ * if one is found, call gtk_accel_map_add_entry() to register it.
  **/
 GtkWidget*
 gtk_image_menu_item_new_from_stock (const gchar      *stock_id,