Commit acc28ba5 authored by Olivier Teulière's avatar Olivier Teulière

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

    path, so that MSVC is happy :)
parent d71063c3
......@@ -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
......
......@@ -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
......
......@@ -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"
//---------------------------------------------------------------------------
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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 );
......
......@@ -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"
......
......@@ -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>
......
......@@ -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"
//---------------------------------------------------------------------------
......
......@@ -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"
//---------------------------------------------------------------------------
......
......@@ -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"
......
......@@ -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"
//---------------------------------------------------------------------------
......
......@@ -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"
......
......@@ -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>
......
......@@ -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"
//---------------------------------------------------------------------------
......
......@@ -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"
//---------------------------------------------------------------------------
......
......@@ -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"
//---------------------------------------------------------------------------
......
......@@ -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
......
......@@ -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
......
......@@ -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