Commit 05af5dd8 authored by Cyril Deguet's avatar Cyril Deguet
Browse files

* changed "Window" into "SkinWindow" to prepare X11 port

 (Window is already a Xlib type !)
  *** not tested under win32, please check ! ***
parent 50a6ec06
......@@ -2,7 +2,7 @@
* 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 Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -47,7 +47,7 @@ ControlButton::ControlButton(
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;
......
......@@ -2,7 +2,7 @@
* 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>
......@@ -34,7 +34,7 @@ using namespace std;
//---------------------------------------------------------------------------
class Action;
class Graphics;
class Window;
class SkinWindow;
//---------------------------------------------------------------------------
class ControlButton : public GenericControl
......@@ -69,7 +69,7 @@ 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();
......
......@@ -2,7 +2,7 @@
* 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 Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -53,7 +53,7 @@ ControlCheckBox::ControlCheckBox(
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;
......
......@@ -2,7 +2,7 @@
* 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>
......@@ -34,7 +34,7 @@ using namespace std;
//---------------------------------------------------------------------------
class Action;
class Graphics;
class Window;
class SkinWindow;
//---------------------------------------------------------------------------
class ControlCheckBox : public GenericControl
......@@ -85,7 +85,7 @@ 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();
......
......@@ -2,7 +2,7 @@
* 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 Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -45,7 +45,7 @@
// Generic Control
//---------------------------------------------------------------------------
GenericControl::GenericControl( string id, bool visible, string help,
Window *Parent )
SkinWindow *Parent )
{
ID = id;
Visible = visible;
......
......@@ -2,7 +2,7 @@
* 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>
......@@ -33,7 +33,7 @@ using namespace std;
//---------------------------------------------------------------------------
struct intf_thread_t;
class Window;
class SkinWindow;
class Bitmap;
class Graphics;
class Region;
......@@ -45,7 +45,7 @@ class Event;
class GenericControl // This is the generic control class
{
protected:
Window * ParentWindow;
SkinWindow * ParentWindow;
bool Visible;
string ID;
string Help;
......@@ -54,7 +54,7 @@ class GenericControl // This is the generic control class
private:
public:
// Constructor
GenericControl( string id, bool visible, string help, Window *Parent );
GenericControl( string id, bool visible, string help, SkinWindow *Parent );
// Destructor
virtual ~GenericControl();
......
......@@ -2,7 +2,7 @@
* 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 Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -43,7 +43,7 @@
// 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;
......
......@@ -2,7 +2,7 @@
* 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>
......@@ -34,7 +34,7 @@ using namespace std;
//---------------------------------------------------------------------------
class Action;
class Graphics;
class Window;
class SkinWindow;
//---------------------------------------------------------------------------
class ControlImage : public GenericControl
......@@ -53,7 +53,7 @@ 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();
......
......@@ -2,7 +2,7 @@
* 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 Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -54,7 +54,7 @@
//---------------------------------------------------------------------------
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;
......
......@@ -2,7 +2,7 @@
* 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 Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -34,7 +34,7 @@ using namespace std;
//---------------------------------------------------------------------------
class Event;
class Graphics;
class Window;
class SkinWindow;
class Font;
class Bezier;
class Region;
......@@ -101,7 +101,7 @@ class ControlPlayList : public GenericControl
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();
......
......@@ -2,7 +2,7 @@
* 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 Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -45,7 +45,7 @@
// 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;
......
......@@ -2,7 +2,7 @@
* 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>
......@@ -34,7 +34,7 @@ using namespace std;
//---------------------------------------------------------------------------
class Action;
class Graphics;
class Window;
class SkinWindow;
//---------------------------------------------------------------------------
class ControlRectangle : public GenericControl
......@@ -53,7 +53,7 @@ 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();
......
......@@ -2,7 +2,7 @@
* 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 Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -52,7 +52,7 @@
//---------------------------------------------------------------------------
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;
......
......@@ -2,7 +2,7 @@
* 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>
......@@ -34,7 +34,7 @@ using namespace std;
//---------------------------------------------------------------------------
class Event;
class Graphics;
class Window;
class SkinWindow;
class Bezier;
class Region;
......@@ -77,7 +77,7 @@ class ControlSlider : public GenericControl
// 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();
......
......@@ -2,7 +2,7 @@
* 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 Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -122,7 +122,7 @@
//---------------------------------------------------------------------------
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;
......
......@@ -2,7 +2,7 @@
* 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 Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -35,7 +35,7 @@ using namespace std;
class Event;
class BitmapBank;
class Graphics;
class Window;
class SkinWindow;
class Region;
class Font;
......@@ -78,7 +78,7 @@ class ControlText : public GenericControl
// 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();
......
......@@ -2,7 +2,7 @@
* 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>
*
......@@ -39,7 +39,7 @@
//---------------------------------------------------------------------------
// 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 )
......@@ -49,7 +49,7 @@ void OSAPI_SendMessage( Window *win, unsigned int message, unsigned int param1,
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;
......@@ -120,7 +120,7 @@ void OSAPI_GetMousePos( int &x, int &y )
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();
}
......
......@@ -2,7 +2,7 @@
* 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>
......@@ -58,7 +58,7 @@ GTK2Event::GTK2Event( intf_thread_t *p_intf, GdkWindow *gwnd, unsigned int msg,
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();
......@@ -73,7 +73,7 @@ bool GTK2Event::SendEvent()
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++ )
{
......
......@@ -2,7 +2,7 @@
* 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>
*
......@@ -35,7 +35,7 @@ using namespace std;
//---------------------------------------------------------------------------
struct intf_thread_t;
class Window;
class SkinWindow;
//---------------------------------------------------------------------------
class GTK2Event : Event
......@@ -48,7 +48,7 @@ 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
......
......@@ -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.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>
......@@ -40,7 +40,7 @@
//---------------------------------------------------------------------------
// 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 )
{
......
Supports Markdown
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