* button.cpp: Button control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: button.cpp,v 1.10 2003/04/17 13:08:02 karibu Exp $
+ * $Id: button.cpp,v 1.11 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
string Up, string Down, string Disabled,
string onclick, string onmouseover, string onmouseout,
string tooltiptext, string help,
- Window *Parent ) : GenericControl( id, visible, help, Parent )
+ SkinWindow *Parent ) : GenericControl( id, visible, help, Parent )
{
// General
Left = x;
* button.h: Button control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: button.h,v 1.2 2003/03/19 02:09:56 videolan Exp $
+ * $Id: button.h,v 1.3 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
class Action;
class Graphics;
-class Window;
+class SkinWindow;
//---------------------------------------------------------------------------
class ControlButton : public GenericControl
string Up, string Down, string Disabled,
string onclick, string onmousevoer, string onmouseout,
string tooltiptext, string help,
- Window *Parent );
+ SkinWindow *Parent );
// Destructor
virtual ~ControlButton();
* checkbox.cpp: Checkbox control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: checkbox.cpp,v 1.4 2003/04/16 21:40:07 ipkiss Exp $
+ * $Id: checkbox.cpp,v 1.5 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
string onclick1, string onclick2, string onmouseover1,
string onmouseout1, string onmouseover2, string onmouseout2,
string tooltiptext1, string tooltiptext2, string help,
- Window *Parent ) : GenericControl( id, visible, help, Parent )
+ SkinWindow *Parent ) : GenericControl( id, visible, help, Parent )
{
Left = x;
Top = y;
* checkbox.h: Checkbox control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: checkbox.h,v 1.2 2003/03/19 17:14:50 karibu Exp $
+ * $Id: checkbox.h,v 1.3 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
class Action;
class Graphics;
-class Window;
+class SkinWindow;
//---------------------------------------------------------------------------
class ControlCheckBox : public GenericControl
string onclick1, string onclick2, string onmouseover1,
string onmouseout1, string onmouseover2, string onmouseout2,
string tooltiptext1, string tooltiptext2, string help,
- Window *Parent );
+ SkinWindow *Parent );
// Destructor
virtual ~ControlCheckBox();
* generic.cpp: Generic control, parent of the others
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: generic.cpp,v 1.3 2003/04/20 13:14:14 asmax Exp $
+ * $Id: generic.cpp,v 1.4 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
// Generic Control
//---------------------------------------------------------------------------
GenericControl::GenericControl( string id, bool visible, string help,
- Window *Parent )
+ SkinWindow *Parent )
{
ID = id;
Visible = visible;
* generic.h: Generic control, parent of the others
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: generic.h,v 1.2 2003/04/20 13:14:14 asmax Exp $
+ * $Id: generic.h,v 1.3 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
struct intf_thread_t;
-class Window;
+class SkinWindow;
class Bitmap;
class Graphics;
class Region;
class GenericControl // This is the generic control class
{
protected:
- Window * ParentWindow;
+ SkinWindow * ParentWindow;
bool Visible;
string ID;
string Help;
private:
public:
// Constructor
- GenericControl( string id, bool visible, string help, Window *Parent );
+ GenericControl( string id, bool visible, string help, SkinWindow *Parent );
// Destructor
virtual ~GenericControl();
* image.cpp: Image control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: image.cpp,v 1.5 2003/04/16 21:40:07 ipkiss Exp $
+ * $Id: image.cpp,v 1.6 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
// Control Image
//---------------------------------------------------------------------------
ControlImage::ControlImage( string id, bool visible, int x, int y, string img,
- string event, string help, Window *Parent )
+ string event, string help, SkinWindow *Parent )
: GenericControl( id, visible, help, Parent )
{
Left = x;
* image.h: Image control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: image.h,v 1.1 2003/03/18 02:21:47 ipkiss Exp $
+ * $Id: image.h,v 1.2 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
class Action;
class Graphics;
-class Window;
+class SkinWindow;
//---------------------------------------------------------------------------
class ControlImage : public GenericControl
public:
// Constructor
ControlImage( string id, bool visible, int x, int y, string img,
- string event, string help, Window *Parent);
+ string event, string help, SkinWindow *Parent);
// Destructor
virtual ~ControlImage();
* playlist.cpp: Playlist control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: playlist.cpp,v 1.7 2003/04/21 14:26:59 asmax Exp $
+ * $Id: playlist.cpp,v 1.8 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
ControlPlayList::ControlPlayList( string id, bool visible, int width,
int infowidth, string font, string playfont, int selcolor, double *ptx,
- double *pty, int nb, bool longfilename, string help, Window *Parent )
+ double *pty, int nb, bool longfilename, string help, SkinWindow *Parent )
: GenericControl( id, visible, help, Parent )
{
Left = 0;
* playlist.h: Playlist control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: playlist.h,v 1.2 2003/04/20 13:14:14 asmax Exp $
+ * $Id: playlist.h,v 1.3 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
class Event;
class Graphics;
-class Window;
+class SkinWindow;
class Font;
class Bezier;
class Region;
ControlPlayList( string id, bool visible, int width, int infowidth,
string font, string playfont, int selcolor,
double *ptx, double *pty, int nb, bool longfilename,
- string help, Window *Parent );
+ string help, SkinWindow *Parent );
// Destructor
virtual ~ControlPlayList();
* rectangle.cpp: Rectanglee control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: rectangle.cpp,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
+ * $Id: rectangle.cpp,v 1.4 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
// Control Rectangle
//---------------------------------------------------------------------------
ControlRectangle::ControlRectangle( string id, bool visible, int x, int y,
- int w, int h, int color, string event, string help, Window *Parent )
+ int w, int h, int color, string event, string help, SkinWindow *Parent )
: GenericControl( id, visible, help, Parent )
{
Left = x;
* rectangle.h: Rectangle control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: rectangle.h,v 1.2 2003/03/18 04:08:45 ipkiss Exp $
+ * $Id: rectangle.h,v 1.3 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
class Action;
class Graphics;
-class Window;
+class SkinWindow;
//---------------------------------------------------------------------------
class ControlRectangle : public GenericControl
public:
// Constructor
ControlRectangle( string id, bool visible, int x, int y, int w, int h,
- int color, string event, string help, Window *Parent);
+ int color, string event, string help, SkinWindow *Parent);
// Destructor
virtual ~ControlRectangle();
* slider.cpp: Slider control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: slider.cpp,v 1.6 2003/04/20 15:00:19 karibu Exp $
+ * $Id: slider.cpp,v 1.7 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
ControlSlider::ControlSlider( string id, bool visible, string type,
string cursorUp, string cursorDown, double *ptx, double *pty, int nb,
- string tooltiptext, string help, Window *Parent )
+ string tooltiptext, string help, SkinWindow *Parent )
: GenericControl( id, visible, help, Parent )
{
Type = type;
* slider.h: Slider control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: slider.h,v 1.3 2003/04/20 15:00:19 karibu Exp $
+ * $Id: slider.h,v 1.4 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
class Event;
class Graphics;
-class Window;
+class SkinWindow;
class Bezier;
class Region;
// Constructor
ControlSlider( string id, bool visible, string type, string cursorUp,
string cursorDown, double *ptx, double *pty, int nb,
- string tooltiptext, string help, Window *Parent );
+ string tooltiptext, string help, SkinWindow *Parent );
// Destructor
virtual ~ControlSlider();
* text.cpp: Text control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: text.cpp,v 1.6 2003/04/17 19:56:31 karibu Exp $
+ * $Id: text.cpp,v 1.7 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
ControlText::ControlText( string id, bool visible, int x, int y, string text,
string font, int align, int width, string display, bool scroll,
- int scrollspace, string help, Window *Parent )
+ int scrollspace, string help, SkinWindow *Parent )
: GenericControl( id, visible, help, Parent )
{
InitLeft = x;
* text.h: Text control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: text.h,v 1.2 2003/04/17 13:08:02 karibu Exp $
+ * $Id: text.h,v 1.3 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
class Event;
class BitmapBank;
class Graphics;
-class Window;
+class SkinWindow;
class Region;
class Font;
// Constructor
ControlText( string id, bool visible, int x, int y, string text,
string font, int align, int width, string display,
- bool scroll, int scrollspace, string help, Window *Parent );
+ bool scroll, int scrollspace, string help, SkinWindow *Parent );
// initialization
virtual void Init();
* gtk2_api.cpp: Various gtk2-specific functions
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: gtk2_api.cpp,v 1.12 2003/04/21 00:18:37 asmax Exp $
+ * $Id: gtk2_api.cpp,v 1.13 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
//---------------------------------------------------------------------------
// Event API
//---------------------------------------------------------------------------
-void OSAPI_SendMessage( Window *win, unsigned int message, unsigned int param1,
+void OSAPI_SendMessage( SkinWindow *win, unsigned int message, unsigned int param1,
long param2 )
{
/* if( win == NULL )
param2 );*/
}
//---------------------------------------------------------------------------
-void OSAPI_PostMessage( Window *win, unsigned int message, unsigned int param1,
+void OSAPI_PostMessage( SkinWindow *win, unsigned int message, unsigned int param1,
long param2 )
{
GdkEventClient *event = new GdkEventClient;
gdk_window_get_pointer( gdk_get_default_root_window(), &x, &y, NULL );
}
//---------------------------------------------------------------------------
-string OSAPI_GetWindowTitle( Window *win )
+string OSAPI_GetWindowTitle( SkinWindow *win )
{
return ( (GTK2Window *)win )->GetName();
}
* gtk2_event.cpp: GTK2 implementation of the Event class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: gtk2_event.cpp,v 1.10 2003/04/17 17:45:38 asmax Exp $
+ * $Id: gtk2_event.cpp,v 1.11 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
* Emmanuel Puig <karibu@via.ecp.fr>
gWnd = gwnd;
}
//---------------------------------------------------------------------------
-GTK2Event::GTK2Event( intf_thread_t *p_intf, Window *win, unsigned int msg,
+GTK2Event::GTK2Event( intf_thread_t *p_intf, SkinWindow *win, unsigned int msg,
unsigned int par1, long par2 ) : Event( p_intf, msg, par1, par2 )
{
gWnd = ( (GTK2Window *)win )->GetHandle();
if( Message != VLC_NOTHING )
{
// Find window matching with gwnd
- list<Window *>::const_iterator win;
+ list<SkinWindow *>::const_iterator win;
for( win = p_intf->p_sys->p_theme->WindowList.begin();
win != p_intf->p_sys->p_theme->WindowList.end(); win++ )
{
* gtk2_event.h: GTK2 implementation of the Event class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: gtk2_event.h,v 1.1 2003/04/12 21:43:27 asmax Exp $
+ * $Id: gtk2_event.h,v 1.2 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
//---------------------------------------------------------------------------
struct intf_thread_t;
-class Window;
+class SkinWindow;
//---------------------------------------------------------------------------
class GTK2Event : Event
GTK2Event( intf_thread_t *p_intf, string Desc, string shortcut );
GTK2Event( intf_thread_t *p_intf, GdkWindow *gwnd, unsigned int msg,
unsigned int par1, long par2 );
- GTK2Event( intf_thread_t *p_intf, Window *win, unsigned int msg,
+ GTK2Event( intf_thread_t *p_intf, SkinWindow *win, unsigned int msg,
unsigned int par1, long par2 );
// Destructor
* gtk2_graphics.cpp: GTK2 implementation of the Graphics and Region classes
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: gtk2_graphics.cpp,v 1.14 2003/04/19 12:39:14 karibu Exp $
+ * $Id: gtk2_graphics.cpp,v 1.15 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
// GTK2 GRAPHICS
//---------------------------------------------------------------------------
-GTK2Graphics::GTK2Graphics( int w, int h, Window *from ) : Graphics( w, h )
+GTK2Graphics::GTK2Graphics( int w, int h, SkinWindow *from ) : Graphics( w, h )
{
if( from != NULL )
{
* gtk2_graphics.h: GTK2 implementation of the Graphics and Region classes
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: gtk2_graphics.h,v 1.4 2003/04/19 02:34:47 karibu Exp $
+ * $Id: gtk2_graphics.h,v 1.5 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
class Region;
-class Window;
+class SkinWindow;
//---------------------------------------------------------------------------
class GTK2Graphics : public Graphics
public:
// Constructor
- GTK2Graphics( int w, int h, Window *from = NULL );
+ GTK2Graphics( int w, int h, SkinWindow *from = NULL );
// Destructor
virtual ~GTK2Graphics();
// Drawing methods
* gtk2_run.cpp:
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: gtk2_run.cpp,v 1.19 2003/04/21 14:26:59 asmax Exp $
+ * $Id: gtk2_run.cpp,v 1.20 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
// Variables
unsigned int msg;
Event *evt;
- list<Window *>::const_iterator win;
+ list<SkinWindow *>::const_iterator win;
GdkWindow *gwnd = ((GdkEventAny *)event)->window;
// Create event to dispatch in windows
* gtk2_theme.cpp: GTK2 implementation of the Theme class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: gtk2_theme.cpp,v 1.22 2003/04/21 14:26:59 asmax Exp $
+ * $Id: gtk2_theme.cpp,v 1.23 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
gdk_window_show( gwnd );
- WindowList.push_back( (Window *)new OSWindow( p_intf, gwnd, x, y, visible,
+ WindowList.push_back( (SkinWindow *)new OSWindow( p_intf, gwnd, x, y, visible,
fadetime, alpha, movealpha, dragdrop, name ) ) ;
}
* gtk2_theme.h: GTK2 implementation of the Theme class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: gtk2_theme.h,v 1.3 2003/04/20 20:28:39 ipkiss Exp $
+ * $Id: gtk2_theme.h,v 1.4 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
//---------------------------------------------------------------------------
struct intf_thread_t;
-class Window;
+class SkinWindow;
class EventBank;
class BitmapBank;
class FontBank;
* gtk2_window.cpp: GTK2 implementation of the Window class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: gtk2_window.cpp,v 1.26 2003/04/21 18:39:38 asmax Exp $
+ * $Id: gtk2_window.cpp,v 1.27 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
GTK2Window::GTK2Window( intf_thread_t *p_intf, GdkWindow *gwnd, int x, int y,
bool visible, int transition, int normalalpha, int movealpha,
bool dragdrop, string name )
- : Window( p_intf, x, y, visible, transition, normalalpha, movealpha,
+ : SkinWindow( p_intf, x, y, visible, transition, normalalpha, movealpha,
dragdrop )
{
// Set handles
case GDK_BUTTON_PRESS:
// Raise all the windows
- for( list<Window *>::const_iterator win =
+ for( list<SkinWindow *>::const_iterator win =
p_intf->p_sys->p_theme->WindowList.begin();
win != p_intf->p_sys->p_theme->WindowList.end(); win++ )
{
* gtk2_window.h: GTK2 implementation of the Window class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: gtk2_window.h,v 1.6 2003/04/19 11:16:17 asmax Exp $
+ * $Id: gtk2_window.h,v 1.7 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
class Event;
//---------------------------------------------------------------------------
-class GTK2Window : public Window
+class GTK2Window : public SkinWindow
{
private:
// General parameters
* os_api.h: Wrapper for some os-specific functions
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: os_api.h,v 1.2 2003/04/12 21:43:27 asmax Exp $
+ * $Id: os_api.h,v 1.3 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
using namespace std;
//---------------------------------------------------------------------------
-class Window;
+class SkinWindow;
//---------------------------------------------------------------------------
// Event API
// Other parameters are the arguments of message
// Send message is supposed to treat the message directly and should not be
// used if possible
-void OSAPI_SendMessage( Window *win, unsigned int message, unsigned int param1,
+void OSAPI_SendMessage( SkinWindow *win, unsigned int message, unsigned int param1,
long param2 );
-void OSAPI_PostMessage( Window *win, unsigned int message, unsigned int param1,
+void OSAPI_PostMessage( SkinWindow *win, unsigned int message, unsigned int param1,
long param2 );
//---------------------------------------------------------------------------
void OSAPI_GetMousePos( int &x, int &y );
// This function returns the Title of the specified window
-string OSAPI_GetWindowTitle( Window *win );
+string OSAPI_GetWindowTitle( SkinWindow *win );
// This functions removes a directory and all its contents
bool OSAPI_RmDir( string Path );
* wrappers.cpp: Wrappers around C++ objects
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: wrappers.cpp,v 1.9 2003/04/20 20:28:39 ipkiss Exp $
+ * $Id: wrappers.cpp,v 1.10 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
void AddAnchor( char *x, char *y, char *len, char *priority )
{
int XOff, YOff;
- Window *vlcWin = g_pIntf->p_sys->p_theme->WindowList.back();
+ SkinWindow *vlcWin = g_pIntf->p_sys->p_theme->WindowList.back();
g_pIntf->p_sys->p_theme->OffBank->GetOffSet( XOff, YOff );
char *event, char *help )
{
int XOff, YOff;
- Window *vlcWin = g_pIntf->p_sys->p_theme->WindowList.back();
+ SkinWindow *vlcWin = g_pIntf->p_sys->p_theme->WindowList.back();
g_pIntf->p_sys->p_theme->OffBank->GetOffSet( XOff, YOff );
char *color, char *event, char *help )
{
int XOff, YOff;
- Window *vlcWin = g_pIntf->p_sys->p_theme->WindowList.back();
+ SkinWindow *vlcWin = g_pIntf->p_sys->p_theme->WindowList.back();
g_pIntf->p_sys->p_theme->OffBank->GetOffSet( XOff, YOff );
char *tooltiptext, char *help )
{
int XOff, YOff;
- Window *vlcWin = g_pIntf->p_sys->p_theme->WindowList.back();
+ SkinWindow *vlcWin = g_pIntf->p_sys->p_theme->WindowList.back();
g_pIntf->p_sys->p_theme->OffBank->GetOffSet( XOff, YOff );
char *tooltiptext1, char *tooltiptext2, char *help )
{
int XOff, YOff;
- Window *vlcWin = g_pIntf->p_sys->p_theme->WindowList.back();
+ SkinWindow *vlcWin = g_pIntf->p_sys->p_theme->WindowList.back();
g_pIntf->p_sys->p_theme->OffBank->GetOffSet( XOff, YOff );
ConvertCoords( abs, p_abs );
ConvertCoords( ord, p_ord );
- Window *vlcWin = g_pIntf->p_sys->p_theme->WindowList.back();
+ SkinWindow *vlcWin = g_pIntf->p_sys->p_theme->WindowList.back();
// Move control
g_pIntf->p_sys->p_theme->OffBank->GetOffSet( XOff, YOff );
ConvertCoords( abs, p_abs );
ConvertCoords( ord, p_ord );
- Window *vlcWin = g_pIntf->p_sys->p_theme->WindowList.back();
+ SkinWindow *vlcWin = g_pIntf->p_sys->p_theme->WindowList.back();
// Move control
g_pIntf->p_sys->p_theme->OffBank->GetOffSet( XOff, YOff );
char *help )
{
int XOff, YOff;
- Window *vlcWin = g_pIntf->p_sys->p_theme->WindowList.back();
+ SkinWindow *vlcWin = g_pIntf->p_sys->p_theme->WindowList.back();
g_pIntf->p_sys->p_theme->OffBank->GetOffSet( XOff, YOff );
* anchor.cpp: Anchor class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: anchor.cpp,v 1.1 2003/03/18 02:21:47 ipkiss Exp $
+ * $Id: anchor.cpp,v 1.2 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
// Anchors
//---------------------------------------------------------------------------
Anchor::Anchor( intf_thread_t *_p_intf, int x, int y, int len, int priority,
- Window *parent )
+ SkinWindow *parent )
{
p_intf = _p_intf;
Parent = parent;
* anchor.h: Anchor class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: anchor.h,v 1.1 2003/03/18 02:21:47 ipkiss Exp $
+ * $Id: anchor.h,v 1.2 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
struct intf_thread_t;
-class Window;
+class SkinWindow;
//---------------------------------------------------------------------------
class Anchor
{
int Priority;
// Parent window
- Window *Parent;
+ SkinWindow *Parent;
// Interface thread
intf_thread_t *p_intf;
public:
// Constructor
Anchor( intf_thread_t *_p_intf, int x, int y, int len, int priority,
- Window *parent );
+ SkinWindow *parent );
// Hang to anchor if in neighbourhood
bool Hang( Anchor *anc, int mx, int my );
// Getters
int GetPriority() { return Priority; }
- Window *GetParent() { return Parent; }
+ SkinWindow *GetParent() { return Parent; }
};
//---------------------------------------------------------------------------
* event.cpp: Event class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: event.cpp,v 1.12 2003/04/21 00:54:26 ipkiss Exp $
+ * $Id: event.cpp,v 1.13 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
GenericControl * Event::FindControl( string id )
{
- list<Window *>::const_iterator win;
+ list<SkinWindow *>::const_iterator win;
unsigned int i;
for( win = p_intf->p_sys->p_theme->WindowList.begin();
* theme.cpp: Theme class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: theme.cpp,v 1.10 2003/04/21 02:12:06 ipkiss Exp $
+ * $Id: theme.cpp,v 1.11 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
Theme::~Theme()
{
// Delete the windows
- list<Window *>::const_iterator win;
+ list<SkinWindow *>::const_iterator win;
for( win = WindowList.begin(); win != WindowList.end(); win++ )
{
delete (OSWindow *)(*win);
if( ShowInTaskbar != (bool)config_GetInt( p_intf, "show_in_taskbar" ) )
ChangeTaskbar();
- list<Window *>::const_iterator win;
+ list<SkinWindow *>::const_iterator win;
Event *evt1;
Event *evt2;
return;
// Initialization
- list<Window *>::const_iterator win;
+ list<SkinWindow *>::const_iterator win;
int i = 0;
int x, y, v, scan;
{
// Initialize char where config is stored
char *save = new char[400];
- list<Window *>::const_iterator win;
+ list<SkinWindow *>::const_iterator win;
int i = 0;
int x, y;
//---------------------------------------------------------------------------
void Theme::InitWindows()
{
- for( list<Window *>::const_iterator win = WindowList.begin();
+ for( list<SkinWindow *>::const_iterator win = WindowList.begin();
win != WindowList.end(); win++ )
{
(*win)->Init();
//---------------------------------------------------------------------------
void Theme::InitControls()
{
- for( list<Window *>::const_iterator win = WindowList.begin();
+ for( list<SkinWindow *>::const_iterator win = WindowList.begin();
win != WindowList.end(); win++ )
{
for( unsigned int i = 0; i < (*win)->ControlList.size(); i++ )
}
}
//---------------------------------------------------------------------------
-Window * Theme::GetWindow( string name )
+SkinWindow * Theme::GetWindow( string name )
{
- for( list<Window *>::const_iterator win = WindowList.begin();
+ for( list<SkinWindow *>::const_iterator win = WindowList.begin();
win != WindowList.end(); win++ )
{
if( name == OSAPI_GetWindowTitle( *win ) )
return NULL;
}
//---------------------------------------------------------------------------
-void Theme::MoveSkin( Window *wnd, int left, int top )
+void Theme::MoveSkin( SkinWindow *wnd, int left, int top )
{
int x, y, oldx, oldy;
- Window *win;
+ SkinWindow *win;
list<Anchor *>::const_iterator anc;
list<Anchor *>::const_iterator hang;
wnd->GetPos( oldx, oldy );
}
}
//---------------------------------------------------------------------------
-bool Theme::MoveSkinMagnet( Window *wnd, int left, int top )
+bool Theme::MoveSkinMagnet( SkinWindow *wnd, int left, int top )
{
// If magnetism not activate
HangToAnchors( wnd, NewLeft, NewTop );
// All windows can be moved
- list<Window *>::const_iterator win;
+ list<SkinWindow *>::const_iterator win;
for( win = WindowList.begin(); win != WindowList.end(); win++ )
(*win)->Moved = false;
return true;
}
//---------------------------------------------------------------------------
-void Theme::HangToAnchors( Window *wnd, int &x, int &y, bool init )
+void Theme::HangToAnchors( SkinWindow *wnd, int &x, int &y, bool init )
{
// Magnetism initialization
int win_x, win_y, win_anchor_x, win_anchor_y, wnd_anchor_x, wnd_anchor_y;
- list<Window *>::const_iterator win;
+ list<SkinWindow *>::const_iterator win;
list<Anchor *>::const_iterator win_anchor, wnd_anchor;
// Parse list of windows
//---------------------------------------------------------------------------
void Theme::CheckAnchors()
{
- list<Window *>::const_iterator win;
+ list<SkinWindow *>::const_iterator win;
int x, y;
for( win = WindowList.begin(); win != WindowList.end(); win++ )
* theme.h: Theme class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: theme.h,v 1.2 2003/04/20 20:28:39 ipkiss Exp $
+ * $Id: theme.h,v 1.3 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
struct intf_thread_t;
-class Window;
+class SkinWindow;
class EventBank;
class BitmapBank;
class FontBank;
int fadetime, int alpha, int movealpha, bool dragdrop ) = 0;
virtual void ChangeClientWindowName( string name ) = 0;
- Window * GetWindow( string name );
+ SkinWindow * GetWindow( string name );
// Banks
BitmapBank *BmpBank;
OffSetBank *OffBank;
// List of the windows of the skin
- list<Window *> WindowList;
+ list<SkinWindow *> WindowList;
// Magetism
- void HangToAnchors( Window *wnd, int &x, int &y, bool init = false );
- bool MoveSkinMagnet( Window *wnd, int left, int top );
- void MoveSkin( Window *wnd, int left, int top );
+ void HangToAnchors( SkinWindow *wnd, int &x, int &y, bool init = false );
+ bool MoveSkinMagnet( SkinWindow *wnd, int left, int top );
+ void MoveSkin( SkinWindow *wnd, int left, int top );
void CheckAnchors();
bool ConstructPlaylist;
* vlcproc.cpp: VlcProc class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: vlcproc.cpp,v 1.13 2003/04/21 02:12:06 ipkiss Exp $
+ * $Id: vlcproc.cpp,v 1.14 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
return true;
case VLC_HIDE:
- for( list<Window *>::const_iterator win =
+ for( list<SkinWindow *>::const_iterator win =
p_intf->p_sys->p_theme->WindowList.begin();
win != p_intf->p_sys->p_theme->WindowList.end(); win++ )
{
return true;
case VLC_SHOW:
- for( list<Window *>::const_iterator win =
+ for( list<SkinWindow *>::const_iterator win =
p_intf->p_sys->p_theme->WindowList.begin();
win != p_intf->p_sys->p_theme->WindowList.end(); win++ )
{
if( p_intf->p_sys->b_all_win_closed )
return true;
- list<Window *>::const_iterator win;
+ list<SkinWindow *>::const_iterator win;
// If a window has been closed, test if all are closed !
for( win = p_intf->p_sys->p_theme->WindowList.begin();
* window.cpp: Window class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: window.cpp,v 1.18 2003/04/20 15:00:19 karibu Exp $
+ * $Id: window.cpp,v 1.19 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
// Skinable Window
//---------------------------------------------------------------------------
-Window::Window( intf_thread_t *_p_intf, int x, int y, bool visible,
+SkinWindow::SkinWindow( intf_thread_t *_p_intf, int x, int y, bool visible,
int transition, int normalalpha, int movealpha, bool dragdrop )
{
p_intf = _p_intf;
ToolTipText = "none";
}
//---------------------------------------------------------------------------
-Window::~Window()
+SkinWindow::~SkinWindow()
{
// Destroy the controls
for( unsigned int i = 0; i < ControlList.size(); i++ )
delete ControlList[i];
}
//---------------------------------------------------------------------------
-void Window::Open()
+void SkinWindow::Open()
{
if( !Hidden )
return;
}
}
//---------------------------------------------------------------------------
-void Window::Close()
+void SkinWindow::Close()
{
Changing = true;
OSAPI_PostMessage( this, WINDOW_FADE, WINDOW_HIDE, 1242 );
}
//---------------------------------------------------------------------------
-void Window::Show()
+void SkinWindow::Show()
{
Changing = false;
Hidden = false;
OSShow( true );
}
//---------------------------------------------------------------------------
-void Window::Hide()
+void SkinWindow::Hide()
{
if( Hidden )
return;
OSAPI_PostMessage( NULL, VLC_TEST_ALL_CLOSED, 0, 0 );
}
//---------------------------------------------------------------------------
-void Window::Fade( int To, int Time, unsigned int evt )
+void SkinWindow::Fade( int To, int Time, unsigned int evt )
{
StartAlpha = Alpha;
EndAlpha = To;
OSAPI_PostMessage( this, WINDOW_FADE, evt, Lock );
}
//---------------------------------------------------------------------------
-bool Window::ProcessEvent( Event *evt )
+bool SkinWindow::ProcessEvent( Event *evt )
{
unsigned int i;
unsigned int msg = evt->GetMessage();
}
}
//---------------------------------------------------------------------------
-bool Window::ChangeAlpha( int time )
+bool SkinWindow::ChangeAlpha( int time )
{
if( time >= EndTime )
{
return true;
}
//---------------------------------------------------------------------------
-void Window::RefreshImage( int x, int y, int w, int h )
+void SkinWindow::RefreshImage( int x, int y, int w, int h )
{
unsigned int i;
delete Buffer;
}
//---------------------------------------------------------------------------
-void Window::Refresh( int x, int y, int w, int h )
+void SkinWindow::Refresh( int x, int y, int w, int h )
{
if( Image == NULL )
return;
}
//---------------------------------------------------------------------------
-void Window::RefreshAll()
+void SkinWindow::RefreshAll()
{
Refresh( 0, 0, Width, Height );
}
//---------------------------------------------------------------------------
-void Window::MouseDown( int x, int y, int button )
+void SkinWindow::MouseDown( int x, int y, int button )
{
// Checking event in controls
for( int i = ControlList.size() - 1; i >= 0 ; i-- )
}
//---------------------------------------------------------------------------
-void Window::MouseMove( int x, int y, int button )
+void SkinWindow::MouseMove( int x, int y, int button )
{
int i;
ChangeToolTipText( "none" );
}
//---------------------------------------------------------------------------
-void Window::MouseUp( int x, int y, int button )
+void SkinWindow::MouseUp( int x, int y, int button )
{
int i;
}
}
//---------------------------------------------------------------------------
-void Window::MouseDblClick( int x, int y, int button )
+void SkinWindow::MouseDblClick( int x, int y, int button )
{
int i;
}
}
//---------------------------------------------------------------------------
-void Window::MouseScroll( int x, int y, int direction )
+void SkinWindow::MouseScroll( int x, int y, int direction )
{
// Checking event in controls
for( int i = ControlList.size() - 1; i >= 0 ; i-- )
}
}
//---------------------------------------------------------------------------
-void Window::Init()
+void SkinWindow::Init()
{
// Get size of window
ReSize();
Move( Left, Top );
}
//---------------------------------------------------------------------------
-void Window::ReSize()
+void SkinWindow::ReSize()
{
// Initialization
unsigned int i;
}
//---------------------------------------------------------------------------
-void Window::GetSize( int &w, int &h )
+void SkinWindow::GetSize( int &w, int &h )
{
w = Width;
h = Height;
}
//---------------------------------------------------------------------------
-void Window::GetPos( int &x, int &y )
+void SkinWindow::GetPos( int &x, int &y )
{
x = Left;
y = Top;
* window.h: Window class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: window.h,v 1.2 2003/04/20 13:14:14 asmax Exp $
+ * $Id: window.h,v 1.3 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
#define MOUSE_SCROLL_DOWN 1
//---------------------------------------------------------------------------
-class Window
+class SkinWindow
{
protected:
// Interface thread
vector<GenericControl *> ControlList;
// Constructors
- Window( intf_thread_t *_p_intf, int x, int y, bool visible,
+ SkinWindow( intf_thread_t *_p_intf, int x, int y, bool visible,
int transition, int normalalpha, int movealpha, bool dragdrop );
// Destructors
- virtual ~Window();
+ virtual ~SkinWindow();
// Event processing
bool ProcessEvent( Event *evt );
void MouseDown( int x, int y, int button );
void MouseMove( int x, int y, int button );
void MouseDblClick( int x, int y, int button );
- void Window::MouseScroll( int x, int y, int direction );
+ void SkinWindow::MouseScroll( int x, int y, int direction );
// Window graphic aspect
bool OnStartThemeVisible;
* win32_api.cpp: Various win32-specific functions
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: win32_api.cpp,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
+ * $Id: win32_api.cpp,v 1.4 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
// Event API
//---------------------------------------------------------------------------
-void OSAPI_SendMessage( Window *win, unsigned int message, unsigned int param1,
+void OSAPI_SendMessage( SkinWindow *win, unsigned int message, unsigned int param1,
long param2 )
{
if( win == NULL )
param2 );
}
//---------------------------------------------------------------------------
-void OSAPI_PostMessage( Window *win, unsigned int message, unsigned int param1,
+void OSAPI_PostMessage( SkinWindow *win, unsigned int message, unsigned int param1,
long param2 )
{
if( win == NULL )
delete MousePos;
}
//---------------------------------------------------------------------------
-string OSAPI_GetWindowTitle( Window *win )
+string OSAPI_GetWindowTitle( SkinWindow *win )
{
char *buffer = new char[MAX_PARAM_SIZE];
GetWindowText( ((Win32Window *)win)->GetHandle(), buffer, MAX_PARAM_SIZE );
* win32_event.cpp: Win32 implementation of the Event class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: win32_event.cpp,v 1.4 2003/04/16 21:40:07 ipkiss Exp $
+ * $Id: win32_event.cpp,v 1.5 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
hWnd = hwnd;
}
//---------------------------------------------------------------------------
-Win32Event::Win32Event( intf_thread_t *p_intf, Window *win, unsigned int msg,
+Win32Event::Win32Event( intf_thread_t *p_intf, SkinWindow *win, unsigned int msg,
unsigned int par1, long par2 ) : Event( p_intf, msg, par1, par2 )
{
hWnd = ( (Win32Window *)win )->GetHandle();
* win32_event.h: Win32 implementation of the Event class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: win32_event.h,v 1.2 2003/04/12 21:43:27 asmax Exp $
+ * $Id: win32_event.h,v 1.3 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
struct intf_thread_t;
-class Window;
+class SkinWindow;
//---------------------------------------------------------------------------
class Win32Event : Event
Win32Event( intf_thread_t *p_intf, string Desc, string shortcut );
Win32Event( intf_thread_t *p_intf, HWND hwnd, unsigned int msg,
unsigned int par1, long par2 );
- Win32Event( intf_thread_t *p_intf, Window *win, unsigned int msg,
+ Win32Event( intf_thread_t *p_intf, SkinWindow *win, unsigned int msg,
unsigned int par1, long par2 );
// Destructor
* win32_graphics.cpp: Win32 implementation of the Graphics and Region classes
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: win32_graphics.cpp,v 1.4 2003/04/19 02:34:47 karibu Exp $
+ * $Id: win32_graphics.cpp,v 1.5 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
// WIN32 GRAPHICS
//---------------------------------------------------------------------------
-Win32Graphics::Win32Graphics( int w, int h, Window *from ) : Graphics( w, h )
+Win32Graphics::Win32Graphics( int w, int h, SkinWindow *from ) : Graphics( w, h )
{
HBITMAP HImage ;
Image = CreateCompatibleDC( NULL );
* win32_graphics.h: Win32 implementation of the Graphics and Region classes
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: win32_graphics.h,v 1.3 2003/04/19 02:34:47 karibu Exp $
+ * $Id: win32_graphics.h,v 1.4 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
class Region;
-class Window;
+class SkinWindow;
//---------------------------------------------------------------------------
class Win32Graphics : public Graphics
public:
// Constructor
- Win32Graphics( int w, int h, Window *from = NULL );
+ Win32Graphics( int w, int h, SkinWindow *from = NULL );
// Destructor
virtual ~Win32Graphics();
// Drawing methods
* win32_run.cpp:
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: win32_run.cpp,v 1.8 2003/04/21 02:50:49 asmax Exp $
+ * $Id: win32_run.cpp,v 1.9 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
{
VlcProc *Proc = new VlcProc( p_intf );
MSG msg;
- list<Window *>::const_iterator win;
+ list<SkinWindow *>::const_iterator win;
Event *ProcessEvent;
int KeyModifier = 0;
* win32_theme.cpp: Win32 implementation of the Theme class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: win32_theme.cpp,v 1.5 2003/04/21 02:12:06 ipkiss Exp $
+ * $Id: win32_theme.cpp,v 1.6 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
// Find window matching with hwnd
- list<Window *>::const_iterator win;
+ list<SkinWindow *>::const_iterator win;
for( win = p_intf->p_sys->p_theme->WindowList.begin();
win != p_intf->p_sys->p_theme->WindowList.end(); win++ )
{
SetWindowLongPtr( hwnd, GWLP_USERDATA, (LONG_PTR)p_intf );
- WindowList.push_back( (Window *)new OSWindow( p_intf, hwnd, x, y, visible,
+ WindowList.push_back( (SkinWindow *)new OSWindow( p_intf, hwnd, x, y, visible,
fadetime, alpha, movealpha, dragdrop ) ) ;
}
//---------------------------------------------------------------------------
* win32_theme.h: Win32 implementation of the Theme class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: win32_theme.h,v 1.3 2003/04/20 20:28:39 ipkiss Exp $
+ * $Id: win32_theme.h,v 1.4 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
//---------------------------------------------------------------------------
struct intf_thread_t;
-class Window;
+class SkinWindow;
class EventBank;
class BitmapBank;
class FontBank;
* win32_window.cpp: Win32 implementation of the Window class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: win32_window.cpp,v 1.9 2003/04/20 16:45:44 karibu Exp $
+ * $Id: win32_window.cpp,v 1.10 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
Win32Window::Win32Window( intf_thread_t *p_intf, HWND hwnd, int x, int y,
bool visible, int transition, int normalalpha, int movealpha,
bool dragdrop )
- : Window( p_intf, x, y, visible, transition, normalalpha, movealpha,
+ : SkinWindow( p_intf, x, y, visible, transition, normalalpha, movealpha,
dragdrop )
{
// Set handles
* win32_window.h: Win32 implementation of the Window class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: win32_window.h,v 1.2 2003/04/12 21:43:27 asmax Exp $
+ * $Id: win32_window.h,v 1.3 2003/04/21 21:51:16 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
class Event;
//---------------------------------------------------------------------------
-class Win32Window : public Window
+class Win32Window : public SkinWindow
{
private:
// General parameters