Removed the unused Box, VBox and HBox classes

They were once meant for doing layout, but never used and the way
they're implemented they would be relayouting with every draw, which
isn't really nice.

10 files changed, 1 insertions, 271 deletions

diff --git a/aethyra.cbp b/aethyra.cbp
index 8d79b097..0ede5d07 100644
--- a/aethyra.cbp
+++ b/aethyra.cbp
@@ -113,8 +113,6 @@
 		<Unit filename="src\game.h" />
 		<Unit filename="src\graphics.cpp" />
 		<Unit filename="src\graphics.h" />
-		<Unit filename="src\gui\box.cpp" />
-		<Unit filename="src\gui\box.h" />
 		<Unit filename="src\gui\browserbox.cpp" />
 		<Unit filename="src\gui\browserbox.h" />
 		<Unit filename="src\gui\button.cpp" />
@@ -151,8 +149,6 @@
 		<Unit filename="src\gui\gccontainer.h" />
 		<Unit filename="src\gui\gui.cpp" />
 		<Unit filename="src\gui\gui.h" />
-		<Unit filename="src\gui\hbox.cpp" />
-		<Unit filename="src\gui\hbox.h" />
 		<Unit filename="src\gui\help.cpp" />
 		<Unit filename="src\gui\help.h" />
 		<Unit filename="src\gui\inttextbox.cpp" />
@@ -253,8 +249,6 @@
 		<Unit filename="src\gui\truetypefont.h" />
 		<Unit filename="src\gui\updatewindow.cpp" />
 		<Unit filename="src\gui\updatewindow.h" />
-		<Unit filename="src\gui\vbox.cpp" />
-		<Unit filename="src\gui\vbox.h" />
 		<Unit filename="src\gui\viewport.cpp" />
 		<Unit filename="src\gui\viewport.h" />
 		<Unit filename="src\gui\widgets\dropdown.cpp" />
diff --git a/po/Makevars b/po/Makevars
index 76e72f50..73f2a51b 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,7 +1,7 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
 # Usually the message domain is the same as the package name.
-DOMAIN = tmw
+DOMAIN = aethyra
 
 # These two variables depend on the location of this directory.
 subdir = po
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 072e141e..9875257d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -55,8 +55,6 @@ SET(SRCS
     gui/widgets/resizegrip.h
     gui/widgets/layout.cpp
     gui/widgets/layout.h
-    gui/box.cpp
-    gui/box.h
     gui/browserbox.cpp
     gui/browserbox.h
     gui/buddywindow.cpp
@@ -91,8 +89,6 @@ SET(SRCS
     gui/gccontainer.h
     gui/gui.cpp
     gui/gui.h
-    gui/hbox.cpp
-    gui/hbox.h
     gui/help.cpp
     gui/help.h
     gui/inttextbox.cpp
@@ -181,8 +177,6 @@ SET(SRCS
     gui/trade.h
     gui/updatewindow.h
     gui/updatewindow.cpp
-    gui/vbox.h
-    gui/vbox.cpp
     gui/viewport.cpp
     gui/viewport.h
     gui/window.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 1d325a84..9d95488d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,8 +5,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/widgets/layout.h \
               gui/widgets/resizegrip.cpp \
 	      gui/widgets/resizegrip.h \
-	      gui/box.cpp \
-	      gui/box.h \
 	      gui/browserbox.cpp \
 	      gui/browserbox.h \
 	      gui/button.cpp \
@@ -43,8 +41,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/gccontainer.h \
 	      gui/gui.cpp \
 	      gui/gui.h \
-	      gui/hbox.cpp \
-	      gui/hbox.h \
 	      gui/help.cpp \
 	      gui/help.h \
 	      gui/inttextbox.h \
@@ -145,8 +141,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/trade.h \
 	      gui/updatewindow.h \
 	      gui/updatewindow.cpp \
-	      gui/vbox.h \
-	      gui/vbox.cpp \
 	      gui/viewport.cpp \
 	      gui/viewport.h \
 	      gui/window.cpp \
diff --git a/src/gui/box.cpp b/src/gui/box.cpp
deleted file mode 100644
index 59d8c135..00000000
--- a/src/gui/box.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "box.h"
-
-Box::Box():
-    padding(0)
-{
-    setOpaque(false);
-}
-
-Box::~Box()
-{
-}
-
-unsigned int Box::getPadding()
-{
-    return padding;
-}
-
-void Box::setPadding(unsigned int p)
-{
-    padding = p;
-}
diff --git a/src/gui/box.h b/src/gui/box.h
deleted file mode 100644
index 46654b48..00000000
--- a/src/gui/box.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-
-#ifndef BOX_H
-#define BOX_H
-
-#include <guichan/widgets/container.hpp>
-
-#include "../guichanfwd.h"
-
-class Box : public gcn::Container
-{
-    public:
-        /**
-         * Returns padding.
-         */
-        unsigned int getPadding();
-
-        /**
-         * Sets padding between widgets.
-         */
-        void setPadding(unsigned int);
-
-    protected:
-        Box();
-        virtual ~Box();
-
-        /**
-         * Spacing between client widgets.
-         */
-        unsigned int padding;
-
-        virtual void draw(gcn::Graphics *) = 0;
-
-        typedef std::list<gcn::Widget*> Widgets;
-        typedef Widgets::iterator WidgetIterator;
-};
-
-#endif
diff --git a/src/gui/hbox.cpp b/src/gui/hbox.cpp
deleted file mode 100644
index 020e85c6..00000000
--- a/src/gui/hbox.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "hbox.h"
-
-void HBox::draw(gcn::Graphics *graphics)
-{
-    int widgetCount = mWidgets.size();
-    int childHeight = getHeight();
-    if (widgetCount == 0)
-        return;
-    int childWidth = getWidth() / widgetCount;
-
-    int i = 0;
-    for (WidgetIterator w = mWidgets.begin(); w != mWidgets.end(); w++) {
-        (*w)->setPosition(childWidth * i - padding, 0);
-        (*w)->setSize(childWidth, childHeight);
-        i++;
-    }
-    gcn::Container::draw(graphics);
-}
diff --git a/src/gui/hbox.h b/src/gui/hbox.h
deleted file mode 100644
index da70a53c..00000000
--- a/src/gui/hbox.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef HBOX_H
-#define HBOX_H
-
-#include "box.h"
-
-#include "../guichanfwd.h"
-
-class HBox : public Box
-{
- public:
-    void draw(gcn::Graphics *);
-};
-
-#endif
diff --git a/src/gui/vbox.cpp b/src/gui/vbox.cpp
deleted file mode 100644
index 2ec1112d..00000000
--- a/src/gui/vbox.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "vbox.h"
-
-void VBox::draw(gcn::Graphics *graphics)
-{
-    if (mWidgets.empty())
-    {
-        return;
-    }
-
-    int childWidth = getWidth();
-    int childHeight = getHeight() / mWidgets.size();
-    int i = 0;
-
-    for (WidgetIterator w = mWidgets.begin(); w != mWidgets.end(); w++)
-    {
-        (*w)->setPosition(0, childHeight * i - padding);
-        (*w)->setSize(childWidth, childHeight);
-        i++;
-    }
-
-    gcn::Container::draw(graphics);
-}
diff --git a/src/gui/vbox.h b/src/gui/vbox.h
deleted file mode 100644
index 4538338f..00000000
--- a/src/gui/vbox.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef VBOX_H
-#define VBOX_H
-
-#include "box.h"
-
-#include "../guichanfwd.h"
-
-class VBox : public Box
-{
-    public:
-        void draw(gcn::Graphics *);
-};
-
-#endif