Merged modifications from the 2.6 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -289,8 +289,7 @@ class Shape(ShapeEvtHandler):
|
||||
|
||||
def Delete(self):
|
||||
if self._parent:
|
||||
i = self._parent.GetChildren().index(self)
|
||||
self._parent.GetChildren(i).remove(self)
|
||||
self._parent.GetChildren().remove(self)
|
||||
|
||||
self.ClearText()
|
||||
self.ClearRegions()
|
||||
@@ -301,7 +300,8 @@ class Shape(ShapeEvtHandler):
|
||||
if self._canvas:
|
||||
self.RemoveFromCanvas(self._canvas)
|
||||
|
||||
self.GetEventHandler().OnDelete()
|
||||
if self.GetEventHandler():
|
||||
self.GetEventHandler().OnDelete()
|
||||
self._eventHandler = None
|
||||
|
||||
def __del__(self):
|
||||
|
Reference in New Issue
Block a user