mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Patch 1693258: Fix for duplicate "preferences" menu-OS X

Browse source
This commit is contained in:
Ronald Oussoren 2007-07-09 06:02:21 +00:00
parent e3b185f966
commit 9b0bcc1f4b
1 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Lib/idlelib/macosxSupport.py
View file

@ -3,6 +3,7 @@ A number of function that enhance IDLE on MacOSX when it used as a normal
GUI application (as opposed to an X11 application). GUI application (as opposed to an X11 application).
""" """
import sys import sys
import Tkinter
def runningAsOSXApp(): def runningAsOSXApp():
""" Returns True iff running from the IDLE.app bundle on OSX """ """ Returns True iff running from the IDLE.app bundle on OSX """
@ -23,7 +24,11 @@ def addOpenEventSupport(root, flist):
root.createcommand("::tk::mac::OpenDocument", doOpenFile) root.createcommand("::tk::mac::OpenDocument", doOpenFile)
def hideTkConsole(root): def hideTkConsole(root):
root.tk.call('console', 'hide') try:
root.tk.call('console', 'hide')
except Tkinter.TclError:
# Some versions of the Tk framework don't have a console object
pass
def overrideRootMenu(root, flist): def overrideRootMenu(root, flist):
""" """
@ -75,32 +80,40 @@ def overrideRootMenu(root, flist):
import configDialog import configDialog
configDialog.ConfigDialog(root, 'Settings') configDialog.ConfigDialog(root, 'Settings')
root.bind('<<about-idle>>', about_dialog) root.bind('<<about-idle>>', about_dialog)
root.bind('<<open-config-dialog>>', config_dialog) root.bind('<<open-config-dialog>>', config_dialog)
if flist: if flist:
root.bind('<<close-all-windows>>', flist.close_all_callback) root.bind('<<close-all-windows>>', flist.close_all_callback)
for mname, entrylist in Bindings.menudefs:
menu = menudict.get(mname) ###check if Tk version >= 8.4.14; if so, use hard-coded showprefs binding
if not menu: tkversion = root.tk.eval('info patchlevel')
continue if tkversion >= '8.4.14':
for entry in entrylist: Bindings.menudefs[0] = ('application', [
if not entry: ('About IDLE', '<<about-idle>>'),
menu.add_separator() None,
])
root.createcommand('::tk::mac::ShowPreferences', config_dialog)
else:
for mname, entrylist in Bindings.menudefs:
menu = menudict.get(mname)
if not menu:
continue
else: else:
label, eventname = entry for entry in entrylist:
underline, label = prepstr(label) if not entry:
accelerator = get_accelerator(Bindings.default_keydefs, menu.add_separator()
else:
label, eventname = entry
underline, label = prepstr(label)
accelerator = get_accelerator(Bindings.default_keydefs,
eventname) eventname)
def command(text=root, eventname=eventname): def command(text=root, eventname=eventname):
text.event_generate(eventname) text.event_generate(eventname)
menu.add_command(label=label, underline=underline, menu.add_command(label=label, underline=underline,
command=command, accelerator=accelerator) command=command, accelerator=accelerator)
def setupApp(root, flist): def setupApp(root, flist):
""" """
Perform setup for the OSX application bundle. Perform setup for the OSX application bundle.