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

 (Window is already a Xlib type !)
  *** not tested under win32, please check ! ***

modules/gui/skins/controls/button.cpp

@@ -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;

modules/gui/skins/controls/button.h

@@ -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();

modules/gui/skins/controls/checkbox.cpp

@@ -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;

modules/gui/skins/controls/checkbox.h

@@ -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();

modules/gui/skins/controls/generic.cpp

@@ -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;

modules/gui/skins/controls/generic.h

@@ -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();

modules/gui/skins/controls/image.cpp

@@ -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;

modules/gui/skins/controls/image.h

@@ -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();

modules/gui/skins/controls/playlist.cpp

@@ -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;

modules/gui/skins/controls/playlist.h

@@ -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();

modules/gui/skins/controls/rectangle.cpp

@@ -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;

modules/gui/skins/controls/rectangle.h

@@ -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();

modules/gui/skins/controls/slider.cpp

@@ -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;

modules/gui/skins/controls/slider.h

@@ -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();

modules/gui/skins/controls/text.cpp

@@ -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;

modules/gui/skins/controls/text.h

@@ -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();

modules/gui/skins/gtk2/gtk2_api.cpp

@@ -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();
 }

modules/gui/skins/gtk2/gtk2_event.cpp

@@ -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++ )
         {

modules/gui/skins/gtk2/gtk2_event.h

@@ -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

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.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 )
     {

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.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 Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -32,7 +32,7 @@
 
 //---------------------------------------------------------------------------
 class Region;
-class Window;
+class SkinWindow;
 
 //---------------------------------------------------------------------------
 class GTK2Graphics : public Graphics
@@ -43,7 +43,7 @@ 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

modules/gui/skins/gtk2/gtk2_run.cpp

@@ -2,7 +2,7 @@
  * 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>
  *
@@ -99,7 +99,7 @@ void GTK2Proc( GdkEvent *event, gpointer data )
     // 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

modules/gui/skins/gtk2/gtk2_theme.cpp

@@ -2,7 +2,7 @@
  * 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>
  *
@@ -156,7 +156,7 @@ void GTK2Theme::AddWindow( string name, int x, int y, bool visible,
 
     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 ) ) ;
 
 }

modules/gui/skins/gtk2/gtk2_theme.h

@@ -2,7 +2,7 @@
  * 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>
  *
@@ -35,7 +35,7 @@ using namespace std;
 
 //---------------------------------------------------------------------------
 struct intf_thread_t;
-class Window;
+class SkinWindow;
 class EventBank;
 class BitmapBank;
 class FontBank;

modules/gui/skins/gtk2/gtk2_window.cpp

@@ -2,7 +2,7 @@
  * 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>
  *
@@ -54,7 +54,7 @@
 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
@@ -179,7 +179,7 @@ bool GTK2Window::ProcessOSEvent( Event *evt )
 
         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++ )
             {

modules/gui/skins/gtk2/gtk2_window.h

@@ -2,7 +2,7 @@
  * 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>
  *
@@ -34,7 +34,7 @@ class Graphics;
 class Event;
 
 //---------------------------------------------------------------------------
-class GTK2Window : public Window
+class GTK2Window : public SkinWindow
 {
     private:
         // General parameters

modules/gui/skins/os_api.h

@@ -2,7 +2,7 @@
  * 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>
@@ -39,7 +39,7 @@
 using namespace std;
 
 //---------------------------------------------------------------------------
-class Window;
+class SkinWindow;
 
 //---------------------------------------------------------------------------
 // Event API
@@ -50,9 +50,9 @@ class Window;
 // 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 );
 
 //---------------------------------------------------------------------------
@@ -73,7 +73,7 @@ void OSAPI_GetScreenSize( int &w, int &h );
 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 );

modules/gui/skins/parser/wrappers.cpp

@@ -2,7 +2,7 @@
  * 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 Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -117,7 +117,7 @@ void EndControlGroup()
 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 );
     
