Commit 4e2943d8 authored by Cyril Deguet's avatar Cyril Deguet

* changed OSGraphics constructor (needed for X11)

parent 3dae4454
......@@ -2,7 +2,7 @@
* gtk2_graphics.cpp: GTK2 implementation of the Graphics and Region classes
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: gtk2_graphics.cpp,v 1.17 2003/04/28 12:25:34 asmax Exp $
* $Id: gtk2_graphics.cpp,v 1.18 2003/05/13 19:25:59 asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -40,7 +40,7 @@
//---------------------------------------------------------------------------
// GTK2 GRAPHICS
//---------------------------------------------------------------------------
GTK2Graphics::GTK2Graphics( int w, int h, SkinWindow *from ) : Graphics( w, h )
GTK2Graphics::GTK2Graphics( intf_thread_t *p_intf, int w, int h, SkinWindow *from ) : Graphics( w, h )
{
if( from != NULL )
{
......
......@@ -2,7 +2,7 @@
* gtk2_graphics.h: GTK2 implementation of the Graphics and Region classes
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: gtk2_graphics.h,v 1.6 2003/04/28 12:25:34 asmax Exp $
* $Id: gtk2_graphics.h,v 1.7 2003/05/13 19:25:59 asmax Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -43,7 +43,7 @@ class GTK2Graphics : public Graphics
public:
// Constructor
GTK2Graphics( int w, int h, SkinWindow *from = NULL );
GTK2Graphics( intf_thread_t *p_intf, int w, int h, SkinWindow *from = NULL );
// Destructor
virtual ~GTK2Graphics();
// Drawing methods
......
......@@ -2,7 +2,7 @@
* window.cpp: Window class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: window.cpp,v 1.22 2003/04/30 21:16:24 asmax Exp $
* $Id: window.cpp,v 1.23 2003/05/13 19:25:59 asmax Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -290,8 +290,8 @@ void SkinWindow::RefreshImage( int x, int y, int w, int h )
unsigned int i;
// Create Bitmap Buffer
// Graphics *Buffer = (Graphics *)new OSGraphics( p_intf, w, h, this );
Graphics *Buffer = (Graphics *)new OSGraphics( w, h, this );
Graphics *Buffer = (Graphics *)new OSGraphics( p_intf, w, h, this );
// Graphics *Buffer = (Graphics *)new OSGraphics( w, h, this );
// Draw every control
for( i = 0; i < ControlList.size(); i++ )
......@@ -491,8 +491,8 @@ void SkinWindow::ReSize()
// Change image buffer
if( Image != NULL )
delete (OSGraphics *)Image;
// Image = (Graphics *)new OSGraphics( p_intf, w, h, this );
Image = (Graphics *)new OSGraphics( w, h, this );
Image = (Graphics *)new OSGraphics( p_intf, w, h, this );
// Image = (Graphics *)new OSGraphics( w, h, this );
Size( w, h );
}
......
......@@ -2,7 +2,7 @@
* win32_graphics.cpp: Win32 implementation of the Graphics and Region classes
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: win32_graphics.cpp,v 1.6 2003/04/28 12:25:34 asmax Exp $
* $Id: win32_graphics.cpp,v 1.7 2003/05/13 19:25:59 asmax Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -39,7 +39,7 @@
//---------------------------------------------------------------------------
// WIN32 GRAPHICS
//---------------------------------------------------------------------------
Win32Graphics::Win32Graphics( int w, int h, SkinWindow *from ) : Graphics( w, h )
Win32Graphics::Win32Graphics( intf_thread_t *p_intf, int w, int h, SkinWindow *from ) : Graphics( w, h )
{
HBITMAP HImage ;
Image = CreateCompatibleDC( NULL );
......
......@@ -2,7 +2,7 @@
* win32_graphics.h: Win32 implementation of the Graphics and Region classes
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: win32_graphics.h,v 1.5 2003/04/28 12:25:34 asmax Exp $
* $Id: win32_graphics.h,v 1.6 2003/05/13 19:25:59 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -40,7 +40,7 @@ class Win32Graphics : public Graphics
public:
// Constructor
Win32Graphics( int w, int h, SkinWindow *from = NULL );
Win32Graphics( intf_thread_t *p_intf, int w, int h, SkinWindow *from = NULL );
// Destructor
virtual ~Win32Graphics();
// Drawing methods
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment