* modules/gui/skins/*: we now #include skin files using a relative

    path, so that MSVC is happy :)

modules/gui/skins/controls/button.cpp

@@ -2,7 +2,7 @@
  * button.cpp: Button control
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: button.cpp,v 1.8 2003/04/16 21:39:00 karibu Exp $
+ * $Id: button.cpp,v 1.9 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -28,14 +28,14 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "bitmap.h"
-#include "banks.h"
+#include "../src/bitmap.h"
+#include "../src/banks.h"
 #include "generic.h"
 #include "button.h"
-#include "event.h"
-#include "theme.h"
-#include "window.h"
-#include "skin_common.h"
+#include "../src/event.h"
+#include "../src/theme.h"
+#include "../src/window.h"
+#include "../src/skin_common.h"
 
 //---------------------------------------------------------------------------
 // Control Button

modules/gui/skins/controls/checkbox.cpp

@@ -2,7 +2,7 @@
  * checkbox.cpp: Checkbox control
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: checkbox.cpp,v 1.3 2003/04/11 21:19:49 videolan Exp $
+ * $Id: checkbox.cpp,v 1.4 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -28,18 +28,18 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "bitmap.h"
-#include "banks.h"
+#include "../src/bitmap.h"
+#include "../src/banks.h"
 #include "generic.h"
 #include "checkbox.h"
-#include "event.h"
-#include "theme.h"
-#include "window.h"
-#include "skin_common.h"
+#include "../src/event.h"
+#include "../src/theme.h"
+#include "../src/window.h"
+#include "../src/skin_common.h"
 
 
-#include "os_event.h"
-#include "os_window.h"
+#include "../os_event.h"
+#include "../os_window.h"
 
 //---------------------------------------------------------------------------
 // Checkbox Button

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.1 2003/03/18 02:21:47 ipkiss Exp $
+ * $Id: generic.cpp,v 1.2 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -28,17 +28,17 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
-#include "bitmap.h"
-#include "os_bitmap.h"
-#include "banks.h"
-#include "graphics.h"
-#include "os_graphics.h"
-#include "event.h"
+#include "../os_api.h"
+#include "../src/bitmap.h"
+#include "../os_bitmap.h"
+#include "../src/banks.h"
+#include "../src/graphics.h"
+#include "../os_graphics.h"
+#include "../src/event.h"
 #include "generic.h"
-#include "window.h"
-#include "theme.h"
-#include "skin_common.h"
+#include "../src/window.h"
+#include "../src/theme.h"
+#include "../src/skin_common.h"
 
 
 //---------------------------------------------------------------------------

modules/gui/skins/controls/image.cpp

@@ -2,7 +2,7 @@
  * image.cpp: Image control
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: image.cpp,v 1.4 2003/04/15 20:33:58 karibu Exp $
+ * $Id: image.cpp,v 1.5 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -28,14 +28,14 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "bitmap.h"
-#include "banks.h"
+#include "../src/bitmap.h"
+#include "../src/banks.h"
 #include "generic.h"
 #include "image.h"
-#include "event.h"
-#include "theme.h"
-#include "window.h"
-#include "skin_common.h"
+#include "../src/event.h"
+#include "../src/theme.h"
+#include "../src/window.h"
+#include "../src/skin_common.h"
 
 
 

modules/gui/skins/controls/playlist.cpp

@@ -2,7 +2,7 @@
  * playlist.cpp: Playlist control
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: playlist.cpp,v 1.1 2003/03/18 02:21:47 ipkiss Exp $
+ * $Id: playlist.cpp,v 1.2 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -31,21 +31,21 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
-#include "bitmap.h"
-#include "banks.h"
-#include "bezier.h"
-#include "graphics.h"
-#include "os_graphics.h"
-#include "font.h"
-#include "os_font.h"
+#include "../os_api.h"
+#include "../src/bitmap.h"
+#include "../src/banks.h"
+#include "../src/bezier.h"
+#include "../src/graphics.h"
+#include "../os_graphics.h"
+#include "../src/font.h"
+#include "../os_font.h"
 #include "generic.h"
 #include "slider.h"
 #include "playlist.h"
-#include "event.h"
-#include "theme.h"
-#include "window.h"
-#include "skin_common.h"
+#include "../src/event.h"
+#include "../src/theme.h"
+#include "../src/window.h"
+#include "../src/skin_common.h"
 
 
 

modules/gui/skins/controls/rectangle.cpp

@@ -2,7 +2,7 @@
  * rectangle.cpp: Rectanglee control
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: rectangle.cpp,v 1.2 2003/03/18 04:08:45 ipkiss Exp $
+ * $Id: rectangle.cpp,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -28,16 +28,16 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
-#include "graphics.h"
-#include "bitmap.h"
-#include "banks.h"
+#include "../os_api.h"
+#include "../src/graphics.h"
+#include "../src/bitmap.h"
+#include "../src/banks.h"
 #include "generic.h"
 #include "rectangle.h"
-#include "event.h"
-#include "theme.h"
-#include "window.h"
-#include "skin_common.h"
+#include "../src/event.h"
+#include "../src/theme.h"
+#include "../src/window.h"
+#include "../src/skin_common.h"
 
 
 

modules/gui/skins/controls/slider.cpp

@@ -2,7 +2,7 @@
  * slider.cpp: Slider control
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: slider.cpp,v 1.3 2003/04/12 21:43:27 asmax Exp $
+ * $Id: slider.cpp,v 1.4 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -32,18 +32,18 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
-#include "bitmap.h"
-#include "bezier.h"
-#include "banks.h"
-#include "graphics.h"
-#include "os_graphics.h"
+#include "../os_api.h"
+#include "../src/bitmap.h"
+#include "../src/bezier.h"
+#include "../src/banks.h"
+#include "../src/graphics.h"
+#include "../os_graphics.h"
 #include "generic.h"
 #include "slider.h"
-#include "event.h"
-#include "theme.h"
-#include "window.h"
-#include "skin_common.h"
+#include "../src/event.h"
+#include "../src/theme.h"
+#include "../src/window.h"
+#include "../src/skin_common.h"
 
 
 
@@ -90,7 +90,7 @@ void ControlSlider::Init()
 {
     int i;
     // Get bitmap from list
-    Img    = new (Bitmap*)[2];
+    Img    = new (::Bitmap*)[2];
     Img[0] = p_intf->p_sys->p_theme->BmpBank->Get( cursorUp );
     Img[1] = p_intf->p_sys->p_theme->BmpBank->Get( cursorDown );
 

modules/gui/skins/controls/text.cpp

@@ -2,7 +2,7 @@
  * text.cpp: Text control
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: text.cpp,v 1.2 2003/04/12 22:50:42 asmax Exp $
+ * $Id: text.cpp,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -28,19 +28,19 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
-#include "bitmap.h"
-#include "banks.h"
-#include "graphics.h"
-#include "os_graphics.h"
-#include "font.h"
+#include "../os_api.h"
+#include "../src/bitmap.h"
+#include "../src/banks.h"
+#include "../src/graphics.h"
+#include "../os_graphics.h"
+#include "../src/font.h"
 #include "generic.h"
 #include "text.h"
-#include "event.h"
-#include "theme.h"
-#include "window.h"
-#include "os_window.h"
-#include "skin_common.h"
+#include "../src/event.h"
+#include "../src/theme.h"
+#include "../src/window.h"
+#include "../os_window.h"
+#include "../src/skin_common.h"
 
 
 

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.10 2003/04/16 19:22:53 karibu Exp $
+ * $Id: gtk2_api.cpp,v 1.11 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Cyril Deguet  <asmax@videolan.org>
  *
@@ -29,10 +29,10 @@
 #include <gdk/gdk.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "window.h"
-#include "os_window.h"
-#include "os_api.h"
-#include "event.h"         // for MAX_PARAM_SIZE
+#include "../src/window.h"
+#include "../os_window.h"
+#include "../os_api.h"
+#include "../src/event.h"       // for MAX_PARAM_SIZE
 
 #include <stdio.h>
 

modules/gui/skins/gtk2/gtk2_bitmap.cpp

@@ -2,7 +2,7 @@
  * gtk2_bitmap.cpp: GTK2 implementation of the Bitmap class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: gtk2_bitmap.cpp,v 1.12 2003/04/16 19:22:53 karibu Exp $
+ * $Id: gtk2_bitmap.cpp,v 1.13 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -32,12 +32,12 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
-#include "graphics.h"
+#include "../os_api.h"
+#include "../src/graphics.h"
 #include "gtk2_graphics.h"
-#include "bitmap.h"
+#include "../src/bitmap.h"
 #include "gtk2_bitmap.h"
-#include "skin_common.h"
+#include "../src/skin_common.h"
 
 
 //---------------------------------------------------------------------------

modules/gui/skins/gtk2/gtk2_dialog.cpp

@@ -2,7 +2,7 @@
  * gtk2_dialog.cpp: GTK2 implementation of some dialog boxes
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: gtk2_dialog.cpp,v 1.3 2003/04/13 19:09:59 asmax Exp $
+ * $Id: gtk2_dialog.cpp,v 1.4 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -36,16 +36,16 @@ extern intf_thread_t *g_pIntf;
 //#include <richedit.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "banks.h"
-#include "dialog.h"
-#include "os_dialog.h"
-#include "skin_common.h"
-#include "window.h"
-#include "os_window.h"
-#include "theme.h"
-#include "os_theme.h"
-#include "event.h"
-#include "os_api.h"
+#include "../src/banks.h"
+#include "../src/dialog.h"
+#include "../os_dialog.h"
+#include "../src/skin_common.h"
+#include "../src/window.h"
+#include "../os_window.h"
+#include "../src/theme.h"
+#include "../os_theme.h"
+#include "../src/event.h"
+#include "../os_api.h"
 
 
 //---------------------------------------------------------------------------

modules/gui/skins/gtk2/gtk2_dragdrop.cpp

@@ -2,7 +2,7 @@
  * gtk2_dragdrop.cpp: GTK2 implementation of the drag & drop
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: gtk2_dragdrop.cpp,v 1.2 2003/04/13 19:09:59 asmax Exp $
+ * $Id: gtk2_dragdrop.cpp,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -28,7 +28,7 @@
 //#include <windows.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "event.h"
+#include "../src/event.h"
 #include "gtk2_dragdrop.h"
 
 

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.8 2003/04/16 19:22:53 karibu Exp $
+ * $Id: gtk2_event.cpp,v 1.9 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -31,14 +31,14 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
-#include "event.h"
-#include "os_event.h"
-#include "window.h"
-#include "os_window.h"
-#include "theme.h"
-#include "os_theme.h"
-#include "skin_common.h"
+#include "../os_api.h"
+#include "../src/event.h"
+#include "../os_event.h"
+#include "../src/window.h"
+#include "../os_window.h"
+#include "../src/theme.h"
+#include "../os_theme.h"
+#include "../src/skin_common.h"
 
 
 //---------------------------------------------------------------------------

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.4 2003/04/13 19:09:59 asmax Exp $
+ * $Id: gtk2_font.cpp,v 1.5 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -31,9 +31,9 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "graphics.h"
+#include "../src/graphics.h"
 #include "gtk2_graphics.h"
-#include "font.h"
+#include "../src/font.h"
 #include "gtk2_font.h"
 
 

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.8 2003/04/16 14:38:04 asmax Exp $
+ * $Id: gtk2_graphics.cpp,v 1.9 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -28,9 +28,9 @@
 #include <gdk/gdk.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "graphics.h"
-#include "window.h"
-#include "os_window.h"
+#include "../src/graphics.h"
+#include "../src/window.h"
+#include "../os_window.h"
 #include "gtk2_graphics.h"
 
 #include <stdio.h>

modules/gui/skins/gtk2/gtk2_run.cpp

@@ -2,7 +2,7 @@
  * gtk2_run.cpp:
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: gtk2_run.cpp,v 1.10 2003/04/16 21:30:56 karibu Exp $
+ * $Id: gtk2_run.cpp,v 1.11 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -32,16 +32,16 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
-#include "event.h"
-#include "os_event.h"
-#include "banks.h"
-#include "window.h"
-#include "os_window.h"
-#include "theme.h"
-#include "os_theme.h"
-#include "skin_common.h"
-#include "vlcproc.h"
+#include "../os_api.h"
+#include "../src/event.h"
+#include "../os_event.h"
+#include "../src/banks.h"
+#include "../src/window.h"
+#include "../os_window.h"
+#include "../src/theme.h"
+#include "../os_theme.h"
+#include "../src/skin_common.h"
+#include "../src/vlcproc.h"
 
 
 //---------------------------------------------------------------------------

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.13 2003/04/16 14:38:04 asmax Exp $
+ * $Id: gtk2_theme.cpp,v 1.14 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -32,18 +32,18 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
-#include "banks.h"
-#include "window.h"
-#include "os_window.h"
-#include "event.h"
-#include "os_event.h"
-#include "theme.h"
-#include "os_theme.h"
-#include "dialog.h"
-#include "os_dialog.h"
-#include "vlcproc.h"
-#include "skin_common.h"
+#include "../os_api.h"
+#include "../src/banks.h"
+#include "../src/window.h"
+#include "../os_window.h"
+#include "../src/event.h"
+#include "../os_event.h"
+#include "../src/theme.h"
+#include "../os_theme.h"
+#include "../src/dialog.h"
+#include "../os_dialog.h"
+#include "../src/vlcproc.h"
+#include "../src/skin_common.h"
 
 
 //---------------------------------------------------------------------------

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.17 2003/04/16 15:34:36 asmax Exp $
+ * $Id: gtk2_window.cpp,v 1.18 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -35,17 +35,17 @@
 #include <glib.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
-#include "anchor.h"
-#include "generic.h"
-#include "window.h"
-#include "os_window.h"
-#include "event.h"
-#include "os_event.h"
-#include "graphics.h"
-#include "os_graphics.h"
-#include "skin_common.h"
-#include "theme.h"
+#include "../os_api.h"
+#include "../src/anchor.h"
+#include "../controls/generic.h"
+#include "../src/window.h"
+#include "../os_window.h"
+#include "../src/event.h"
+#include "../os_event.h"
+#include "../src/graphics.h"
+#include "../os_graphics.h"
+#include "../src/skin_common.h"
+#include "../src/theme.h"
 
 
 //---------------------------------------------------------------------------

modules/gui/skins/os_bitmap.h

@@ -2,7 +2,7 @@
  * os_bitmap.h: Wrapper for the Bitmap class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: os_bitmap.h,v 1.2 2003/04/12 21:43:27 asmax Exp $
+ * $Id: os_bitmap.h,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -25,10 +25,10 @@
 
 
 #if defined( WIN32 )
-    #include "win32_bitmap.h"
+    #include "win32/win32_bitmap.h"
     #define OSBitmap Win32Bitmap
 #else    
-    #include "gtk2_bitmap.h"
+    #include "gtk2/gtk2_bitmap.h"
     #define OSBitmap GTK2Bitmap
 #endif
 

modules/gui/skins/os_dialog.h

@@ -2,7 +2,7 @@
  * os_dialog.h: Wrapper for the common dialogs
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: os_dialog.h,v 1.2 2003/04/12 21:43:27 asmax Exp $
+ * $Id: os_dialog.h,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -25,11 +25,11 @@
 
 
 #if defined( WIN32 )
-    #include "win32_dialog.h"
+    #include "win32/win32_dialog.h"
     #define OSOpenFileDialog Win32OpenFileDialog
     #define OSLogWindow Win32LogWindow
 #else    
-    #include "gtk2_dialog.h"
+    #include "gtk2/gtk2_dialog.h"
     #define OSOpenFileDialog GTK2OpenFileDialog
     #define OSLogWindow GTK2LogWindow
 #endif

modules/gui/skins/os_event.h

@@ -2,7 +2,7 @@
  * os_event.h: Wrapper for the Event class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: os_event.h,v 1.2 2003/04/12 21:43:27 asmax Exp $
+ * $Id: os_event.h,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -25,10 +25,10 @@
 
 
 #if defined( WIN32 )
-    #include "win32_event.h"
+    #include "win32/win32_event.h"
     #define OSEvent Win32Event
 #else    
-    #include "gtk2_event.h"
+    #include "gtk2/gtk2_event.h"
     #define OSEvent GTK2Event
 #endif
 

modules/gui/skins/os_font.h

@@ -2,7 +2,7 @@
  * os_font.h: Wrapper for the OSFont class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: os_font.h,v 1.2 2003/04/12 21:43:27 asmax Exp $
+ * $Id: os_font.h,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -25,9 +25,9 @@
 
 
 #if defined( WIN32 )
-    #include "win32_font.h"
+    #include "win32/win32_font.h"
     #define OSFont Win32Font
 #else    
-    #include "gtk2_font.h"
+    #include "gtk2/gtk2_font.h"
     #define OSFont GTK2Font
 #endif

modules/gui/skins/os_graphics.h

@@ -2,7 +2,7 @@
  * os_graphics.h: Wrapper for the Graphics and Region classes
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: os_graphics.h,v 1.3 2003/04/13 20:07:34 asmax Exp $
+ * $Id: os_graphics.h,v 1.4 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -25,13 +25,13 @@
 
 
 #if defined( WIN32 )
-    #include "win32_graphics.h"
+    #include "win32/win32_graphics.h"
     #define SRC_COPY   SRCCOPY
     #define SRC_AND    SRCAND
     #define OSGraphics Win32Graphics
     #define OSRegion   Win32Region
 #else    
-    #include "gtk2_graphics.h"
+    #include "gtk2/gtk2_graphics.h"
     #define SRC_COPY   1
     #define SRC_AND    2
     #define OSGraphics GTK2Graphics

modules/gui/skins/os_theme.h

@@ -2,7 +2,7 @@
  * os_theme.h: Wrapper for the OSTheme class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: os_theme.h,v 1.2 2003/04/12 21:43:27 asmax Exp $
+ * $Id: os_theme.h,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -25,9 +25,9 @@
 
 
 #if defined( WIN32 )
-    #include "win32_theme.h"
+    #include "win32/win32_theme.h"
     #define OSTheme Win32Theme
 #else    
-    #include "gtk2_theme.h"
+    #include "gtk2/gtk2_theme.h"
     #define OSTheme GTK2Theme
 #endif

modules/gui/skins/os_window.h

@@ -2,7 +2,7 @@
  * os_window.h: Wrapper for the OSWindow class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: os_window.h,v 1.2 2003/04/12 21:43:27 asmax Exp $
+ * $Id: os_window.h,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -25,11 +25,11 @@
 
 
 #if defined( WIN32 )
-    #include "win32_dragdrop.h"
-    #include "win32_window.h"
+    #include "win32/win32_dragdrop.h"
+    #include "win32/win32_window.h"
     #define OSWindow Win32Window
 #else    
-    #include "gtk2_dragdrop.h"
-    #include "gtk2_window.h"
+    #include "gtk2/gtk2_dragdrop.h"
+    #include "gtk2/gtk2_window.h"
     #define OSWindow GTK2Window
 #endif

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.6 2003/04/13 17:46:22 asmax Exp $
+ * $Id: wrappers.cpp,v 1.7 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -34,13 +34,13 @@ using namespace std;
 extern intf_thread_t *g_pIntf;
 
 //--- SKIN ------------------------------------------------------------------
-#include "anchor.h"
-#include "banks.h"
-#include "controls.h"
-#include "font.h"
-#include "window.h"
-#include "theme.h"
-#include "skin_common.h"
+#include "../src/anchor.h"
+#include "../src/banks.h"
+#include "../controls/controls.h"
+#include "../src/font.h"
+#include "../src/window.h"
+#include "../src/theme.h"
+#include "../src/skin_common.h"
 #include "wrappers.h"
 
 

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.2 2003/04/14 10:00:38 karibu Exp $
+ * $Id: banks.cpp,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -29,11 +29,11 @@
 
 //--- SKIN ------------------------------------------------------------------
 #include "bitmap.h"
-#include "os_bitmap.h"
+#include "../os_bitmap.h"
 #include "event.h"
-#include "os_event.h"
+#include "../os_event.h"
 #include "font.h"
-#include "os_font.h"
+#include "../os_font.h"
 #include "banks.h"
 #include "skin_common.h"
 

modules/gui/skins/src/event.cpp

@@ -2,7 +2,7 @@
  * event.cpp: Event class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: event.cpp,v 1.10 2003/04/16 19:22:53 karibu Exp $
+ * $Id: event.cpp,v 1.11 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -28,14 +28,14 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
+#include "../os_api.h"
 #include "skin_common.h"
 #include "banks.h"
-#include "generic.h"
+#include "../controls/generic.h"
 #include "window.h"
 #include "theme.h"
 #include "event.h"
-#include "os_event.h"
+#include "../os_event.h"
 
 
 

modules/gui/skins/src/font.cpp

@@ -2,7 +2,7 @@
  * font.cpp: Font class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: font.cpp,v 1.1 2003/03/18 02:21:47 ipkiss Exp $
+ * $Id: font.cpp,v 1.2 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -28,7 +28,7 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
+#include "../os_api.h"
 #include "font.h"
 
 

modules/gui/skins/src/skin_main.cpp

@@ -2,7 +2,7 @@
  * skin-main.cpp: skins plugin for VLC
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: skin_main.cpp,v 1.9 2003/04/14 10:18:25 asmax Exp $
+ * $Id: skin_main.cpp,v 1.10 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -30,14 +30,14 @@
 #include <vlc/aout.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
+#include "../os_api.h"
 #include "event.h"
 #include "dialog.h"
-#include "os_dialog.h"
+#include "../os_dialog.h"
 #include "banks.h"
 #include "window.h"
 #include "theme.h"
-#include "os_theme.h"
+#include "../os_theme.h"
 #include "themeloader.h"
 #include "vlcproc.h"
 #include "skin_common.h"

modules/gui/skins/src/theme.cpp

@@ -2,7 +2,7 @@
  * theme.cpp: Theme class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: theme.cpp,v 1.7 2003/04/13 19:09:59 asmax Exp $
+ * $Id: theme.cpp,v 1.8 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -28,16 +28,16 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
+#include "../os_api.h"
 #include "window.h"
-#include "os_window.h"
+#include "../os_window.h"
 #include "dialog.h"
-#include "os_dialog.h"
+#include "../os_dialog.h"
 #include "banks.h"
 #include "anchor.h"
 #include "event.h"
-#include "os_event.h"
-#include "generic.h"
+#include "../os_event.h"
+#include "../controls/generic.h"
 #include "theme.h"
 #include "vlcproc.h"
 #include "skin_common.h"

modules/gui/skins/src/themeloader.cpp

@@ -2,7 +2,7 @@
  * themeloader.cpp: ThemeLoader class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: themeloader.cpp,v 1.5 2003/04/13 17:46:23 asmax Exp $
+ * $Id: themeloader.cpp,v 1.6 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -28,7 +28,9 @@
 #include <string>
 #include <fcntl.h>
 #if !defined WIN32
-#include <unistd.h>
+#   include <unistd.h>
+#else
+#   include <direct.h>
 #endif
 
 //--- VLC -------------------------------------------------------------------
@@ -41,9 +43,9 @@
 #endif
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
+#include "../os_api.h"
 #include "theme.h"
-#include "os_theme.h"
+#include "../os_theme.h"
 #include "themeloader.h"
 #include "skin_common.h"
 

modules/gui/skins/src/vlcproc.cpp

@@ -2,7 +2,7 @@
  * vlcproc.cpp: VlcProc class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: vlcproc.cpp,v 1.6 2003/04/14 10:00:38 karibu Exp $
+ * $Id: vlcproc.cpp,v 1.7 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -32,13 +32,13 @@
 #include <netutils.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
+#include "../os_api.h"
 #include "dialog.h"
-#include "os_dialog.h"
+#include "../os_dialog.h"
 #include "event.h"
 #include "banks.h"
 #include "theme.h"
-#include "os_theme.h"
+#include "../os_theme.h"
 #include "themeloader.h"
 #include "window.h"
 #include "vlcproc.h"

modules/gui/skins/src/window.cpp

@@ -2,7 +2,7 @@
  * window.cpp: Window class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: window.cpp,v 1.15 2003/04/16 21:39:00 karibu Exp $
+ * $Id: window.cpp,v 1.16 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -29,12 +29,12 @@
 
 //--- SKIN ------------------------------------------------------------------
 #include "anchor.h"
-#include "generic.h"
+#include "../controls/generic.h"
 #include "window.h"
 #include "event.h"
-#include "os_api.h"
+#include "../os_api.h"
 #include "graphics.h"
-#include "os_graphics.h"
+#include "../os_graphics.h"
 #include "banks.h"
 #include "theme.h"
 #include "skin_common.h"

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.2 2003/04/12 21:43:27 asmax Exp $
+ * $Id: win32_api.cpp,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -29,10 +29,10 @@
 #include <windows.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "window.h"
-#include "os_window.h"
-#include "os_api.h"
-#include "event.h"         // for MAX_PARAM_SIZE
+#include "../src/window.h"
+#include "../os_window.h"
+#include "../os_api.h"
+#include "../src/event.h"         // for MAX_PARAM_SIZE
 
 
 

modules/gui/skins/win32/win32_bitmap.cpp

@@ -2,7 +2,7 @@
  * win32_bitmap.cpp: Win32 implementation of the Bitmap class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: win32_bitmap.cpp,v 1.3 2003/04/16 19:22:53 karibu Exp $
+ * $Id: win32_bitmap.cpp,v 1.4 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -33,12 +33,12 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
-#include "graphics.h"
+#include "../os_api.h"
+#include "../src/graphics.h"
 #include "win32_graphics.h"
-#include "bitmap.h"
+#include "../src/bitmap.h"
 #include "win32_bitmap.h"
-#include "skin_common.h"
+#include "../src/skin_common.h"
 
 
 

modules/gui/skins/win32/win32_dialog.cpp

@@ -2,7 +2,7 @@
  * win32_dialog.cpp: Win32 implementation of some dialog boxes
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: win32_dialog.cpp,v 1.3 2003/04/12 21:43:27 asmax Exp $
+ * $Id: win32_dialog.cpp,v 1.4 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -37,16 +37,16 @@ extern intf_thread_t *g_pIntf;
 #include <richedit.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "banks.h"
-#include "dialog.h"
-#include "os_dialog.h"
-#include "skin_common.h"
-#include "window.h"
-#include "os_window.h"
-#include "theme.h"
-#include "os_theme.h"
-#include "event.h"
-#include "os_api.h"
+#include "../src/banks.h"
+#include "../src/dialog.h"
+#include "../os_dialog.h"
+#include "../src/skin_common.h"
+#include "../src/window.h"
+#include "../os_window.h"
+#include "../src/theme.h"
+#include "../os_theme.h"
+#include "../src/event.h"
+#include "../os_api.h"
 
 
 //---------------------------------------------------------------------------

modules/gui/skins/win32/win32_dragdrop.cpp

@@ -2,7 +2,7 @@
  * win32_dragdrop.cpp: Win32 implementation of the drag & drop
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: win32_dragdrop.cpp,v 1.3 2003/04/12 21:43:27 asmax Exp $
+ * $Id: win32_dragdrop.cpp,v 1.4 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -29,7 +29,7 @@
 #include <windows.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "event.h"
+#include "../src/event.h"
 #include "win32_dragdrop.h"
 
 

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.3 2003/04/12 21:43:27 asmax Exp $
+ * $Id: win32_event.cpp,v 1.4 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -32,13 +32,13 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "event.h"
-#include "os_event.h"
-#include "window.h"
-#include "os_window.h"
-#include "theme.h"
-#include "os_theme.h"
-#include "skin_common.h"
+#include "../src/event.h"
+#include "../os_event.h"
+#include "../src/window.h"
+#include "../os_window.h"
+#include "../src/theme.h"
+#include "../os_theme.h"
+#include "../src/skin_common.h"
 
 
 

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.2 2003/04/12 21:43:27 asmax Exp $
+ * $Id: win32_font.cpp,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -32,9 +32,9 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "graphics.h"
+#include "../src/graphics.h"
 #include "win32_graphics.h"
-#include "font.h"
+#include "../src/font.h"
 #include "win32_font.h"
 
 

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.2 2003/04/12 21:43:27 asmax Exp $
+ * $Id: win32_graphics.cpp,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -29,9 +29,9 @@
 #include <windows.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "graphics.h"
-#include "window.h"
-#include "os_window.h"
+#include "../src/graphics.h"
+#include "../src/window.h"
+#include "../os_window.h"
 #include "win32_graphics.h"
 
 

modules/gui/skins/win32/win32_run.cpp

@@ -2,7 +2,7 @@
  * win32_run.cpp:
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: win32_run.cpp,v 1.4 2003/04/12 21:43:27 asmax Exp $
+ * $Id: win32_run.cpp,v 1.5 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -32,16 +32,16 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
-#include "event.h"
-#include "os_event.h"
-#include "banks.h"
-#include "window.h"
-#include "os_window.h"
-#include "theme.h"
-#include "os_theme.h"
-#include "skin_common.h"
-#include "vlcproc.h"
+#include "../os_api.h"
+#include "../src/event.h"
+#include "../os_event.h"
+#include "../src/banks.h"
+#include "../src/window.h"
+#include "../os_window.h"
+#include "../src/theme.h"
+#include "../os_theme.h"
+#include "../src/skin_common.h"
+#include "../src/vlcproc.h"
 
 
 

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.2 2003/04/12 21:43:27 asmax Exp $
+ * $Id: win32_theme.cpp,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -25,6 +25,10 @@
 
 #ifdef WIN32
 
+#ifdef _MSC_VER
+#   define _WIN32_WINNT 0x0500
+#endif
+
 //--- WIN32 -----------------------------------------------------------------
 #include <windows.h>
 
@@ -32,18 +36,18 @@
 #include <vlc/intf.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
-#include "banks.h"
-#include "window.h"
-#include "os_window.h"
-#include "event.h"
-#include "os_event.h"
-#include "theme.h"
-#include "os_theme.h"
-#include "dialog.h"
-#include "os_dialog.h"
-#include "vlcproc.h"
-#include "skin_common.h"
+#include "../os_api.h"
+#include "../src/banks.h"
+#include "../src/window.h"
+#include "../os_window.h"
+#include "../src/event.h"
+#include "../os_event.h"
+#include "../src/theme.h"
+#include "../os_theme.h"
+#include "../src/dialog.h"
+#include "../os_dialog.h"
+#include "../src/vlcproc.h"
+#include "../src/skin_common.h"
 
 
 //---------------------------------------------------------------------------

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.6 2003/04/15 16:49:45 karibu Exp $
+ * $Id: win32_window.cpp,v 1.7 2003/04/16 21:40:07 ipkiss Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -35,17 +35,17 @@
 #include <windows.h>
 
 //--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
-#include "anchor.h"
-#include "generic.h"
-#include "window.h"
-#include "os_window.h"
-#include "event.h"
-#include "os_event.h"
-#include "graphics.h"
-#include "os_graphics.h"
-#include "skin_common.h"
-#include "theme.h"
+#include "../os_api.h"
+#include "../src/anchor.h"
+#include "../controls/generic.h"
+#include "../src/window.h"
+#include "../os_window.h"
+#include "../src/event.h"
+#include "../os_event.h"
+#include "../src/graphics.h"
+#include "../os_graphics.h"
+#include "../src/skin_common.h"
+#include "../src/theme.h"