diff options
| author | Matthias Clasen <maclas@gmx.de> | 2003-12-31 01:05:57 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2003-12-31 01:05:57 +0000 |
| commit | e902118f0ff740716db431d2775be4486b41ce7f (patch) | |
| tree | d6f09bdc3254aed8dbf2af328233c52bb6b1b743 /tests | |
| parent | cf60a5987473cdf22fa89f44dd1beccaa17b41fc (diff) | |
| download | gtk+-e902118f0ff740716db431d2775be4486b41ce7f.tar.gz | |
Pull accelerator key from the stock item if stock_id is given, but
Wed Dec 31 02:05:39 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkactiongroup.c (gtk_action_group_add_actions_full):
(gtk_action_group_add_toggle_actions_full):
(gtk_action_group_add_radio_actions_full): Pull accelerator key
from the stock item if stock_id is given, but accelerator
not. (Noticed by Jeff Franks and Jody Goldberg)
* tests/testmerge.c: Remove the accelerator from the "Open" entry
to test the above change.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testmerge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/testmerge.c b/tests/testmerge.c index ff78028e46..09f190e89b 100644 --- a/tests/testmerge.c +++ b/tests/testmerge.c @@ -138,7 +138,7 @@ static GtkActionEntry entries[] = { { "QuitAction", GTK_STOCK_QUIT, NULL, "<control>q", "Quit", G_CALLBACK (gtk_main_quit) }, { "NewAction", GTK_STOCK_NEW, NULL, "<control>n", "Create something", G_CALLBACK (activate_action) }, { "New2Action", GTK_STOCK_NEW, NULL, "<control>m", "Create something else", G_CALLBACK (activate_action) }, - { "OpenAction", GTK_STOCK_OPEN, NULL, "<control>o", "Open it", G_CALLBACK (activate_action) }, + { "OpenAction", GTK_STOCK_OPEN, NULL, NULL, "Open it", G_CALLBACK (activate_action) }, { "CutAction", GTK_STOCK_CUT, NULL, "<control>x", "Knive", G_CALLBACK (activate_action) }, { "CopyAction", GTK_STOCK_COPY, NULL, "<control>c", "Copy", G_CALLBACK (activate_action) }, { "PasteAction", GTK_STOCK_PASTE, NULL, "<control>v", "Paste", G_CALLBACK (activate_action) }, |