- Cleanups

[supertux.git] / lib / gui / menu.h

diff --git a/lib/gui/menu.h b/lib/gui/menu.h
index a1e5c34..f4a3943 100644 (file)
--- a/lib/gui/menu.h
+++ b/lib/gui/menu.h
@@ -21,14 +21,17 @@
 #define SUPERTUX_MENU_H
 
 #include <vector>
+#include <set>
+#include <string>
+#include <utility>
 
 #include "SDL.h"
 
-#include "video/surface.h"
-#include "special/timer.h"
-#include "special/base.h"
-#include "special/stringlist.h"
-#include "gui/mousecursor.h"
+#include "../video/surface.h"
+#include "../video/font.h"
+#include "../special/timer.h"
+#include "../special/base.h"
+#include "../gui/mousecursor.h"
 
 namespace SuperTux
   {
@@ -67,7 +70,7 @@ namespace SuperTux
       char *input;
       int *int_p;   // used for setting keys (can be used for more stuff...)
       int id;   // item id
-      string_list_type* list;
+      std::pair<std::set<std::string>, std::set<std::string>::iterator> list;
       Menu* target_menu;
 
       void change_text (const char *text);
@@ -130,6 +133,12 @@ namespace SuperTux
       Timer joystick_timer;
 
     public:
+      static Font* default_font;
+      static Font* active_font;
+      static Font* deactive_font;
+      static Font* label_font;
+      static Font* field_font;
+    
       Timer effect;
       int arrange_left;
       int active_item;