Merge branch 'master' into strippedstripped1.1.10.2

Conflicts:
	packaging/debian/watch

1 files changed, 6 insertions, 0 deletions

diff --git a/src/gui/buydialog.h b/src/gui/buydialog.h
index 0ba2e5cb3..53d20e1e5 100644
--- a/src/gui/buydialog.h
+++ b/src/gui/buydialog.h
@@ -38,6 +38,7 @@
 
 class ShopItems;
 class ShopListBox;
+class IntTextField;
 class ListBox;
 
 /**
@@ -124,6 +125,8 @@ class BuyDialog : public Window, public gcn::ActionListener,
          */
         static void closeAll();
 
+        void scheduleDelete();
+
     private:
         typedef std::list<BuyDialog*> DialogList;
         static DialogList instances;
@@ -140,6 +143,8 @@ class BuyDialog : public Window, public gcn::ActionListener,
         gcn::Label *mMoneyLabel;
         gcn::Label *mQuantityLabel;
         gcn::Slider *mSlider;
+        gcn::Label *mAmountLabel;
+        IntTextField *mAmountField;
 
         ShopItems *mShopItems;
 
@@ -147,6 +152,7 @@ class BuyDialog : public Window, public gcn::ActionListener,
         int mAmountItems;
         int mMaxItems;
         std::string mNick;
+        bool mEnabledKeyboard;
 };
 
 #endif