* changed "Font" into "SkinFont" (see previous commit)

modules/gui/skins/controls/playlist.cpp

@@ -2,7 +2,7 @@
  * playlist.cpp: Playlist control
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: playlist.cpp,v 1.8 2003/04/21 21:51:16 asmax Exp $
+ * $Id: playlist.cpp,v 1.9 2003/04/21 22:12:37 asmax Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -323,7 +323,7 @@ void ControlPlayList::DrawCase( Graphics *dest, int i, int x, int y, int w,
     }
 
     // Choose font
-    Font *F;
+    SkinFont *F;
     if( PlayList->i_index == i )
         F = PlayFont;
     else

modules/gui/skins/controls/playlist.h

@@ -2,7 +2,7 @@
  * playlist.h: Playlist control
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: playlist.h,v 1.3 2003/04/21 21:51:16 asmax Exp $
+ * $Id: playlist.h,v 1.4 2003/04/21 22:12:37 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 Graphics;
 class SkinWindow;
-class Font;
+class SkinFont;
 class Bezier;
 class Region;
 
@@ -47,8 +47,8 @@ class ControlPlayList : public GenericControl
 {
     private:
         Event      *UpdateEvent;
-        Font       *TextFont;
-        Font       *PlayFont;
+        SkinFont       *TextFont;
+        SkinFont       *PlayFont;
         string      FontName;
         string      PlayFontName;
         bool        Enabled;

modules/gui/skins/controls/text.h

@@ -2,7 +2,7 @@
  * text.h: Text control
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: text.h,v 1.3 2003/04/21 21:51:16 asmax Exp $
+ * $Id: text.h,v 1.4 2003/04/21 22:12:37 asmax Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -37,7 +37,7 @@ class BitmapBank;
 class Graphics;
 class SkinWindow;
 class Region;
-class Font;
+class SkinFont;
 
 //---------------------------------------------------------------------------
 class ControlText : public GenericControl
@@ -62,7 +62,7 @@ class ControlText : public GenericControl
         // General parameters
         string   Text;
         int      Align;
-        Font    *TextFont;
+        SkinFont    *TextFont;
         string   FontName;
         list<string> DisplayList;
         list<string>::const_iterator Display;

modules/gui/skins/gtk2/gtk2_font.cpp

@@ -2,7 +2,7 @@
  * gtk2_font.cpp: GTK2 implementation of the Font class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: gtk2_font.cpp,v 1.12 2003/04/21 18:39:38 asmax Exp $
+ * $Id: gtk2_font.cpp,v 1.13 2003/04/21 22:12:37 asmax Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -44,7 +44,7 @@
 //---------------------------------------------------------------------------
 GTK2Font::GTK2Font( intf_thread_t *_p_intf, string fontname, int size,
     int color, int weight, bool italic, bool underline )
-    : Font( _p_intf, fontname, size, color, weight, italic, underline )
+    : SkinFont( _p_intf, fontname, size, color, weight, italic, underline )
 {
     Context = gdk_pango_context_get();
     Layout = pango_layout_new( Context );

modules/gui/skins/gtk2/gtk2_font.h

@@ -2,7 +2,7 @@
  * gtk2_font.h: GTK2 implementation of the Font class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: gtk2_font.h,v 1.5 2003/04/17 15:43:29 karibu Exp $
+ * $Id: gtk2_font.h,v 1.6 2003/04/21 22:12:37 asmax Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -38,7 +38,7 @@ struct intf_thread_t;
 class Graphics;
 
 //---------------------------------------------------------------------------
-class GTK2Font : Font
+class GTK2Font : SkinFont
 {
     private:
         PangoContext  *Context;

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.23 2003/04/21 21:51:16 asmax Exp $
+ * $Id: gtk2_theme.cpp,v 1.24 2003/04/21 22:12:37 asmax Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -27,6 +27,7 @@
 //--- GTK2 -----------------------------------------------------------------
 #include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <X11/Xlib.h>
 
 //--- VLC -------------------------------------------------------------------
 #include <vlc/intf.h>
@@ -110,6 +111,9 @@ void GTK2Theme::OnLoadTheme()
         msg_Err( p_intf, "gdk_window_new failed" );
         return;
     }
+
+    Display *display = XOpenDisplay( NULL );
+    Window root = DefaultRootWindow( display );
 }
 //---------------------------------------------------------------------------
 void GTK2Theme::AddSystemMenu( string name, Event *event )

modules/gui/skins/src/banks.cpp

@@ -2,7 +2,7 @@
  * banks.cpp: Bitmap bank, Event, bank, Font bank and OffSet bank
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: banks.cpp,v 1.4 2003/04/21 00:54:26 ipkiss Exp $
+ * $Id: banks.cpp,v 1.5 2003/04/21 22:12:37 asmax Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -99,7 +99,7 @@ FontBank::FontBank( intf_thread_t *_p_intf )
 //---------------------------------------------------------------------------
 FontBank::~FontBank()
 {
-    for( map<string,Font *>::iterator iter = Bank.begin();
+    for( map<string,SkinFont *>::iterator iter = Bank.begin();
          iter != Bank.end(); iter++ )
     {
         delete (OSFont *)iter->second;
@@ -115,12 +115,12 @@ bool FontBank::Add( string name, string fontname, int size,
         return false;
     }
 
-    Bank[name] = (Font *)new OSFont( p_intf, fontname, size, color,
+    Bank[name] = (SkinFont *)new OSFont( p_intf, fontname, size, color,
                                      weight, italic, underline );
     return true;
 }
 //---------------------------------------------------------------------------
-Font * FontBank::Get( string Id )
+SkinFont * FontBank::Get( string Id )
 {
     // If the specified font doesn't exist, use the default one
     if( Bank[Id] == NULL )

modules/gui/skins/src/banks.h

@@ -2,7 +2,7 @@
  * banks.h: Bitmap bank, Event bank, Font bank and OffSet bank
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: banks.h,v 1.1 2003/03/18 02:21:47 ipkiss Exp $
+ * $Id: banks.h,v 1.2 2003/04/21 22:12:37 asmax Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -42,7 +42,7 @@ using namespace std;
 //---------------------------------------------------------------------------
 struct intf_thread_t;
 class Bitmap;
-class Font;
+class SkinFont;
 class Event;
 
 //---------------------------------------------------------------------------
@@ -61,14 +61,14 @@ class BitmapBank
 class FontBank
 {
     private:
-        map<string,Font *> Bank;
+        map<string,SkinFont *> Bank;
         intf_thread_t *p_intf;
     public:
         FontBank( intf_thread_t *_p_intf );
         ~FontBank();
         bool Add( string name, string fontname, int size,
                   int color, int weight, bool italic, bool underline );
-        Font * Get( string Id ); // Return the font with matching ID
+        SkinFont * Get( string Id ); // Return the font with matching ID
 };
 //---------------------------------------------------------------------------
 class EventBank

modules/gui/skins/src/event.h

@@ -2,7 +2,7 @@
  * event.h: Event class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: event.h,v 1.7 2003/04/21 00:54:26 ipkiss Exp $
+ * $Id: event.h,v 1.8 2003/04/21 22:12:37 asmax Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -132,7 +132,7 @@ using namespace std;
 //---------------------------------------------------------------------------
 struct intf_thread_t;
 class GenericControl;
-class Window;
+class SkinWindow;
 class Event;
 
 

modules/gui/skins/src/font.cpp

@@ -2,7 +2,7 @@
  * font.cpp: Font class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: font.cpp,v 1.2 2003/04/16 21:40:07 ipkiss Exp $
+ * $Id: font.cpp,v 1.3 2003/04/21 22:12:37 asmax Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -36,7 +36,7 @@
 //---------------------------------------------------------------------------
 // Font object
 //---------------------------------------------------------------------------
-Font::Font( intf_thread_t *_p_intf, string fontname, int size, int color,
+SkinFont::SkinFont( intf_thread_t *_p_intf, string fontname, int size, int color,
     int weight, bool italic, bool underline )
 {
     p_intf = _p_intf;
@@ -53,7 +53,7 @@ Font::Font( intf_thread_t *_p_intf, string fontname, int size, int color,
         Weight = 1;
 }
 //---------------------------------------------------------------------------
-Font::~Font()
+SkinFont::~SkinFont()
 {
 }
 //---------------------------------------------------------------------------

modules/gui/skins/src/font.h

@@ -2,7 +2,7 @@
  * font.h: Font class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: font.h,v 1.3 2003/04/17 19:56:31 karibu Exp $
+ * $Id: font.h,v 1.4 2003/04/21 22:12:37 asmax Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -36,7 +36,7 @@ struct intf_thread_t;
 class Graphics;
 
 //---------------------------------------------------------------------------
-class Font
+class SkinFont
 {
     private:
         // Assign font to Device Context
@@ -56,11 +56,11 @@ class Font
 
     public:
         // Constructor
-        Font( intf_thread_t *_p_intf, string fontname, int size, int color,
+        SkinFont( intf_thread_t *_p_intf, string fontname, int size, int color,
               int weight, bool italic, bool underline );
 
         // Destructor
-        virtual ~Font();
+        virtual ~SkinFont();
 
         // Get size of text
         virtual void GetSize( string text, int &w, int &h ) = 0;

modules/gui/skins/win32/win32_font.cpp

@@ -2,7 +2,7 @@
  * win32_font.cpp: Win32 implementation of the Font class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: win32_font.cpp,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
+ * $Id: win32_font.cpp,v 1.4 2003/04/21 22:12:37 asmax Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -44,7 +44,7 @@
 //---------------------------------------------------------------------------
 Win32Font::Win32Font( intf_thread_t *_p_intf, string fontname, int size,
     int color, int weight, bool italic, bool underline )
-    : Font( _p_intf, fontname, size, color, weight, italic, underline )
+    : SkinFont( _p_intf, fontname, size, color, weight, italic, underline )
 {
 }
 //---------------------------------------------------------------------------

modules/gui/skins/win32/win32_font.h

@@ -2,7 +2,7 @@
  * win32_font.h: Win32 implementation of the Font class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: win32_font.h,v 1.2 2003/04/12 21:43:27 asmax Exp $
+ * $Id: win32_font.h,v 1.3 2003/04/21 22:12:37 asmax Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -37,7 +37,7 @@ struct intf_thread_t;
 class Graphics;
 
 //---------------------------------------------------------------------------
-class Win32Font : Font
+class Win32Font : SkinFont
 {
     private:
         // Assign font to Device Context