From e37af2fe400fb290dbe69ca748110c06fdc655ca Mon Sep 17 00:00:00 2001 From: Darren Ranalli Date: Wed, 31 Jan 2007 04:42:08 +0000 Subject: [PATCH] messenger hook cleanup --- direct/src/gui/DirectScrollBar.py | 6 ++++++ direct/src/gui/DirectScrolledFrame.py | 4 ++++ direct/src/gui/DirectSlider.py | 2 ++ 3 files changed, 12 insertions(+) diff --git a/direct/src/gui/DirectScrollBar.py b/direct/src/gui/DirectScrollBar.py index 3427a6612d..89f2c70215 100644 --- a/direct/src/gui/DirectScrollBar.py +++ b/direct/src/gui/DirectScrollBar.py @@ -123,6 +123,12 @@ class DirectScrollBar(DirectFrame): self.guiItem.setResizeThumb(self['resizeThumb']) def destroy(self): + self.thumb.destroy() + del self.thumb + self.incButton.destroy() + del self.incButton + self.decButton.destroy() + del self.decButton DirectFrame.destroy(self) def commandFunc(self): diff --git a/direct/src/gui/DirectScrolledFrame.py b/direct/src/gui/DirectScrolledFrame.py index 6183124be3..417939f827 100644 --- a/direct/src/gui/DirectScrolledFrame.py +++ b/direct/src/gui/DirectScrolledFrame.py @@ -93,5 +93,9 @@ class DirectScrolledFrame(DirectFrame): for child in self.canvas.getChildrenAsList(): childGui = self.guiDict.get(child.getName()) if childGui: childGui.destroy() + self.verticalScroll.destroy() + self.horizontalScroll.destroy() + del self.verticalScroll + del self.horizontalScroll DirectFrame.destroy(self) diff --git a/direct/src/gui/DirectSlider.py b/direct/src/gui/DirectSlider.py index 2271acf28d..a21e5d0d7c 100644 --- a/direct/src/gui/DirectSlider.py +++ b/direct/src/gui/DirectSlider.py @@ -114,6 +114,8 @@ class DirectSlider(DirectFrame): raise ValueError, 'Invalid value for orientation: %s' % (self['orientation']) def destroy(self): + self.thumb.destroy() # ow! + del self.thumb DirectFrame.destroy(self) def commandFunc(self):