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, 9 insertions, 9 deletions

diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index d1fde2dd1..0cad8732a 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -123,7 +123,7 @@ class ChangeDisplay : public AttrDisplay, gcn::ActionListener
 };
 
 StatusWindow::StatusWindow():
-    Window(player_node ? player_node->getName() : "?")
+    Window(player_node ? player_node->getName() : "?", false, 0, "status.xml")
 {
     listen(Mana::CHANNEL_ATTRIBUTES);
 
@@ -276,8 +276,8 @@ StatusWindow::StatusWindow():
     mLvlLabel->adjustSize();
 }
 
-void StatusWindow::event(Mana::Channels channel A_UNUSED,
-                         const Mana::Event &event)
+void StatusWindow::processEvent(Mana::Channels channel A_UNUSED,
+                                const Mana::Event &event)
 {
     static bool blocked = false;
     if (blocked)
@@ -311,7 +311,7 @@ void StatusWindow::event(Mana::Channels channel A_UNUSED,
 
                 mCharacterPointsLabel->adjustSize();
                 // Update all attributes
-                for (Attrs::iterator it = mAttrs.begin();
+                for (Attrs::const_iterator it = mAttrs.begin();
                      it != mAttrs.end(); ++it)
                 {
                     if (it->second)
@@ -324,7 +324,7 @@ void StatusWindow::event(Mana::Channels channel A_UNUSED,
                     _("Correction points: %d"), event.getInt("newValue")));
                 mCorrectionPointsLabel->adjustSize();
                 // Update all attributes
-                for (Attrs::iterator it = mAttrs.begin();
+                for (Attrs::const_iterator it = mAttrs.begin();
                      it != mAttrs.end(); ++it)
                 {
                     if (it->second)
@@ -392,7 +392,7 @@ void StatusWindow::event(Mana::Channels channel A_UNUSED,
         else
         {
             updateMPBar(mMpBar, true);
-            Attrs::iterator it = mAttrs.find(id);
+            Attrs::const_iterator it = mAttrs.find(id);
             if (it != mAttrs.end() && it->second)
             {
                 if (it->second)
@@ -404,7 +404,7 @@ void StatusWindow::event(Mana::Channels channel A_UNUSED,
 
 void StatusWindow::setPointsNeeded(int id, int needed)
 {
-    Attrs::iterator it = mAttrs.find(id);
+    Attrs::const_iterator it = mAttrs.find(id);
 
     if (it != mAttrs.end())
     {
@@ -909,8 +909,8 @@ void StatusWindow::action(const gcn::ActionEvent &event)
 
     if (event.getId() == "copy")
     {
-        Attrs::iterator it = mAttrs.begin();
-        Attrs::iterator it_end = mAttrs.end();
+        Attrs::const_iterator it = mAttrs.begin();
+        Attrs::const_iterator it_end = mAttrs.end();
         std::string str;
         while (it != it_end)
         {