summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2015-09-26 22:50:58 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2015-09-26 22:50:58 (GMT)
commit9c2982a25c01752d0969435afe8ce61ac48eb4ee (patch)
treef44aa310fc9b075649a98d3a3a58ee43dc0a71b7
parent3844fe5ed8da2755c1036deda8d7a8387170b72b (diff)
parentdf1fe78acbbb019658af3213b43374359e6667a8 (diff)
downloadcpython-9c2982a25c01752d0969435afe8ce61ac48eb4ee.zip
cpython-9c2982a25c01752d0969435afe8ce61ac48eb4ee.tar.gz
cpython-9c2982a25c01752d0969435afe8ce61ac48eb4ee.tar.bz2
Merge with 3.5
-rw-r--r--Lib/idlelib/ScrolledList.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/Lib/idlelib/ScrolledList.py b/Lib/idlelib/ScrolledList.py
index 71ec547..53576b5 100644
--- a/Lib/idlelib/ScrolledList.py
+++ b/Lib/idlelib/ScrolledList.py
@@ -1,4 +1,5 @@
from tkinter import *
+from idlelib import macosxSupport
class ScrolledList:
@@ -22,7 +23,11 @@ class ScrolledList:
# Bind events to the list box
listbox.bind("<ButtonRelease-1>", self.click_event)
listbox.bind("<Double-ButtonRelease-1>", self.double_click_event)
- listbox.bind("<ButtonPress-3>", self.popup_event)
+ if macosxSupport.isAquaTk():
+ listbox.bind("<ButtonPress-2>", self.popup_event)
+ listbox.bind("<Control-Button-1>", self.popup_event)
+ else:
+ listbox.bind("<ButtonPress-3>", self.popup_event)
listbox.bind("<Key-Up>", self.up_event)
listbox.bind("<Key-Down>", self.down_event)
# Mark as empty