Skip to content

Pop all evthandlers #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
corranwebster merged 2 commits into from
Oct 17, 2013
Merged

Pop all evthandlers #108

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d5f37b
wx 2.9 requires that all pushed EvtHandlers be popped before a window…
RobinD42 Jul 3, 2012
d8800b8
Also pop evthandlers in destroy_control
RobinD42 Apr 24, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions traitsui/wx/toolkit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@ def skip_event ( self, event ):
def destroy_control ( self, control ):
""" Destroys a specified GUI toolkit control.
"""
_popEventHandlers(control)
control.Destroy()

#---------------------------------------------------------------------------
Expand All @@ -471,6 +472,8 @@ def destroy_children ( self, control ):
""" Destroys all of the child controls of a specified GUI toolkit
control.
"""
for child in control.GetChildren():
_popEventHandlers(child)
control.DestroyChildren()

#---------------------------------------------------------------------------
Expand Down Expand Up @@ -776,3 +779,13 @@ def _get_tab_hover_edge_bitmap ( self ):

return image.create_image().ConvertToBitmap()


#-------------------------------------------------------------------------------
def _popEventHandlers(ctrl):
""" Pop any event handlers that have been pushed on to a window and its
children.
"""
while ctrl is not ctrl.GetEventHandler():
ctrl.PopEventHandler(True)
for child in ctrl.GetChildren():
_popEventHandlers(child)