summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2015-09-26 22:50:44 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2015-09-26 22:50:44 (GMT)
commitdf1fe78acbbb019658af3213b43374359e6667a8 (patch)
tree5c455ece3119a8d0ef1820f39161b59d7e5233b7
parentbf49fee125047e34927d7ecea1cc9cac53dc3f6f (diff)
parent00e4ce3a36eaf22e14dc6915ab482e7605ce1b72 (diff)
downloadcpython-df1fe78acbbb019658af3213b43374359e6667a8.zip
cpython-df1fe78acbbb019658af3213b43374359e6667a8.tar.gz
cpython-df1fe78acbbb019658af3213b43374359e6667a8.tar.bz2
Merge with 3.4
-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