If a menu shortcut is a tuple in stead of a char it is a tuple (modifierkeys, char...

diff --git a/Mac/Lib/FrameWork.py b/Mac/Lib/FrameWork.py
index 899811a3d7eb1d1796ebe42bfdbb75ecd1787d38..42ef1280d4470d6118a162b055d4336ad7b5b542 100644 (file)
--- a/Mac/Lib/FrameWork.py
+++ b/Mac/Lib/FrameWork.py
@@ -528,7 +528,13 @@ class Menu:
                self.items.append(label, shortcut, callback, kind)
                item = len(self.items)
                self.menu.SetMenuItemText(item, label)          # set the actual text
-               if shortcut:
+               if shortcut and type(shortcut) == type(()):
+                       modifiers, char = shortcut[:2]
+                       self.menu.SetItemCmd(item, ord(char))
+                       self.menu.SetMenuItemModifiers(item, modifiers)
+                       if len(shortcut) > 2:
+                               self.menu.SetMenuItem
+               elif shortcut:  
                        self.menu.SetItemCmd(item, ord(shortcut))
                return item
                
@@ -1018,9 +1024,9 @@ class TestApp(Application):
                self.saveitem = MenuItem(m, "Save", "S", self.save)
                Separator(m)
                self.optionsmenu = mm = SubMenu(m, "Options")
-               self.opt1 = CheckItem(mm, "Arguments")
-               self.opt2 = CheckItem(mm, "Being hit on the head lessons")
-               self.opt3 = CheckItem(mm, "Complaints")
+               self.opt1 = CheckItem(mm, "Arguments", "A")
+               self.opt2 = CheckItem(mm, "Being hit on the head lessons", (kMenuOptionModifier, "A"))
+               self.opt3 = CheckItem(mm, "Complaints", (kMenuOptionModifier|kMenuNoCommandModifier, "A"))
                Separator(m)
                self.quititem = MenuItem(m, "Quit", "Q", self.quit)