summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2015-09-27 00:04:09 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2015-09-27 00:04:09 (GMT)
commit34a804767225ef5c40d58ebfc34daa37afb7fa92 (patch)
tree008e419f11558fc933d03e7b695ab076b5313fe1
parentdf1fe78acbbb019658af3213b43374359e6667a8 (diff)
parentd2134c71a12e8deac9ba6b4f4ffe4d271d49cabe (diff)
downloadcpython-34a804767225ef5c40d58ebfc34daa37afb7fa92.zip
cpython-34a804767225ef5c40d58ebfc34daa37afb7fa92.tar.gz
cpython-34a804767225ef5c40d58ebfc34daa37afb7fa92.tar.bz2
Merge with 3.4
-rw-r--r--Lib/idlelib/AutoCompleteWindow.py1
-rw-r--r--Lib/idlelib/CallTipWindow.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/Lib/idlelib/AutoCompleteWindow.py b/Lib/idlelib/AutoCompleteWindow.py
index f666ea6..2ee6878 100644
--- a/Lib/idlelib/AutoCompleteWindow.py
+++ b/Lib/idlelib/AutoCompleteWindow.py
@@ -192,6 +192,7 @@ class AutoCompleteWindow:
scrollbar.config(command=listbox.yview)
scrollbar.pack(side=RIGHT, fill=Y)
listbox.pack(side=LEFT, fill=BOTH, expand=True)
+ acw.lift() # work around bug in Tk 8.5.18+ (issue #24570)
# Initialize the listbox selection
self.listbox.select_set(self._binary_search(self.start))
diff --git a/Lib/idlelib/CallTipWindow.py b/Lib/idlelib/CallTipWindow.py
index 170d146..8e68a76 100644
--- a/Lib/idlelib/CallTipWindow.py
+++ b/Lib/idlelib/CallTipWindow.py
@@ -72,6 +72,7 @@ class CallTip:
background="#ffffe0", relief=SOLID, borderwidth=1,
font = self.widget['font'])
self.label.pack()
+ tw.lift() # work around bug in Tk 8.5.18+ (issue #24570)
self.checkhideid = self.widget.bind(CHECKHIDE_VIRTUAL_EVENT_NAME,
self.checkhide_event)