Remove calls to dc.BeginDrawing and dc.EndDrawing

[wxWidgets.git] / wxPython / wx / lib / ogl / _basic.py

diff --git a/wxPython/wx/lib/ogl/_basic.py b/wxPython/wx/lib/ogl/_basic.py
index 441862b7d05a88e0c06a4959c5ca85551810d4d9..757c5c2115da98632b52243ad34649c165f62b35 100644 (file)
--- a/wxPython/wx/lib/ogl/_basic.py
+++ b/wxPython/wx/lib/ogl/_basic.py
@@ -288,9 +288,16 @@ class Shape(ShapeEvtHandler):
         return str(self.__class__).split(".")[-1][:-2]
 
     def Delete(self):
         return str(self.__class__).split(".")[-1][:-2]
 
     def Delete(self):

+        """
+        Fully disconnect this shape from parents, children, the
+        canvas, etc.
+        """

         if self._parent:
             self._parent.GetChildren().remove(self)
 
         if self._parent:
             self._parent.GetChildren().remove(self)
 

+        for child in self.GetChildren():
+            child.Delete()
+

         self.ClearText()
         self.ClearRegions()
         self.ClearAttachments()
         self.ClearText()
         self.ClearRegions()
         self.ClearAttachments()


@@ -3040,7 +3047,7 @@ class ShapeRegion(object):
             return None
         if self._penColour=="Invisible":
             return None
             return None
         if self._penColour=="Invisible":
             return None

-        self._actualPenObject = wx.ThePenList.FindOrCreatePen(self._penColour, 1, self._penStyle)
+        self._actualPenObject = wx.Pen(self._penColour, 1, self._penStyle)

         return self._actualPenObject
 
     def SetText(self, s):
         return self._actualPenObject
 
     def SetText(self, s):