[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

Sun Sep 27 00:51:26 CEST 2015

https://hg.python.org/cpython/rev/d5739600368f
changeset: 98288:d5739600368f
parent: 98284:4a9418ed0d0c
parent: 98287:d2e78afd8866
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sat Sep 26 18:50:58 2015 -0400
summary:
 Merge with 3.5
files:
 Lib/idlelib/ScrolledList.py | 7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/Lib/idlelib/ScrolledList.py b/Lib/idlelib/ScrolledList.py
--- 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 @@
 # 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
-- 
Repository URL: https://hg.python.org/cpython
