From 897137a5612d20beb0520cba103ee3805e4f2b11 Mon Sep 17 00:00:00 2001 From: Cary Sandvig Date: Sat, 11 Nov 2000 01:46:21 +0000 Subject: [PATCH] unmanage in the destructors --- panda/src/gui/guiButton.cxx | 1 + panda/src/gui/guiFrame.cxx | 1 + panda/src/gui/guiItem.cxx | 1 + panda/src/gui/guiRollover.cxx | 1 + panda/src/gui/guiSign.cxx | 1 + 5 files changed, 5 insertions(+) diff --git a/panda/src/gui/guiButton.cxx b/panda/src/gui/guiButton.cxx index 2e24d1b19f..999371d70f 100644 --- a/panda/src/gui/guiButton.cxx +++ b/panda/src/gui/guiButton.cxx @@ -213,6 +213,7 @@ GuiButton::GuiButton(const string& name, GuiLabel* up, GuiLabel* up_roll, } GuiButton::~GuiButton(void) { + this->unmanage(); } void GuiButton::manage(GuiManager* mgr, EventHandler& eh) { diff --git a/panda/src/gui/guiFrame.cxx b/panda/src/gui/guiFrame.cxx index ac01c1e906..1bdbdb993f 100644 --- a/panda/src/gui/guiFrame.cxx +++ b/panda/src/gui/guiFrame.cxx @@ -127,6 +127,7 @@ GuiFrame::GuiFrame(const string& name) : GuiItem(name) { } GuiFrame::~GuiFrame(void) { + this->unmanage(); } void GuiFrame::add_item(GuiItem* item) { diff --git a/panda/src/gui/guiItem.cxx b/panda/src/gui/guiItem.cxx index d379a98b5d..b84c262f5f 100644 --- a/panda/src/gui/guiItem.cxx +++ b/panda/src/gui/guiItem.cxx @@ -16,6 +16,7 @@ GuiItem::GuiItem(const string& name) : Namable(name), _added_hooks(false), } GuiItem::~GuiItem(void) { + this->unmanage(); } void GuiItem::manage(GuiManager* mgr, EventHandler&) { diff --git a/panda/src/gui/guiRollover.cxx b/panda/src/gui/guiRollover.cxx index 581ddd8f3c..51ffbc0712 100644 --- a/panda/src/gui/guiRollover.cxx +++ b/panda/src/gui/guiRollover.cxx @@ -48,6 +48,7 @@ GuiRollover::GuiRollover(const string& name, GuiLabel* off, GuiLabel* on) } GuiRollover::~GuiRollover(void) { + this->unmanage(); } void GuiRollover::manage(GuiManager* mgr, EventHandler& eh) { diff --git a/panda/src/gui/guiSign.cxx b/panda/src/gui/guiSign.cxx index 3a0beb0b7b..8be833c97b 100644 --- a/panda/src/gui/guiSign.cxx +++ b/panda/src/gui/guiSign.cxx @@ -17,6 +17,7 @@ GuiSign::GuiSign(const string& name, GuiLabel* sign) : GuiItem(name), } GuiSign::~GuiSign(void) { + this->unmanage(); } void GuiSign::manage(GuiManager* mgr, EventHandler& eh) {