Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 06:01:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed menu glyph stuff.

Browse source 
Use MenuEvent in stead of MenuKey.
This commit is contained in:
Jack Jansen 1999-12-15 15:45:23 +00:00
parent 8a9fdff6d7
commit c15e43a2da
1 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Mac/Lib/FrameWork.py
View file

@ -311,26 +311,21 @@ def do_autoKey(self, event):
def do_key(self, event): def do_key(self, event):
(what, message, when, where, modifiers) = event (what, message, when, where, modifiers) = event
c = chr(message & charCodeMask) c = chr(message & charCodeMask)
if self.menubar:
result = MenuEvent(event)
id = (result>>16) & 0xffff # Hi word
item = result & 0xffff # Lo word
if id:
self.do_rawmenu(id, item, None, event)
return
# Otherwise we fall-through
if modifiers & cmdKey: if modifiers & cmdKey:
if c == '.': if c == '.':
raise self raise self
else: else:
if not self.menubar: if not self.menubar:
MacOS.HandleEvent(event) MacOS.HandleEvent(event)
return return
result = MenuKey(ord(c))
id = (result>>16) & 0xffff # Hi word
item = result & 0xffff # Lo word
if id:
self.do_rawmenu(id, item, None, event)
# elif c == 'w':
# w = FrontWindow()
# if w:
# self.do_close(w)
# else:
# if DEBUG: print 'Command-W without front window'
else:
if DEBUG: print "Command-" +`c`
else: else:
# See whether the front window wants it # See whether the front window wants it
w = FrontWindow() w = FrontWindow()
@ -533,7 +528,7 @@ def additem(self, label, shortcut=None, callback=None, kind=None):
self.menu.SetItemCmd(item, ord(char)) self.menu.SetItemCmd(item, ord(char))
self.menu.SetMenuItemModifiers(item, modifiers) self.menu.SetMenuItemModifiers(item, modifiers)
if len(shortcut) > 2: if len(shortcut) > 2:
self.menu.SetMenuItem self.menu.SetMenuItemKeyGlyph(item, shortcut[2])
elif shortcut: elif shortcut:
self.menu.SetItemCmd(item, ord(shortcut)) self.menu.SetItemCmd(item, ord(shortcut))
return item return item