summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-29 11:25:26 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-29 11:25:26 +0000
commit94d849ad87bd53c6c51530ea7c0b084ca6899533 (patch)
tree07923cc45286379c58c6a47dfb293adfa910b983 /src
parent567d35731d8cca0e535f23652b8fbe050a629f91 (diff)
downloadmana-94d849ad87bd53c6c51530ea7c0b084ca6899533.tar.gz
mana-94d849ad87bd53c6c51530ea7c0b084ca6899533.tar.bz2
mana-94d849ad87bd53c6c51530ea7c0b084ca6899533.tar.xz
mana-94d849ad87bd53c6c51530ea7c0b084ca6899533.zip
Removed unused option from GCContainer to not delete a child, fixing warnings
about hiding virtual method gcn::Container::add.
Diffstat (limited to 'src')
-rw-r--r--src/gui/gccontainer.cpp14
-rw-r--r--src/gui/gccontainer.h8
2 files changed, 10 insertions, 12 deletions
diff --git a/src/gui/gccontainer.cpp b/src/gui/gccontainer.cpp
index c22ddfc9..1edb4daf 100644
--- a/src/gui/gccontainer.cpp
+++ b/src/gui/gccontainer.cpp
@@ -37,21 +37,15 @@ GCContainer::~GCContainer()
mDeathList.clear();
}
-void GCContainer::add(gcn::Widget *w, bool delChild)
+void GCContainer::add(gcn::Widget *w)
{
- if (delChild) {
- mDeathList.push_back(w);
- }
-
+ mDeathList.push_back(w);
Container::add(w);
}
-void GCContainer::add(gcn::Widget *w, int x, int y, bool delChild)
+void GCContainer::add(gcn::Widget *w, int x, int y)
{
- if (delChild) {
- mDeathList.push_back(w);
- }
-
+ mDeathList.push_back(w);
Container::add(w, x, y);
}
diff --git a/src/gui/gccontainer.h b/src/gui/gccontainer.h
index e27eaa96..8b8a7ffe 100644
--- a/src/gui/gccontainer.h
+++ b/src/gui/gccontainer.h
@@ -28,14 +28,18 @@
#include <guichan/widgets/container.hpp>
+/**
+ * A garbage collecting container. Childs added to this container are
+ * automatically deleted when the container is deleted.
+ */
class GCContainer : public gcn::Container
{
public:
virtual ~GCContainer();
- virtual void add(gcn::Widget *w, bool delChild = true);
+ virtual void add(gcn::Widget *w);
- virtual void add(gcn::Widget *w, int x, int y, bool delChild = true);
+ virtual void add(gcn::Widget *w, int x, int y);
virtual void death(const gcn::Event &event);