X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgui%2Fmenu.h;h=dba01bc4776a1d1644e0d10b4c2c30cc1215639e;hb=11ea32de7fcc2d667b13f95bb7097d808e6b0dd4;hp=3c6bad0912ee6475ab13b4f364f1c2c514e4253e;hpb=be3627a9c6fc5bb27e5297da512d59a7eb4033a2;p=supertux.git

diff --git a/src/gui/menu.h b/src/gui/menu.h
index 3c6bad091..dba01bc47 100644
--- a/src/gui/menu.h
+++ b/src/gui/menu.h
@@ -29,7 +29,6 @@
 
 #include "video/surface.h"
 #include "video/font.h"
-#include "special/timer.h"
 #include "mousecursor.h"
 
 bool confirm_dialog(Surface* background, std::string text);
@@ -76,13 +75,12 @@ public:
 
 private:
   /// copy-construction not allowed
-  MenuItem(const MenuItem& other) { assert(false); }
+  MenuItem(const MenuItem& ) { assert(false); }
   /// assignment not allowed
-  void operator= (const MenuItem& other) { assert(false); }
+  void operator= (const MenuItem& ) { assert(false); }
 
   /// keyboard key or joystick button
   bool input_flickering;
-  Timer input_flickering_timer;
 };
 
 class Menu
@@ -132,7 +130,7 @@ private:
   /* input implementation variables */
   int delete_character;
   char mn_input_char;
-  Timer repeat_timer;
+  Uint32 menu_repeat_ticks;
 
 public:
   static Font* default_font;
@@ -144,7 +142,7 @@ public:
   std::vector<MenuItem*> items;
   
   Menu();
-  ~Menu();
+  virtual ~Menu();
   
   void add_hl();
   void add_label(const std::string& text);
@@ -192,7 +190,7 @@ protected:
 private:
   void check_controlfield_change_event(const SDL_Event& event);  
   void draw_item(DrawingContext& context, int index);
-  Timer effect;
+  Uint32 effect_ticks;
   int arrange_left;
   int active_item;
 };