qMax <qwiglydee@gmail.com>'s font patch, adds unicode support and support for drawing...

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

diff --git a/src/gui/menu.hpp b/src/gui/menu.hpp
index 6aaeb3f..2875b13 100644 (file)
--- a/src/gui/menu.hpp
+++ b/src/gui/menu.hpp
@@ -91,6 +91,11 @@ private:
 \f
 class Menu
 {
+  static Color default_color;
+  static Color active_color;
+  static Color inactive_color;
+  static Color label_color;
+  static Color field_color;
 private:
   static std::vector<Menu*> last_menus;
 
@@ -149,12 +154,6 @@ private:
   bool close;
 
 public:
-  static Font* default_font;
-  static Font* active_font;
-  static Font* inactive_font;
-  static Font* label_font;
-  static Font* field_font;
-
   std::vector<MenuItem*> items;
 
   Menu();