Added cast around GLEW_ARB_texture_non_power_of_two, as it might be a char and screw...

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

diff --git a/src/gui/menu.hpp b/src/gui/menu.hpp
index 13f7e22..b00c9c8 100644 (file)
--- a/src/gui/menu.hpp
+++ b/src/gui/menu.hpp
@@ -21,11 +21,12 @@
 #include <memory>
 #include <SDL.h>
 
+#include "math/vector.hpp"
 #include "video/color.hpp"
+#include "video/surface_ptr.hpp"
 
 class DrawingContext;
 class MenuItem;
-class Surface;
 
 bool confirm_dialog(Surface* background, std::string text);
 
@@ -114,8 +115,7 @@ private:
   int hit_item;
 
   // position of the menu (ie. center of the menu, not top/left)
-  float pos_x;
-  float pos_y;
+  Vector pos;
 
   /** input event for the menu (up, down, left, right, etc.) */
   MenuAction menuaction;
@@ -138,11 +138,11 @@ private:
   int arrange_left;
   int active_item;
 
-  std::auto_ptr<Surface> checkbox;
-  std::auto_ptr<Surface> checkbox_checked;
-  std::auto_ptr<Surface> back;
-  std::auto_ptr<Surface> arrow_left;
-  std::auto_ptr<Surface> arrow_right;
+  SurfacePtr checkbox;
+  SurfacePtr checkbox_checked;
+  SurfacePtr back;
+  SurfacePtr arrow_left;
+  SurfacePtr arrow_right;
 };
 
 #endif