From 4e2943d81e08b7ebfd244d11e4a1ed3e98e386bf Mon Sep 17 00:00:00 2001
From: Cyril Deguet <asmax@videolan.org>
Date: Tue, 13 May 2003 19:25:59 +0000
Subject: [PATCH] * changed OSGraphics constructor (needed for X11)
---
modules/gui/skins/gtk2/gtk2_graphics.cpp | 4 ++--
modules/gui/skins/gtk2/gtk2_graphics.h | 4 ++--
modules/gui/skins/src/window.cpp | 10 +++++-----
modules/gui/skins/win32/win32_graphics.cpp | 4 ++--
modules/gui/skins/win32/win32_graphics.h | 4 ++--
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/modules/gui/skins/gtk2/gtk2_graphics.cpp b/modules/gui/skins/gtk2/gtk2_graphics.cpp
index b84fc2555623..ceb4c0f72730 100644
--- a/modules/gui/skins/gtk2/gtk2_graphics.cpp
+++ b/modules/gui/skins/gtk2/gtk2_graphics.cpp
@@ -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 )
{
diff --git a/modules/gui/skins/gtk2/gtk2_graphics.h b/modules/gui/skins/gtk2/gtk2_graphics.h
index 96347bed5d1b..c808a987ca9c 100644
--- a/modules/gui/skins/gtk2/gtk2_graphics.h
+++ b/modules/gui/skins/gtk2/gtk2_graphics.h
@@ -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 Teulière <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
diff --git a/modules/gui/skins/src/window.cpp b/modules/gui/skins/src/window.cpp
index e2001dbb8d46..85456631699f 100644
--- a/modules/gui/skins/src/window.cpp
+++ b/modules/gui/skins/src/window.cpp
@@ -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 Teulière <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 );
}
diff --git a/modules/gui/skins/win32/win32_graphics.cpp b/modules/gui/skins/win32/win32_graphics.cpp
index 5b374f0d0c26..26ea95132ed2 100644
--- a/modules/gui/skins/win32/win32_graphics.cpp
+++ b/modules/gui/skins/win32/win32_graphics.cpp
@@ -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 Teulière <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 );
diff --git a/modules/gui/skins/win32/win32_graphics.h b/modules/gui/skins/win32/win32_graphics.h
index b952e63de84d..97cef63b6e26 100644
--- a/modules/gui/skins/win32/win32_graphics.h
+++ b/modules/gui/skins/win32/win32_graphics.h
@@ -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
--
GitLab