From 3f752ab22e369bd664bbce395099f263e3cff784 Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Sat, 18 Dec 2010 17:22:18 +0000 Subject: [PATCH] Merged revisions 87374 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87374 | r.david.murray | 2010-12-18 12:19:10 -0500 (Sat, 18 Dec 2010) | 8 lines #10404: Use ctl-button-1 for context menus on OSX Idle. This provides access to the context menus where they previously could not be accessed due to the way OSX Tk binds buttons. It also improves platform consistency. Patch by Ned Deily. ........ --- Lib/idlelib/EditorWindow.py | 9 ++++++++- Misc/NEWS | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index bdd230b66f..c6a4001b22 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -136,6 +136,14 @@ class EditorWindow(object): if macosxSupport.runningAsOSXApp(): # Command-W on editorwindows doesn't work without this. text.bind('<>', self.close_event) + # Some OS X systems have only one mouse button, + # so use control-click for pulldown menus there. + # (Note, AquaTk defines <2> as the right button if + # present and the Tk Text widget already binds <2>.) + text.bind("",self.right_menu_event) + else: + # Elsewhere, use right-click for pulldown menus. + text.bind("<3>",self.right_menu_event) text.bind("<>", self.cut) text.bind("<>", self.copy) text.bind("<>", self.paste) @@ -154,7 +162,6 @@ class EditorWindow(object): text.bind("<>", self.find_selection_event) text.bind("<>", self.replace_event) text.bind("<>", self.goto_line_event) - text.bind("<3>", self.right_menu_event) text.bind("<>",self.smart_backspace_event) text.bind("<>",self.newline_and_indent_event) text.bind("<>",self.smart_indent_event) diff --git a/Misc/NEWS b/Misc/NEWS index 8ca6dcfa9c..f3355af3ac 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -22,7 +22,9 @@ Core and Builtins Library ------- -- Issue $9907: Fix tab handling on OSX when using editline by calling +- Issue #10404: Use ctl-button-1 on OSX for the context menu in Idle. + +- Issue #9907: Fix tab handling on OSX when using editline by calling rl_initialize first, then setting our custom defaults, then reading .editrc. - Issue #4188: Avoid creating dummy thread objects when logging operations -- 2.50.1