Merge branch 'eathena/master'

Conflicts:
	A lot of files.

1 files changed, 5 insertions, 9 deletions

diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 25ece461..e6ae2d3b 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -25,7 +25,9 @@
 
 #include "button.h"
 #include "menuwindow.h"
-#include "windowcontainer.h"
+#include "window.h"
+
+#include "../graphics.h"
 
 #include "../utils/gettext.h"
 
@@ -54,13 +56,8 @@ namespace {
 }
 
 MenuWindow::MenuWindow():
-    Window()
+    Popup("Menu")
 {
-    setResizable(false);
-    setWindowName("Menu");
-    setMovable(false);
-    setTitleBarHeight(0);
-
     // Buttons
     static const char *buttonNames[] =
     {
@@ -90,7 +87,7 @@ MenuWindow::MenuWindow():
         h = btn->getHeight();
     }
 
-    setPosition(windowContainer->getWidth() - x - 3, 3);
+    setPosition(graphics->getWidth() - x - 3, 3);
     setContentSize(x - 3, h);
 }
 
@@ -99,7 +96,6 @@ void MenuWindow::draw(gcn::Graphics *graphics)
     drawChildren(graphics);
 }
 
-
 void MenuWindowListener::action(const gcn::ActionEvent &event)
 {
     Window *window = NULL;