@@ -137,7 +137,7 @@ void AddImage( char *id, char *visible, char *x, char *y, char *image,
     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 );
 
@@ -150,7 +150,7 @@ void AddRectangle( char *id, char *visible, char *x, char *y, char *w, char *h,
     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 );
 
@@ -168,7 +168,7 @@ void AddButton(
     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 );
 
@@ -193,7 +193,7 @@ void AddCheckBox(
     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 );
 
@@ -231,7 +231,7 @@ void AddSlider( char *id, char *visible, char *x, char *y, char *type, char *up,
     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 );
@@ -286,7 +286,7 @@ void AddPlayList( char *id, char *visible, char *x, char *y, char *width,
     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 );
@@ -319,7 +319,7 @@ void AddText( char *id, char *visible, char *x, char *y, char *text, char *font,
     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 );
 

modules/gui/skins/src/anchor.cpp

@@ -2,7 +2,7 @@
  * 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>
@@ -39,7 +39,7 @@
 // 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;

modules/gui/skins/src/anchor.h

@@ -2,7 +2,7 @@
  * 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>
@@ -33,7 +33,7 @@ using namespace std;
 
 //---------------------------------------------------------------------------
 struct intf_thread_t;
-class Window;
+class SkinWindow;
 //---------------------------------------------------------------------------
 class Anchor
 {
@@ -49,7 +49,7 @@ class Anchor
         int Priority;
 
         // Parent window
-        Window *Parent;
+        SkinWindow *Parent;
 
         // Interface thread
         intf_thread_t *p_intf;
@@ -57,7 +57,7 @@ class Anchor
     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 );
@@ -73,7 +73,7 @@ class Anchor
 
         // Getters
         int GetPriority()       { return Priority; }
-        Window *GetParent()     { return Parent; }
+        SkinWindow *GetParent()     { return Parent; }
 };
 //---------------------------------------------------------------------------
 

modules/gui/skins/src/event.cpp

@@ -2,7 +2,7 @@
  * 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 Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -356,7 +356,7 @@ void Event::CreateEvent()
 //---------------------------------------------------------------------------
 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();

modules/gui/skins/src/theme.cpp

@@ -2,7 +2,7 @@
  * 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 Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -62,7 +62,7 @@ Theme::Theme( intf_thread_t *_p_intf )
 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);
@@ -82,7 +82,7 @@ void Theme::ShowTheme()
     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;
 
@@ -128,7 +128,7 @@ void Theme::LoadConfig()
         return;
 
     // Initialization
-    list<Window *>::const_iterator win;
+    list<SkinWindow *>::const_iterator win;
     int i = 0;
     int x, y, v, scan;
 
@@ -154,7 +154,7 @@ void Theme::SaveConfig()
 {
     // 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;
 
@@ -198,7 +198,7 @@ void Theme::InitTheme()
 //---------------------------------------------------------------------------
 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();
@@ -207,7 +207,7 @@ void Theme::InitWindows()
 //---------------------------------------------------------------------------
 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++ )
@@ -217,9 +217,9 @@ void Theme::InitControls()
     }
 }
 //---------------------------------------------------------------------------
-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 ) )
@@ -230,10 +230,10 @@ Window * Theme::GetWindow( string name )
     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 );
@@ -258,7 +258,7 @@ void Theme::MoveSkin( Window *wnd, int left, int top )
     }
 }
 //---------------------------------------------------------------------------
-bool Theme::MoveSkinMagnet( Window *wnd, int left, int top )
+bool Theme::MoveSkinMagnet( SkinWindow *wnd, int left, int top )
 {
 
     // If magnetism not activate
@@ -291,7 +291,7 @@ bool Theme::MoveSkinMagnet( Window *wnd, int left, int top )
     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;
 
@@ -301,11 +301,11 @@ bool Theme::MoveSkinMagnet( Window *wnd, int left, int top )
     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
@@ -385,7 +385,7 @@ void Theme::HangToAnchors( Window *wnd, int &x, int &y, bool init )
 //---------------------------------------------------------------------------
 void Theme::CheckAnchors()
 {
-    list<Window *>::const_iterator win;
+    list<SkinWindow *>::const_iterator win;
     int x, y;
 
     for( win = WindowList.begin(); win != WindowList.end(); win++ )

modules/gui/skins/src/theme.h

@@ -2,7 +2,7 @@
  * 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 Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -34,7 +34,7 @@ using namespace std;
 
 //---------------------------------------------------------------------------
 struct intf_thread_t;
-class Window;
+class SkinWindow;
 class EventBank;
 class BitmapBank;
 class FontBank;
@@ -72,7 +72,7 @@ class Theme
             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;
@@ -81,12 +81,12 @@ class Theme
         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;

modules/gui/skins/src/vlcproc.cpp

@@ -2,7 +2,7 @@
  * 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 Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -71,7 +71,7 @@ bool VlcProc::EventProc( Event *evt )
             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++ )
             {
@@ -82,7 +82,7 @@ bool VlcProc::EventProc( Event *evt )
             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++ )
             {
@@ -182,7 +182,7 @@ bool VlcProc::EventProcEnd()
     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();

modules/gui/skins/src/window.cpp

@@ -2,7 +2,7 @@
  * 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 Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -45,7 +45,7 @@
 //---------------------------------------------------------------------------
 // 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;
@@ -84,14 +84,14 @@ Window::Window( intf_thread_t *_p_intf, int x, int y, bool visible,
     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;
@@ -110,7 +110,7 @@ void Window::Open()
     }
 }
 //---------------------------------------------------------------------------
-void Window::Close()
+void SkinWindow::Close()
 {
     Changing = true;
 
@@ -120,14 +120,14 @@ void Window::Close()
         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;
@@ -138,7 +138,7 @@ void Window::Hide()
     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;
@@ -149,7 +149,7 @@ void Window::Fade( int To, int Time, unsigned int evt )
     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();
@@ -243,7 +243,7 @@ bool Window::ProcessEvent( Event *evt )
     }
 }
 //---------------------------------------------------------------------------
-bool Window::ChangeAlpha( int time )
+bool SkinWindow::ChangeAlpha( int time )
 {
     if( time >= EndTime )
     {
@@ -267,7 +267,7 @@ bool Window::ChangeAlpha( int time )
     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;
 
@@ -285,7 +285,7 @@ void Window::RefreshImage( int x, int y, int w, int h )
     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;
@@ -301,12 +301,12 @@ void Window::Refresh( int x, int y, int w, int h )
 
 }
 //---------------------------------------------------------------------------
-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-- )
@@ -319,7 +319,7 @@ void Window::MouseDown( int x, int y, int button )
 
 }
 //---------------------------------------------------------------------------
-void Window::MouseMove( int x, int y, int button  )
+void SkinWindow::MouseMove( int x, int y, int button  )
 {
     int i;
 
@@ -366,7 +366,7 @@ void Window::MouseMove( int x, int y, int button  )
         ChangeToolTipText( "none" );
 }
 //---------------------------------------------------------------------------
-void Window::MouseUp( int x, int y, int button )
+void SkinWindow::MouseUp( int x, int y, int button )
 {
     int i;
 
@@ -392,7 +392,7 @@ void Window::MouseUp( int x, int y, int button )
     }
 }
 //---------------------------------------------------------------------------
-void Window::MouseDblClick( int x, int y, int button )
+void SkinWindow::MouseDblClick( int x, int y, int button )
 {
     int i;
 
@@ -404,7 +404,7 @@ void Window::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 )
 {
     // Checking event in controls
     for( int i = ControlList.size() - 1; i >= 0 ; i-- )
@@ -416,7 +416,7 @@ void Window::MouseScroll( int x, int y, int direction )
     }
 }
 //---------------------------------------------------------------------------
