Merged with Aethyra master as of 2009-02-09

Conflicts:
	A lot of files...

1 files changed, 3 insertions, 9 deletions

diff --git a/src/gui/textbox.h b/src/gui/textbox.h
index 98b60402..10a81fc0 100644
--- a/src/gui/textbox.h
+++ b/src/gui/textbox.h
@@ -24,8 +24,6 @@
 
 #include <guichan/widgets/textbox.hpp>
 
-#include "../guichanfwd.h"
-
 /**
  * A text box, meant to be used inside a scroll area. Same as the Guichan text
  * box except this one doesn't have a background or border, instead completely
@@ -33,7 +31,8 @@
  *
  * \ingroup GUI
  */
-class TextBox : public gcn::TextBox {
+class TextBox : public gcn::TextBox
+{
     public:
         /**
          * Constructor.
@@ -43,18 +42,13 @@ class TextBox : public gcn::TextBox {
         /**
          * Sets the text after wrapping it to the current width of the widget.
          */
-        void setTextWrapped(const std::string &text);
+        void setTextWrapped(const std::string &text, int minDimension);
 
         /**
          * Get the minimum text width for the text box.
          */
         int getMinWidth() { return mMinWidth; }
 
-        /**
-         * Set the minimum text width for the text box.
-         */
-        void setMinWidth(int width) { mMinWidth = width; }
-
     private:
         int mMinWidth;
 };