X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgui%2Fbutton.cpp;h=6288665f3c916615e283ce5c1390f1d451fe3345;hb=c13404a6b6a97ad0d5e1c9f905d7a7e37b797c13;hp=d9f13c301a309136913c8ca03796c344194b8407;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git

diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index d9f13c301..6288665f3 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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
@@ -12,24 +12,23 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  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.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
 
-#include "SDL.h"
-#include <iostream>
+#include "button.hpp"
 
-#include "button.h"
-#include "mousecursor.h"
-#include "app/globals.h"
-#include "video/font.h"
-#include "video/surface.h"
+#include <SDL.h>
+#include <iostream>
 
-using namespace SuperTux;
+#include "main.hpp"
+#include "mousecursor.hpp"
+#include "video/font.hpp"
+#include "video/surface.hpp"
+#include "video/drawing_context.hpp"
 
 Font* Button::info_font = 0;
 extern SDL_Surface* screen;
@@ -40,7 +39,7 @@ Button::Button(Surface* image_, std::string info_, SDLKey binding_)
   : binding(binding_)
 {
   image = image_;
-  size = Vector(image->w, image->h);
+  size = Vector(image->get_width(), image->get_height());
   id = 0;
   info = info_;
 }
@@ -64,13 +63,13 @@ if(state == BT_SHOW_INFO)
     offset = Vector(size.x, - 10);
   else if(pos.x + tanslation.x < 100)
     offset = Vector(size.x, 0);
-  else 
+  else
     offset = Vector(-30, -size.y/2);
-  context.draw_text(info_font, info, pos + offset, LEFT_ALLIGN, LAYER_GUI+2);
+  context.draw_text(info_font, info, pos + offset, ALIGN_LEFT, LAYER_GUI+2);
   if(binding != 0)
     context.draw_text(info_font, "(" + std::string(SDL_GetKeyName(binding)) +
                                  ")", pos + offset + Vector(0,12),
-                                 LEFT_ALLIGN,  LAYER_GUI+2);
+                                 ALIGN_LEFT,  LAYER_GUI+2);
   }
 
 context.draw_surface_part(image, Vector(0,0), size, pos, LAYER_GUI+1);
@@ -97,7 +96,7 @@ switch(event.type)
         state = BT_SELECTED;
       }
     break;
-  case SDL_KEYDOWN:	// key pressed
+  case SDL_KEYDOWN:        // key pressed
     if(event.key.keysym.sym == binding)
       state = BT_SELECTED;
     break;
@@ -165,7 +164,7 @@ for(Buttons::iterator i = buttons.begin(); i != buttons.end(); ++i)
       i->pos.y + i->size.y > (row + buttons_box.y) * buttons_size.y)
     continue;
 
-  i->draw(context, i->id == button_selected ? true : false);
+  i->draw(context, i->id == button_selected);
   }
 context.pop_transform();
 }
@@ -181,7 +180,7 @@ switch(event.type)
 
     if(mouse_left_button)
       {
-      pos.x += int(event.motion.xrel * float(SCREEN_WIDTH)/screen->w); 
+      pos.x += int(event.motion.xrel * float(SCREEN_WIDTH)/screen->w);
       pos.y += int(event.motion.yrel * float(SCREEN_HEIGHT)/screen->h);
       caught_event = true;
       }