Merge branch 'master' into strippedstripped1.1.9.18

Conflicts:
	src/guichan/cliprectangle.cpp
	src/guichan/focushandler.cpp
	src/guichan/gui.cpp
	src/guichan/include/guichan/cliprectangle.hpp
	src/guichan/include/guichan/inputevent.hpp
	src/guichan/include/guichan/keyevent.hpp
	src/guichan/include/guichan/mouseevent.hpp
	src/guichan/include/guichan/widgets/button.hpp
	src/guichan/include/guichan/widgets/checkbox.hpp
	src/guichan/include/guichan/widgets/dropdown.hpp
	src/guichan/include/guichan/widgets/radiobutton.hpp
	src/guichan/include/guichan/widgets/slider.hpp
	src/guichan/include/guichan/widgets/tab.hpp
	src/guichan/include/guichan/widgets/tabbedarea.hpp
	src/guichan/include/guichan/widgets/textfield.hpp
	src/guichan/include/guichan/widgets/window.hpp
	src/guichan/inputevent.cpp
	src/guichan/keyevent.cpp
	src/guichan/mouseevent.cpp
	src/guichan/widget.cpp
	src/guichan/widgets/button.cpp
	src/guichan/widgets/checkbox.cpp
	src/guichan/widgets/dropdown.cpp
	src/guichan/widgets/radiobutton.cpp
	src/guichan/widgets/slider.cpp
	src/guichan/widgets/tab.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textfield.cpp
	src/guichan/widgets/window.cpp

1 files changed, 12 insertions, 3 deletions

diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 503423ad3..c32fd8905 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -41,11 +41,14 @@
 #define A_UNUSED
 #endif
 
+class DropDown;
 class Item;
 class ItemContainer;
 class InventoryFilter;
 class ProgressBar;
-class TextBox;
+class SortListModel;
+//class TextBox;
+class TextField;
 
 /**
  * Inventory dialog.
@@ -124,10 +127,14 @@ class InventoryWindow : public Window,
 
         void updateDropButton();
 
-        void event(Mana::Channels channel, const Mana::Event &event);
+        void processEvent(Mana::Channels channel, const Mana::Event &event);
 
         void updateButtons(Item *item = 0);
 
+        bool isInputFocused() const;
+
+        static bool isAnyInputFocused();
+
     private:
         /**
          * Updates the weight bar.
@@ -151,7 +158,9 @@ class InventoryWindow : public Window,
 
         ProgressBar *mWeightBar, *mSlotsBar;
         InventoryFilter *mFilter;
-        InventoryFilter *mSorter;
+        DropDown *mSortDropDown;
+        SortListModel *mSortModel;
+        TextField *mNameFilter;
 
         bool mSplit;
 };