Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge heads

This commit is contained in:
Benjamin Peterson 2012-03-13 16:46:35 -05:00
parent 47930016ff eb945a938d
commit 817dd91595
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/idlelib/CallTipWindow.py
View File

@ -22,6 +22,7 @@ class CallTip:
self.parenline = self.parencol = None self.parenline = self.parencol = None
self.lastline = None self.lastline = None
self.hideid = self.checkhideid = None self.hideid = self.checkhideid = None
self.checkhide_after_id = None
def position_window(self): def position_window(self):
"""Check if needs to reposition the window, and if so - do it.""" """Check if needs to reposition the window, and if so - do it."""
@ -102,7 +103,10 @@ class CallTip:
self.hidetip() self.hidetip()
else: else:
self.position_window() self.position_window()
self.widget.after(CHECKHIDE_TIME, self.checkhide_event) if self.checkhide_after_id is not None:
self.widget.after_cancel(self.checkhide_after_id)
self.checkhide_after_id = \
self.widget.after(CHECKHIDE_TIME, self.checkhide_event)
def hide_event(self, event): def hide_event(self, event):
if not self.tipwindow: if not self.tipwindow:

2
Misc/NEWS
View File

@ -22,6 +22,8 @@ Core and Builtins
Library Library
------- -------
- Issue #5219: Prevent event handler cascade in IDLE.
- Issue #14184: Increase the default stack size for secondary threads on - Issue #14184: Increase the default stack size for secondary threads on
Mac OS X to avoid interpreter crashes when using threads on 10.7. Mac OS X to avoid interpreter crashes when using threads on 10.7.