summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvincentdarley <vincentdarley>2002-10-16 09:51:54 (GMT)
committervincentdarley <vincentdarley>2002-10-16 09:51:54 (GMT)
commitfe92af5d800783c0c094c38d612c2689223bd2a4 (patch)
tree1ba3342a871b66d86d08268ab4b1e6fc2f6ce0d8
parent03f367635727f9495842c09482cba28c630eb31f (diff)
downloadtk-fe92af5d800783c0c094c38d612c2689223bd2a4.zip
tk-fe92af5d800783c0c094c38d612c2689223bd2a4.tar.gz
tk-fe92af5d800783c0c094c38d612c2689223bd2a4.tar.bz2
macosx menu accelerator fix
-rw-r--r--ChangeLog5
-rw-r--r--macosx/tkMacOSXMenu.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ce4919a..dcaf94f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-16 Vince Darley <vincentdarley@users.sourceforge.net>
+
+ * macosx/tkMacOSXMenu.c: fix to accelerators shown in menus
+ with non-alphanumeric keys.
+
2002-10-15 Jeff Hobbs <jeffh@ActiveState.com>
* unix/configure:
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 401bce5..2c8f173 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.3 2002/09/09 23:52:02 hobbs Exp $
+ * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.4 2002/10/16 09:51:54 vincentdarley Exp $
*/
#include "tkMacOSXInt.h"
#include "tkMenuButton.h"
@@ -1232,10 +1232,8 @@ ReconfigureIndividualMenu(
}
if (glyph != 0x0) {
SetMenuItemKeyGlyph(macMenuHdl, base + index, glyph);
- if (modifiers == 0) {
- if (!hasCmd) {
- modifiers |= kMenuNoCommandModifier;
- }
+ if (!hasCmd) {
+ modifiers |= kMenuNoCommandModifier;
}
}
}