- Remove ManagedSoundSource

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

diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index d9f13c3..148ac84 100644 (file)
--- 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,21 @@
 //  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 <SDL.h>
 #include <iostream>
 
-#include "button.h"
-#include "mousecursor.h"
-#include "app/globals.h"
-#include "video/font.h"
-#include "video/surface.h"
-
-using namespace SuperTux;
+#include "main.hpp"
+#include "button.hpp"
+#include "mousecursor.hpp"
+#include "video/font.hpp"
+#include "video/surface.hpp"
 
 Font* Button::info_font = 0;
 extern SDL_Surface* screen;
@@ -40,7 +37,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_;
 }