From 3c7eccd0a64e4a2c76a06c5cc2001e934bf4a86a Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Tue, 22 Sep 2015 21:10:27 -0400 Subject: [PATCH] Issue #24570: Right-click for context menus now work on Mac Aqual also. Patch by Mark Roseman. --- Lib/idlelib/EditorWindow.py | 10 +++++----- Lib/idlelib/PyShell.py | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index 496eecdbbb2..dacb84357ae 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -175,13 +175,13 @@ class EditorWindow(object): if macosxSupport.isAquaTk(): # 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>.) + # Some OS X systems have only one mouse button, so use + # control-click for popup context menus there. For two + # buttons, AquaTk defines <2> as the right button, not <3>. text.bind("",self.right_menu_event) + text.bind("<2>", self.right_menu_event) else: - # Elsewhere, use right-click for pulldown menus. + # Elsewhere, use right-click for popup menus. text.bind("<3>",self.right_menu_event) text.bind("<>", self.cut) text.bind("<>", self.copy) diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py index 90fc689e9dd..4a68b198dc2 100755 --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -1547,6 +1547,14 @@ def main(): root.withdraw() flist = PyShellFileList(root) macosxSupport.setupApp(root, flist) + + if macosxSupport.isAquaTk(): + # There are some screwed up <2> class bindings for text + # widgets defined in Tk which we need to do away with. + # See issue #24801. + root.unbind_class('Text', '') + root.unbind_class('Text', '') + root.unbind_class('Text', '<>') if enable_edit: if not (cmd or script):