Merged Guichan 0.5.0 support from guichan-0.5.0 branch, plus several updates

from the 0.1.0 branch.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 503f7ba8..701d9366 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -39,7 +39,7 @@ namespace {
         /**
          * Called when receiving actions from widget.
          */
-        void action(const std::string& eventId);
+        void action(const std::string& eventId, gcn::Widget* widget);
     } listener;
 }
 
@@ -69,13 +69,13 @@ MenuWindow::MenuWindow():
     setDefaultSize((windowContainer->getWidth() - x - 2), 0, x, (y + h));
 }
 
-void MenuWindow::draw(gcn::Graphics *g)
+void MenuWindow::draw(gcn::Graphics *graphics)
 {
-    Window::drawContent(g);
+    drawChildren(graphics);
 }
 
 
-void MenuWindowListener::action(const std::string& eventId)
+void MenuWindowListener::action(const std::string& eventId, gcn::Widget* widget)
 {
     Window *window = NULL;
     if (eventId == "Status")