summaryrefslogtreecommitdiff
path: root/src/gui/npc_text.h
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2005-09-13 22:56:29 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2005-09-13 22:56:29 +0000
commit3dc311a652d1fda1252903a974920395e56e5668 (patch)
tree7098d55015d28a4d973c5073d7c9e45ae03ec400 /src/gui/npc_text.h
parent78771718bf7af14273d7bb0090dccff97b00b397 (diff)
downloadmana-3dc311a652d1fda1252903a974920395e56e5668.tar.gz
mana-3dc311a652d1fda1252903a974920395e56e5668.tar.bz2
mana-3dc311a652d1fda1252903a974920395e56e5668.tar.xz
mana-3dc311a652d1fda1252903a974920395e56e5668.zip
Merged with SDL_NET_TEST branch.
Diffstat (limited to 'src/gui/npc_text.h')
-rw-r--r--src/gui/npc_text.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 41301aa9..02fae7f4 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -25,11 +25,10 @@
#define _TMW_NPC_TEXT_H
#include <iosfwd>
-
+#include <string>
#include <guichan/actionlistener.hpp>
#include "window.h"
-
#include "../guichanfwd.h"
/**
@@ -55,14 +54,16 @@ class NpcTextDialog : public Window, public gcn::ActionListener
/**
* Called when receiving actions from the widgets.
*/
- void action(const std::string& eventId);
+ void
+ action(const std::string &eventId);
/**
* Sets the text shows in the dialog.
*
* @param string The new text.
*/
- void setText(const char *string);
+ void
+ setText(const char *string);
/**
* Adds the text to the text shows in the dialog. Also adds a newline
@@ -70,7 +71,8 @@ class NpcTextDialog : public Window, public gcn::ActionListener
*
* @param string The text to add.
*/
- void addText(const char *string);
+ void
+ addText(const std::string &string);
private:
gcn::Button *okButton;