Issue #17532: merge

This commit is contained in:
Ned Deily 2013-05-22 15:24:44 -07:00
commit 6a00b6f4fd
5 changed files with 8 additions and 2 deletions

View File

@ -98,6 +98,10 @@ if macosxSupport.runningAsOSXApp():
# menu # menu
del menudefs[-1][1][0:2] del menudefs[-1][1][0:2]
# Remove the 'Configure' entry from the options menu, it is in the
# application menu as 'Preferences'
del menudefs[-2][1][0:2]
default_keydefs = idleConf.GetCurrentKeySet() default_keydefs = idleConf.GetCurrentKeySet()
del sys del sys

View File

@ -463,7 +463,6 @@ class EditorWindow(object):
] ]
if macosxSupport.runningAsOSXApp(): if macosxSupport.runningAsOSXApp():
del menu_specs[-3]
menu_specs[-2] = ("windows", "_Window") menu_specs[-2] = ("windows", "_Window")

View File

@ -822,7 +822,6 @@ class PyShell(OutputWindow):
] ]
if macosxSupport.runningAsOSXApp(): if macosxSupport.runningAsOSXApp():
del menu_specs[-3]
menu_specs[-2] = ("windows", "_Window") menu_specs[-2] = ("windows", "_Window")

View File

@ -1154,6 +1154,7 @@ Michael Simcich
Ionel Simionescu Ionel Simionescu
Kirill Simonov Kirill Simonov
Nathan Paul Simons Nathan Paul Simons
Guilherme Simões
Adam Simpkins Adam Simpkins
Ravi Sinha Ravi Sinha
Janne Sinkkonen Janne Sinkkonen

View File

@ -370,6 +370,9 @@ IDLE
- Issue #14735: Update IDLE docs to omit "Control-z on Windows". - Issue #14735: Update IDLE docs to omit "Control-z on Windows".
- Issue #17532: Always include Options menu for IDLE on OS X.
Patch by Guilherme Simões.
Build Build
----- -----