Moved Block code to block.cpp, was in the wrong file, i.e. bonus_block.cpp

[supertux.git] / src / gui / menu_item.hpp

diff --git a/src/gui/menu_item.hpp b/src/gui/menu_item.hpp
index dcebc2a..2281412 100644 (file)
--- a/src/gui/menu_item.hpp
+++ b/src/gui/menu_item.hpp
@@ -22,8 +22,6 @@
 #include <SDL.h>
 
 #include "gui/menu.hpp"
-#include "gui/mousecursor.hpp"
-#include "video/font.hpp"
 
 /* Kinds of menu items */
 enum MenuItemKind {
@@ -43,6 +41,10 @@ enum MenuItemKind {
 class MenuItem
 {
 public:
+  static MenuItem* create(MenuItemKind kind, const std::string& text,
+                          int init_toggle, int target_menu, int id, int key);
+
+public:
   MenuItem(MenuItemKind kind, int id = -1);
 
   void set_help(const std::string& help_text);
@@ -50,9 +52,6 @@ public:
   void change_text (const std::string& text);
   void change_input(const std::string& text);
 
-  static MenuItem* create(MenuItemKind kind, const std::string& text,
-                          int init_toggle, Menu* target_menu, int id, int key);
-
   std::string get_input_with_symbol(bool active_item);   // returns the text with an input symbol
 
 public:
@@ -66,7 +65,7 @@ public:
   std::vector<std::string> list; // list of values for a STRINGSELECT item
   size_t selected; // currently selected item
 
-  Menu* target_menu;
+  int target_menu;
 
 private:
   /// keyboard key or joystick button