Destroy the child widgets *after* the child event is emitted.

Author: sccolbert

enaml/core/object.py

@@ -480,19 +480,16 @@ def remove_children(self, remove, destroy=True):
             else:
                 new.append(child)
 
-        if destroy:
-            for child in old:
-                # Set the child's parent to None so that destroy does
-                # not recurse back into a child manipulation method.
-                child._parent = None
-                child.destroy()
-        else:
-            for child in old:
-                child._parent = None
+        for child in old:
+            child._parent = None
 
         with ChildEventContext(self):
             self._children = tuple(new)
 
+        if destroy:
+            for child in old:
+                child.destroy()
+
     def replace_children(self, remove, before, insert, destroy=True):
         """ Perform an 'atomic' remove and insert children operation.
 
@@ -557,15 +554,8 @@ def replace_children(self, remove, before, insert, destroy=True):
                     with ChildEventContext(old_parent):
                         old_parent._children = old_kids
 
-        if destroy:
-            for child in old:
-                # Set the child's parent to None so that destroy does
-                # not recurse back into a child manipulation method.
-                child._parent = None
-                child.destroy()
-        else:
-            for child in old:
-                child._parent = None
+        for child in old:
+            child._parent = None
 
         with ChildEventContext(self):
             self._children = tuple(new)
@@ -576,6 +566,10 @@ def replace_children(self, remove, before, insert, destroy=True):
                 for child in insert_tup:
                     child.initialize()
 
+        if destroy:
+            for child in old:
+                child.destroy()
+
     #--------------------------------------------------------------------------
     # Messaging Methods
     #--------------------------------------------------------------------------