Uniformize source files encoding

[vlc] / modules / gui / skins2 / src / os_graphics.hpp

diff --git a/modules/gui/skins2/src/os_graphics.hpp b/modules/gui/skins2/src/os_graphics.hpp
index 6133120b2dc9805c72b88c42f5cfdc4f7b54e41b..8d744765f79383974687d456c28e602637ca95cd 100644 (file)
--- a/modules/gui/skins2/src/os_graphics.hpp
+++ b/modules/gui/skins2/src/os_graphics.hpp
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * os_graphics.hpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2003 the VideoLAN team
  * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
- *          Olivier Teulière <ipkiss@via.ecp.fr>
+ *          Olivier Teulière <ipkiss@via.ecp.fr>
  *
  * 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
@@ -19,13 +19,14 @@
  *
  * 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, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef OS_GRAPHICS_HPP
 #define OS_GRAPHICS_HPP
 
 #include "skin_common.hpp"
+#include "../utils/position.hpp"
 #include "../utils/pointer.hpp"
 
 class GenericBitmap;
@@ -33,7 +34,7 @@ class OSWindow;
 
 
 /// OS specific graphics class
-class OSGraphics: public SkinObject
+class OSGraphics: public SkinObject, public Box
 {
     public:
         virtual ~OSGraphics() {}
@@ -72,10 +73,6 @@ class OSGraphics: public SkinObject
         /// Tell whether the pixel at the given position is visible
         virtual bool hit( int x, int y ) const = 0;
 
-        /// Getters
-        virtual int getWidth() const = 0;
-        virtual int getHeight() const = 0;
-
     protected:
         OSGraphics( intf_thread_t *pIntf ): SkinObject( pIntf ) {}
 };