From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 8 Jun 2016 18:37:05 +0000 (-0400)
Subject: Issue #27262: move Aqua unbinding code, which enable context menus, to maxosx.
X-Git-Tag: v3.6.0a2~84
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24f3a1829fe007915a93e9515cd28470dd8a00d9;p=python

Issue #27262: move Aqua unbinding code, which enable context menus, to maxosx.
---

diff --git a/Lib/idlelib/macosx.py b/Lib/idlelib/macosx.py
index 8c50a598b2..9d75631388 100644
--- a/Lib/idlelib/macosx.py
+++ b/Lib/idlelib/macosx.py
@@ -206,6 +206,16 @@ def overrideRootMenu(root, flist):
         # remove redundant "IDLE Help" from menu
         del mainmenu.menudefs[-1][1][0]
 
+def fixb2context(root):
+    '''Removed bad AquaTk Button-2 (right) and Paste bindings.
+
+    They prevent context menu access and seem to be gone in AquaTk8.6.
+    See issue #24801.
+    '''
+    root.unbind_class('Text', '<B2>')
+    root.unbind_class('Text', '<B2-Motion>')
+    root.unbind_class('Text', '<<PasteSelection>>')
+
 def setupApp(root, flist):
     """
     Perform initial OS X customizations if needed.
@@ -227,3 +237,4 @@ def setupApp(root, flist):
         hideTkConsole(root)
         overrideRootMenu(root, flist)
         addOpenEventSupport(root, flist)
+        fixb2context()
diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py
index 8341cd952b..9fc46caa63 100755
--- a/Lib/idlelib/pyshell.py
+++ b/Lib/idlelib/pyshell.py
@@ -1548,14 +1548,6 @@ def main():
     flist = PyShellFileList(root)
     macosx.setupApp(root, flist)
 
-    if macosx.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', '<B2>')
-        root.unbind_class('Text', '<B2-Motion>')
-        root.unbind_class('Text', '<<PasteSelection>>')
-
     if enable_edit:
         if not (cmd or script):
             for filename in args[:]: