From 4943ebb1e3a3263f752dedaab68e11e63bcf5701 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Fri, 16 Feb 2007 23:32:37 +0000
Subject: [PATCH] Fixes as described in #1661049 (Uncollectable ogl objects)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@44515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wxPython/wx/lib/ogl/_basic.py |  6 ------
 wxPython/wx/lib/ogl/_lines.py | 15 +++++----------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/wxPython/wx/lib/ogl/_basic.py b/wxPython/wx/lib/ogl/_basic.py
index db095dd165..5d5f461fce 100644
--- a/wxPython/wx/lib/ogl/_basic.py
+++ b/wxPython/wx/lib/ogl/_basic.py
@@ -67,9 +67,6 @@ class ShapeEvtHandler(object):
         self._previousHandler = prev
         self._handlerShape = shape
 
-    def __del__(self):
-        pass
-
     def SetShape(self, sh):
         self._handlerShape = sh
 
@@ -311,9 +308,6 @@ class Shape(ShapeEvtHandler):
             self.GetEventHandler().OnDelete()
         self._eventHandler = None
         
-    def __del__(self):
-        ShapeEvtHandler.__del__(self)
-
     def Draggable(self):
         """TRUE if the shape may be dragged by the user."""
         return True
diff --git a/wxPython/wx/lib/ogl/_lines.py b/wxPython/wx/lib/ogl/_lines.py
index d4da07dbd2..77ce392cac 100644
--- a/wxPython/wx/lib/ogl/_lines.py
+++ b/wxPython/wx/lib/ogl/_lines.py
@@ -218,16 +218,6 @@ class LineShape(Shape):
         self._lineControlPoints = []
         self._arcArrows = []
 
-    def __del__(self):
-        if self._lineControlPoints:
-            self._lineControlPoints = []
-        for i in range(3):
-            if self._labelObjects[i]:
-                self._labelObjects[i].Select(False)
-                self._labelObjects[i].RemoveFromCanvas(self._canvas)
-        self._labelObjects = []
-        self.ClearArrowsAtPosition(-1)
-
     def GetFrom(self):
         """Return the 'from' object."""
         return self._from
@@ -492,6 +482,11 @@ class LineShape(Shape):
             self._from.GetLines().remove(self)
         self._to = None
         self._from = None
+        for i in range(3):
+            if self._labelObjects[i]:
+                self._labelObjects[i].Select(False)
+                self._labelObjects[i].RemoveFromCanvas(self._canvas)
+        self.ClearArrowsAtPosition(-1)
 
     def SetEnds(self, x1, y1, x2, y2):
         """Set the end positions of the line."""