mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2015-09-20 22:55:51 -04:00
parent 1de516e1df b50c6377a6
commit 4fb0cf7b87
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/idlelib/EditorWindow.py
View File

@ -537,16 +537,22 @@ def rmenu_check_paste(self):
return 'normal' return 'normal'
def about_dialog(self, event=None): def about_dialog(self, event=None):
"Handle Help 'About IDLE' event."
# Synchronize with macosxSupport.overrideRootMenu.about_dialog.
aboutDialog.AboutDialog(self.top,'About IDLE') aboutDialog.AboutDialog(self.top,'About IDLE')
def config_dialog(self, event=None): def config_dialog(self, event=None):
"Handle Options 'Configure IDLE' event."
# Synchronize with macosxSupport.overrideRootMenu.config_dialog.
configDialog.ConfigDialog(self.top,'Settings') configDialog.ConfigDialog(self.top,'Settings')
def config_extensions_dialog(self, event=None): def config_extensions_dialog(self, event=None):
"Handle Options 'Configure Extensions' event."
configDialog.ConfigExtensionsDialog(self.top) configDialog.ConfigExtensionsDialog(self.top)
def help_dialog(self, event=None): def help_dialog(self, event=None):
"Handle help doc event." "Handle Help 'IDLE Help' event."
# edit maxosxSupport.overrideRootMenu.help_dialog to match # Synchronize with macosxSupport.overrideRootMenu.help_dialog.
if self.root: if self.root:
parent = self.root parent = self.root
else: else:

7
Lib/idlelib/macosxSupport.py
View File

@ -159,10 +159,14 @@ def postwindowsmenu(menu=menu):
WindowList.register_callback(postwindowsmenu) WindowList.register_callback(postwindowsmenu)
def about_dialog(event=None): def about_dialog(event=None):
"Handle Help 'About IDLE' event."
# Synchronize with EditorWindow.EditorWindow.about_dialog.
from idlelib import aboutDialog from idlelib import aboutDialog
aboutDialog.AboutDialog(root, 'About IDLE') aboutDialog.AboutDialog(root, 'About IDLE')
def config_dialog(event=None): def config_dialog(event=None):
"Handle Options 'Configure IDLE' event."
# Synchronize with EditorWindow.EditorWindow.config_dialog.
from idlelib import configDialog from idlelib import configDialog
# Ensure that the root object has an instance_dict attribute, # Ensure that the root object has an instance_dict attribute,
@ -170,10 +174,11 @@ def config_dialog(event=None):
# on an EditorWindow instance that is then passed as the first # on an EditorWindow instance that is then passed as the first
# argument to ConfigDialog) # argument to ConfigDialog)
root.instance_dict = flist.inversedict root.instance_dict = flist.inversedict
root.instance_dict = flist.inversedict
configDialog.ConfigDialog(root, 'Settings') configDialog.ConfigDialog(root, 'Settings')
def help_dialog(event=None): def help_dialog(event=None):
"Handle Help 'IDLE Help' event."
# Synchronize with EditorWindow.EditorWindow.help_dialog.
from idlelib import help from idlelib import help
help.show_idlehelp(root) help.show_idlehelp(root)