Issue #17532: merge
This commit is contained in:
commit
6a00b6f4fd
|
@ -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
|
||||||
|
|
|
@ -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")
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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")
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue