Merged with Aethyra master as of 2009-02-09

Conflicts:
	A lot of files...

1 files changed, 5 insertions, 6 deletions

diff --git a/src/gui/npcstringdialog.h b/src/gui/npcstringdialog.h
index 5aea2de0..1933e0f1 100644
--- a/src/gui/npcstringdialog.h
+++ b/src/gui/npcstringdialog.h
@@ -22,16 +22,10 @@
 #ifndef GUI_NPCSTRINGDIALOG_H
 #define GUI_NPCSTRINGDIALOG_H
 
-#include <iosfwd>
-#include <vector>
-
 #include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
 
 #include "window.h"
 
-#include "../guichanfwd.h"
-
 /**
  * The npc integer input dialog.
  *
@@ -69,6 +63,11 @@ class NpcStringDialog : public Window, public gcn::ActionListener
          */
         bool isInputFocused();
 
+        /**
+         * Requests the textfield to take focus for input.
+         */
+        void requestFocus();
+
     private:
         gcn::TextField *mValueField;
         gcn::Button *okButton;