Skip to content

V
vlc-2-2
Commit 6ca3d9e8 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* modules/gui/skins/*: compilation fixes for MSVC. Almost working, we just to find a way to have flex.c not include unistd.h on win32 and not compile the wxwindows files when SKINS_BASIC is defined.
parent fdd5d917
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 31 deletions
modules/gui/skins/controls/button.cpp
View file @ 6ca3d9e8
......@@ -2,7 +2,7 @@
* button.cpp: Button control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: button.cpp,v 1.11 2003/04/21 21:51:16 asmax Exp $
* $Id: button.cpp,v 1.12 2003/05/02 15:53:32 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -76,7 +76,7 @@ ControlButton::~ControlButton()
void ControlButton::Init()
{
// Init bitmaps
Img = new (Bitmap*)[3];
Img = new (Bitmap *[3]);
Img[0] = p_intf->p_sys->p_theme->BmpBank->Get( Up );
Img[1] = p_intf->p_sys->p_theme->BmpBank->Get( Down );
if( Disabled == "none" )
......
modules/gui/skins/controls/checkbox.cpp
View file @ 6ca3d9e8
......@@ -2,7 +2,7 @@
* checkbox.cpp: Checkbox control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: checkbox.cpp,v 1.5 2003/04/21 21:51:16 asmax Exp $
* $Id: checkbox.cpp,v 1.6 2003/05/02 15:53:32 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -25,6 +25,7 @@
//--- VLC -------------------------------------------------------------------
#include <vlc/vlc.h>
#include <vlc/intf.h>
//--- SKIN ------------------------------------------------------------------
......@@ -98,7 +99,7 @@ ControlCheckBox::~ControlCheckBox()
//---------------------------------------------------------------------------
void ControlCheckBox::Init()
{
Img = new (Bitmap*)[6];
Img = new (Bitmap *[6]);
// Images for position 1
Img[0] = p_intf->p_sys->p_theme->BmpBank->Get( Img1 );
......
modules/gui/skins/controls/image.cpp
View file @ 6ca3d9e8
......@@ -2,7 +2,7 @@
* image.cpp: Image control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: image.cpp,v 1.6 2003/04/21 21:51:16 asmax Exp $
* $Id: image.cpp,v 1.7 2003/05/02 15:53:32 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -25,6 +25,7 @@
//--- VLC -------------------------------------------------------------------
#include <vlc/vlc.h>
#include <vlc/intf.h>
//--- SKIN ------------------------------------------------------------------
......@@ -59,7 +60,7 @@ ControlImage::~ControlImage()
//---------------------------------------------------------------------------
void ControlImage::Init()
{
Img = new (Bitmap*)[1];
Img = new (Bitmap *[1]);
Img[0] = p_intf->p_sys->p_theme->BmpBank->Get( Bg );
Img[0]->GetSize( Width, Height );
......
modules/gui/skins/controls/slider.cpp
View file @ 6ca3d9e8
......@@ -2,7 +2,7 @@
* slider.cpp: Slider control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: slider.cpp,v 1.9 2003/04/28 12:25:34 asmax Exp $
* $Id: slider.cpp,v 1.10 2003/05/02 15:53:32 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -85,7 +85,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/src/skin_main.cpp
View file @ 6ca3d9e8
......@@ -2,7 +2,7 @@
* skin-main.cpp: skins plugin for VLC
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: skin_main.cpp,v 1.23 2003/04/30 19:22:27 ipkiss Exp $
* $Id: skin_main.cpp,v 1.24 2003/05/02 15:53:32 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -23,16 +23,16 @@
* USA.
*****************************************************************************/
//--- GENERAL ---------------------------------------------------------------
#ifndef BASIC_SKINS
#include <wx/wx.h>
#endif
//--- VLC -------------------------------------------------------------------
#include <vlc/vlc.h>
#include <vlc/intf.h>
#include <vlc/aout.h>
//--- GENERAL ---------------------------------------------------------------
#ifndef BASIC_SKINS
#include <wx/wx.h>
#endif
//--- SKIN ------------------------------------------------------------------
#include "../os_api.h"
#include "event.h"
......
modules/gui/skins/src/themeloader.cpp
View file @ 6ca3d9e8
......@@ -2,7 +2,7 @@
* themeloader.cpp: ThemeLoader class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: themeloader.cpp,v 1.8 2003/04/24 15:57:50 gbazin Exp $
* $Id: themeloader.cpp,v 1.9 2003/05/02 15:53:32 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -27,13 +27,13 @@
//--- GENERAL ---------------------------------------------------------------
#include <string>
#include <fcntl.h>
#if !defined WIN32
#if !defined( WIN32 )
# include <unistd.h>
# ifndef PATH_MAX
# define MAX_PATH PATH_MAX;
# endif
#else
# include <direct.h>
# ifndef PATH_MAX
# define PATH_MAX MAX_PATH
# endif
#endif
//--- VLC -------------------------------------------------------------------
......
modules/gui/skins/src/vlcproc.cpp
View file @ 6ca3d9e8
......@@ -2,7 +2,7 @@
* vlcproc.cpp: VlcProc class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: vlcproc.cpp,v 1.17 2003/04/30 19:22:27 ipkiss Exp $
* $Id: vlcproc.cpp,v 1.18 2003/05/02 15:53:32 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -23,16 +23,16 @@
* USA.
*****************************************************************************/
#ifndef BASIC_SKINS
#include <wx/wx.h>
#endif
//--- VLC -------------------------------------------------------------------
#include <vlc/vlc.h>
#include <vlc/intf.h>
#include <vlc/aout.h>
#include <vlc/vout.h>
#ifndef BASIC_SKINS
#include <wx/wx.h>
#endif
extern "C" {
#include "netutils.h"
}
......
modules/gui/skins/win32/win32_run.cpp
View file @ 6ca3d9e8
......@@ -2,7 +2,7 @@
* win32_run.cpp:
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: win32_run.cpp,v 1.13 2003/04/30 19:22:27 ipkiss Exp $
* $Id: win32_run.cpp,v 1.14 2003/05/02 15:53:32 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -25,15 +25,16 @@
#ifdef WIN32
//--- VLC -------------------------------------------------------------------
#include <vlc/vlc.h>
#include <vlc/intf.h>
//--- GENERAL ---------------------------------------------------------------
#ifndef BASIC_SKINS
#include <wx/wx.h>
#endif
#include <windows.h>
//--- VLC -------------------------------------------------------------------
#include <vlc/intf.h>
//--- SKIN ------------------------------------------------------------------
#include "../os_api.h"
#include "../src/event.h"
......
modules/gui/skins/win32/win32_window.cpp
View file @ 6ca3d9e8
......@@ -2,7 +2,7 @@
* win32_window.cpp: Win32 implementation of the Window class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: win32_window.cpp,v 1.11 2003/04/29 12:54:57 gbazin Exp $
* $Id: win32_window.cpp,v 1.12 2003/05/02 15:53:32 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -25,6 +25,12 @@
#ifdef WIN32
/* For TrackMouseEvent, WM_MOUSEWHEEL and GET_WHEEL_DELTA_WPARAM */
#undef WINVER
#undef _WIN32_WINNT
#define _WIN32_WINNT 0x0500
#define WINVER 0x0500
//--- GENERAL ---------------------------------------------------------------
//#include <math.h>
......@@ -47,8 +53,6 @@
#include "../src/skin_common.h"
#include "../src/theme.h"
//---------------------------------------------------------------------------
// Fading API
//---------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment