Alt+m for testing menu, menuitems the same as button

3 files changed, 27 insertions, 10 deletions

diff --git a/src/gui/buddywindow.cpp b/src/gui/buddywindow.cpp
index 2e81c798..b57b32dd 100644
--- a/src/gui/buddywindow.cpp
+++ b/src/gui/buddywindow.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "buddywindow.h"
-#include "menuitem.h"
+#include "menu.h"
 
 BuddyWindow::BuddyWindow():
     Window("Buddys")
@@ -38,9 +38,6 @@ BuddyWindow::BuddyWindow():
     add(scrollArea);
 
     addBuddy("Usiu"); // for testing
-    MenuItem *item = new MenuItem("Test");
-    item->setPosition(0, 200 - item->getHeight());
-    add(item);
 }
 
 BuddyWindow::~BuddyWindow()
diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp
index c74ca5ea..74721d09 100644
--- a/src/gui/menu.cpp
+++ b/src/gui/menu.cpp
@@ -23,8 +23,23 @@
 
 #include "menu.h"
 
-Menu::Menu(const std::vector<MenuItem>& items)
+Menu::Menu(const std::string& menulabel, std::vector<MenuItem>& items):
+    Window(menulabel)
 {
+    setContentSize(40,60);
+    fill(items);
+}
 
+Menu::~Menu()
+{
 }
 
+void Menu::fill(std::vector<MenuItem>& items)
+{   
+    for(std::vector<MenuItem>::iterator item = items.begin();
+            item != items.end(); ++item) 
+    {
+        item->setPosition(0,0);
+        add(&*item);
+    }
+}
diff --git a/src/gui/menu.h b/src/gui/menu.h
index 3d24827a..a726e6a8 100644
--- a/src/gui/menu.h
+++ b/src/gui/menu.h
@@ -26,17 +26,22 @@
 
 #include <guichan.hpp>
 #include "menuitem.h"
+#include "window.h"
 
-class Menu : public gcn::Widget
-{
+class Menu : public Window {
     public:
         /**
          * Constructor.
          */
-        Menu(const std::vector<MenuItem>& items);
+        Menu(const std::string& menulabel, std::vector<MenuItem>& items);
+
+        /**
+         * Destructor.
+         */
+        ~Menu();
+
+        void fill(std::vector<MenuItem>& items);
 
-    private:
-        int i;
 };
 
 #endif /* _TMW_MENU_H */