Removes trailing spaces. Removes tabs.

[vlc] / modules / gui / skins2 / macosx / macosx_graphics.hpp

diff --git a/modules/gui/skins2/macosx/macosx_graphics.hpp b/modules/gui/skins2/macosx/macosx_graphics.hpp
index eaefda516f6c7c4b8946fe048c24748937fea04f..639e867e075e0a67cbd849e7b596811a06bd458d 100644 (file)
--- a/modules/gui/skins2/macosx/macosx_graphics.hpp
+++ b/modules/gui/skins2/macosx/macosx_graphics.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * macosx_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>
@@ -18,13 +18,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 MACOSX_GRAPHICS_HPP
 #define MACOSX_GRAPHICS_HPP
 
 #include "../src/os_graphics.hpp"
+#include <Carbon/Carbon.h>
 
 class GenericWindow;
 class GenericBitmap;
@@ -48,7 +49,8 @@ class MacOSXGraphics: public OSGraphics
         /// Render a bitmap on this graphics
         virtual void drawBitmap( const GenericBitmap &rBitmap, int xSrc = 0,
                                  int ySrc = 0, int xDest = 0, int yDest = 0,
-                                 int width = -1, int height = -1 );
+                                 int width = -1, int height = -1,
+                                 bool blend = false );
 
         /// Draw a filled rectangle on the grahics (color is #RRGGBB)
         virtual void fillRect( int left, int top, int width, int height,