-void Window::Init()
+void SkinWindow::Init()
 {
     // Get size of window
     ReSize();
@@ -428,7 +428,7 @@ void Window::Init()
     Move( Left, Top );
 }
 //---------------------------------------------------------------------------
-void Window::ReSize()
+void SkinWindow::ReSize()
 {
     // Initialization
     unsigned int i;
@@ -480,13 +480,13 @@ void Window::ReSize()
 
 }
 //---------------------------------------------------------------------------
-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;

modules/gui/skins/src/window.h

@@ -2,7 +2,7 @@
  * 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 Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -46,7 +46,7 @@ class Event;
 #define MOUSE_SCROLL_DOWN 1
 
 //---------------------------------------------------------------------------
-class Window
+class SkinWindow
 {
     protected:
         // Interface thread
@@ -86,11 +86,11 @@ class Window
         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 );
@@ -101,7 +101,7 @@ class Window
         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;

modules/gui/skins/win32/win32_api.cpp

@@ -2,7 +2,7 @@
  * 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 Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -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 )
 {
     if( win == NULL )
@@ -110,7 +110,7 @@ void OSAPI_GetMousePos( int &x, int &y )
     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 );

modules/gui/skins/win32/win32_event.cpp

@@ -2,7 +2,7 @@
  * 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 Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -57,7 +57,7 @@ Win32Event::Win32Event( intf_thread_t *p_intf, HWND hwnd, unsigned int msg,
     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();

modules/gui/skins/win32/win32_event.h

@@ -2,7 +2,7 @@
  * 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>
@@ -34,7 +34,7 @@ using namespace std;
 
 //---------------------------------------------------------------------------
 struct intf_thread_t;
-class Window;
+class SkinWindow;
 
 //---------------------------------------------------------------------------
 class Win32Event : Event
@@ -47,7 +47,7 @@ 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

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.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 Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -39,7 +39,7 @@
 //---------------------------------------------------------------------------
 // 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 );

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.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>
@@ -30,7 +30,7 @@
 
 //---------------------------------------------------------------------------
 class Region;
-class Window;
+class SkinWindow;
 
 //---------------------------------------------------------------------------
 class Win32Graphics : public Graphics
@@ -40,7 +40,7 @@ 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

modules/gui/skins/win32/win32_run.cpp

@@ -2,7 +2,7 @@
  * 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 Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -162,7 +162,7 @@ void OSRun( intf_thread_t *p_intf )
 {
     VlcProc *Proc = new VlcProc( p_intf );
     MSG msg;
-    list<Window *>::const_iterator win;
+    list<SkinWindow *>::const_iterator win;
     Event *ProcessEvent;
     int KeyModifier = 0;
 

modules/gui/skins/win32/win32_theme.cpp

@@ -2,7 +2,7 @@
  * 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 Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -71,7 +71,7 @@ LRESULT CALLBACK Win32Proc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 
 
     // 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++ )
     {
@@ -293,7 +293,7 @@ void Win32Theme::AddWindow( string name, int x, int y, bool visible,
 
     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 ) ) ;
 }
 //---------------------------------------------------------------------------

modules/gui/skins/win32/win32_theme.h

@@ -2,7 +2,7 @@
  * 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 Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -37,7 +37,7 @@ using namespace std;
 
 //---------------------------------------------------------------------------
 struct intf_thread_t;
-class Window;
+class SkinWindow;
 class EventBank;
 class BitmapBank;
 class FontBank;

modules/gui/skins/win32/win32_window.cpp

@@ -2,7 +2,7 @@
  * 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 Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -66,7 +66,7 @@ SLWA SetLayeredWindowAttributes =
 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

modules/gui/skins/win32/win32_window.h

@@ -2,7 +2,7 @@
  * 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 Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -36,7 +36,7 @@ class Graphics;
 class Event;
 
 //---------------------------------------------------------------------------
-class Win32Window : public Window
+class Win32Window : public SkinWindow
 {
     private:
         // General parameters