Merged revisions 4031-4044,4046-4058,4061-4062,4064,4066-4067,4069-4070,4072-4079,4082-4092,4094-4097,4099,4101-4109,4112-4115,4117-4129,4131-4150 via svnmerge from

https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r4031 | the_enemy | 2008-04-03 14:53:00 +0200 (Thu, 03 Apr 2008) | 1 line
  
  Tweaked disconnect dialog to fix crash bug id=250
........
  r4050 | b_lindeijer | 2008-04-07 19:37:23 +0200 (Mon, 07 Apr 2008) | 2 lines
  
  Merged changes made for the 0.0.24.1 release (4046:4048 from 0.0.24 branch).
........
  r4066 | b_lindeijer | 2008-04-10 23:48:36 +0200 (Thu, 10 Apr 2008) | 2 lines
  
  Fixed compile warning.
........
  r4076 | b_lindeijer | 2008-04-12 20:36:15 +0200 (Sat, 12 Apr 2008) | 3 lines
  
  Fixed display of item shortcut container. gcn::Widget::setWidth is no longer
  virtual.
........
  r4079 | crush_tmw | 2008-04-14 09:50:25 +0200 (Mon, 14 Apr 2008) | 1 line
  
  Fixed multi-channel image dyeing (patch by fate)
........
  r4096 | b_lindeijer | 2008-04-16 10:39:59 +0200 (Wed, 16 Apr 2008) | 3 lines
  
  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()).
........
  r4097 | peaveydk | 2008-04-16 13:27:31 +0200 (Wed, 16 Apr 2008) | 1 line
  
  Fix a basic_string::at sometimes being out of range in BrowserBox::draw when checking for line separators.
........
  r4099 | peaveydk | 2008-04-16 13:50:12 +0200 (Wed, 16 Apr 2008) | 1 line
  
  Also fix potential out of range in BrowserBox::draw when checking for color codes.
........
  r4150 | b_lindeijer | 2008-04-20 21:24:33 +0200 (Sun, 20 Apr 2008) | 2 lines
  
  Forgot to remove the sound effects apparently, removed now.
........

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 023307a7..fd02a14a 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -36,7 +36,7 @@
 NpcTextDialog::NpcTextDialog():
     Window(_("NPC"))
 {
-    mTextBox = new TextBox();
+    mTextBox = new TextBox;
     mTextBox->setEditable(false);
     gcn::ScrollArea *scrollArea = new ScrollArea(mTextBox);
     Button *okButton = new Button(_("Ok"), "ok", this);
@@ -57,15 +57,15 @@ NpcTextDialog::NpcTextDialog():
 }
 
 void
-NpcTextDialog::setText(const char *text)
+NpcTextDialog::setText(const std::string &text)
 {
-    mTextBox->setText(text);
+    mTextBox->setTextWrapped(text);
 }
 
 void
 NpcTextDialog::addText(const std::string &text)
 {
-    mTextBox->setText(mTextBox->getText() + text + "\n");
+    mTextBox->setTextWrapped(mTextBox->getText() + text + "\n");
 }
 
 void