Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

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

diff --git a/src/gui/button.hpp b/src/gui/button.hpp
index 6491873..405b25b 100644 (file)
--- a/src/gui/button.hpp
+++ b/src/gui/button.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,16 +12,14 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef SUPERTUX_BUTTON_H
-#define SUPERTUX_BUTTON_H
+#ifndef HEADER_SUPERTUX_GUI_BUTTON_HPP
+#define HEADER_SUPERTUX_GUI_BUTTON_HPP
 
-#include <vector>
+#include <SDL.h>
 #include <string>
-
-#include "SDL.h"
+#include <vector>
 
 #include "math/vector.hpp"
 
@@ -37,7 +33,7 @@ enum {
   BT_HOVER,
   BT_SELECTED,
   BT_SHOW_INFO
-  };
+};
 
 class Button
 {
@@ -53,7 +49,8 @@ public:
 private:
   friend class ButtonGroup;
 
-  Vector pos, size;
+  Vector pos;
+  Vector size;
 
   Surface* image;
   SDLKey binding;
@@ -63,31 +60,6 @@ private:
   std::string info;
 };
 
-class ButtonGroup
-{
-public:
-  ButtonGroup(Vector pos_, Vector size_, Vector button_box_);
-  ~ButtonGroup();
-
-  void draw(DrawingContext& context);
-  bool event(SDL_Event& event);
-
-  void add_button(Button button, int id, bool select = false);
-  void add_pair_of_buttons(Button button1, int id1, Button button2, int id2);
-
-  int selected_id();
-  void set_unselected();
-  bool is_hover();
-
-private:
-  Vector pos, buttons_size, buttons_box;
-  typedef std::vector <Button> Buttons;
-  Buttons buttons;
-
-  int button_selected, row;
-  bool mouse_hover, mouse_left_button;
-
-  int buttons_pair_nb;
-};
-
 #endif
+
+/* EOF */