Merge branch 'master' of git@gitorious.org:tmw/eathena

1 files changed, 13 insertions, 10 deletions

diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index c881467a..a07aa04f 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -22,12 +22,13 @@
 #ifndef NPC_TEXT_H
 #define NPC_TEXT_H
 
-#include <iosfwd>
+#include <string>
+
 #include <guichan/actionlistener.hpp>
 
 #include "window.h"
 
-class BrowserBox;
+class TextBox;
 
 /**
  * The npc text dialog.
@@ -45,13 +46,6 @@ class NpcTextDialog : public Window, public gcn::ActionListener
         NpcTextDialog();
 
         /**
-         * Called when resizing the window.
-         *
-         * @param event The calling event
-         */
-        void widgetResized(const gcn::Event &event);
-
-        /**
          * Called when receiving actions from the widgets.
          */
         void action(const gcn::ActionEvent &event);
@@ -76,10 +70,19 @@ class NpcTextDialog : public Window, public gcn::ActionListener
          */
         void addText(const std::string &string);
 
+        /**
+         * Called when resizing the window.
+         *
+         * @param event The calling event
+         */
+        void widgetResized(const gcn::Event &event);
+
     private:
         gcn::Button *okButton;
         gcn::ScrollArea *scrollArea;
-        BrowserBox *mBrowserBox;
+        TextBox *mTextBox;
+
+        std::string mText;
 };
 
 #endif // NPC_TEXT_H