merge heads

This commit is contained in:
Benjamin Peterson 2012-03-13 16:46:09 -05:00
commit 0442f56c4a
2 changed files with 7 additions and 1 deletions

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,6 +103,9 @@ class CallTip:
self.hidetip() self.hidetip()
else: else:
self.position_window() self.position_window()
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) self.widget.after(CHECKHIDE_TIME, self.checkhide_event)
def hide_event(self, event): def hide_event(self, event):

View file

@ -24,6 +24,8 @@ Core and Builtins
Library Library
------- -------
- Issue #5219: Prevent event handler cascade in IDLE.
- Issue #3835: Refuse to use unthreaded Tcl in threaded Python. - Issue #3835: Refuse to use unthreaded Tcl in threaded Python.
- Issue #2843: Add new Tk API to Tkinter. - Issue #2843: Add new Tk API to Tkinter.