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

diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp
index 08e3d0053..3e66f42cb 100644
--- a/src/gui/ministatuswindow.cpp
+++ b/src/gui/ministatuswindow.cpp
@@ -52,7 +52,7 @@
 extern volatile int tick_time;
 
 MiniStatusWindow::MiniStatusWindow():
-    Popup("MiniStatus")
+    Popup("MiniStatus", "ministatus.xml")
 {
     listen(Mana::CHANNEL_ATTRIBUTES);
 
@@ -134,7 +134,7 @@ MiniStatusWindow::~MiniStatusWindow()
     if (inv)
         inv->removeInventoyListener(this);
 
-    std::vector <ProgressBar*>::iterator it, it_end;
+    std::vector <ProgressBar*>::const_iterator it, it_end;
     for (it = mBars.begin(), it_end = mBars.end(); it != it_end; ++it)
     {
         ProgressBar *bar = *it;
@@ -160,7 +160,7 @@ ProgressBar *MiniStatusWindow::createBar(float progress, int width, int height,
 void MiniStatusWindow::updateBars()
 {
     int x = 0;
-    std::vector <ProgressBar*>::iterator it, it_end;
+    std::vector <ProgressBar*>::const_iterator it, it_end;
     ProgressBar* lastBar = 0;
     for (it = mBars.begin(), it_end = mBars.end(); it != it_end; ++it)
         safeRemove(*it);
@@ -218,8 +218,8 @@ void MiniStatusWindow::drawIcons(Graphics *graphics)
     }
 }
 
-void MiniStatusWindow::event(Mana::Channels channel A_UNUSED,
-                             const Mana::Event &event)
+void MiniStatusWindow::processEvent(Mana::Channels channel A_UNUSED,
+                                    const Mana::Event &event)
 {
     if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE)
     {
@@ -400,12 +400,12 @@ void MiniStatusWindow::mouseExited(gcn::MouseEvent &event)
     mStatusPopup->hide();
 }
 
-void MiniStatusWindow::showBar(std::string name, bool isVisible)
+void MiniStatusWindow::showBar(std::string name, bool visible)
 {
     ProgressBar *bar = mBarNames[name];
     if (!bar)
         return;
-    bar->setVisible(isVisible);
+    bar->setVisible(visible);
     updateBars();
     saveBars();
 }
@@ -439,7 +439,7 @@ void MiniStatusWindow::loadBars()
 
 void MiniStatusWindow::saveBars()
 {
-    std::vector <ProgressBar*>::iterator it, it_end;
+    std::vector <ProgressBar*>::const_iterator it, it_end;
     int i = 0;
     for (it = mBars.begin(), it_end = mBars.end();
          it != it_end; ++it)