Merged with Aethyra master as of 2009-02-09

Conflicts:
	A lot of files...

1 files changed, 11 insertions, 8 deletions

diff --git a/src/gui/npcintegerdialog.h b/src/gui/npcintegerdialog.h
index 983c46fe..10ec60b9 100644
--- a/src/gui/npcintegerdialog.h
+++ b/src/gui/npcintegerdialog.h
@@ -22,16 +22,10 @@
 #ifndef GUI_NPCINTEGERDIALOG_H
 #define GUI_NPCINTEGERDIALOG_H
 
-#include <iosfwd>
-#include <vector>
-
 #include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
 
 #include "window.h"
 
-#include "../guichanfwd.h"
-
 class IntTextField;
 
 /**
@@ -39,8 +33,7 @@ class IntTextField;
  *
  * \ingroup Interface
  */
-class NpcIntegerDialog : public Window, public gcn::ActionListener,
-                         public gcn::KeyListener
+class NpcIntegerDialog : public Window, public gcn::ActionListener
 {
     public:
         /**
@@ -68,6 +61,16 @@ class NpcIntegerDialog : public Window, public gcn::ActionListener,
          */
         void setRange(const int min, const int max);
 
+        /**
+         * Checks whether NpcStringDialog is Focused or not.
+         */
+        bool isInputFocused();
+
+        /**
+         * Requests the textfield to take focus for input.
+         */
+        void requestFocus();
+
     private:
         gcn::Button *mDecButton;
         gcn::Button *mIncButton;