summaryrefslogtreecommitdiff
path: root/src/gui/npc_text.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-16 08:39:59 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-16 08:39:59 +0000
commitfe02ca9dcaa593d361f0acebcfb514997dc4ca9e (patch)
tree3dccd5a76a231f2f7a6261732f144c70e850afb7 /src/gui/npc_text.h
parent2aae7dcba5b240674a76e0d85dbf64cede1d478b (diff)
downloadmana-fe02ca9dcaa593d361f0acebcfb514997dc4ca9e.tar.gz
mana-fe02ca9dcaa593d361f0acebcfb514997dc4ca9e.tar.bz2
mana-fe02ca9dcaa593d361f0acebcfb514997dc4ca9e.tar.xz
mana-fe02ca9dcaa593d361f0acebcfb514997dc4ca9e.zip
Restored the text wrapping in TextBox, since it was based on overriding a
method that is no longer virtual in Guichan 0.8.0 (gcn::TextBox::setText()).
Diffstat (limited to 'src/gui/npc_text.h')
-rw-r--r--src/gui/npc_text.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 869661c4..0ef1b938 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -28,7 +28,8 @@
#include <guichan/actionlistener.hpp>
#include "window.h"
-#include "../guichanfwd.h"
+
+class TextBox;
/**
* The npc text dialog.
@@ -57,7 +58,7 @@ class NpcTextDialog : public Window, public gcn::ActionListener
* @param string The new text.
*/
void
- setText(const char *string);
+ setText(const std::string &string);
/**
* Adds the text to the text shows in the dialog. Also adds a newline
@@ -69,7 +70,7 @@ class NpcTextDialog : public Window, public gcn::ActionListener
addText(const std::string &string);
private:
- gcn::TextBox *mTextBox;
+ TextBox *mTextBox;
};
#endif