* changed OSGraphics constructor (needed for X11)

diff --git a/modules/gui/skins/gtk2/gtk2_graphics.cpp b/modules/gui/skins/gtk2/gtk2_graphics.cpp
index b84fc25556238048760b7da7c1553519d4ae98bb..ceb4c0f72730221e2aea44a479dc74d5341cd409 100644 (file)
--- 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 96347bed5d1b2cf8a5966d93e448155851dcdac8..c808a987ca9c514970d12866837d977a72e61e14 100644 (file)
--- 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 e2001dbb8d4633570bf71360d6fa9346a29270e2..85456631699f415297657c40aa89b9831dc56cba 100644 (file)
--- 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 5b374f0d0c26013a266070e8f7474ccbe38fdc05..26ea95132ed242e3634e15410f73439d5635923a 100644 (file)
--- 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 b952e63de84dfde42c8bf2f26352cdcd788c86f3..97cef63b6e268206ae3566255dcf2e7488ebb7ac 100644 (file)
--- 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