Skip to content

V
vlc-1.1
Commit a5969564 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* modules/gui/skins/*: removed unused GTK2_SKINS code.
parent d2904541
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 105 deletions
modules/gui/skins/controls/text.cpp
View file @ a5969564
......@@ -2,7 +2,7 @@
* text.cpp: Text control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: text.cpp,v 1.11 2003/06/07 12:19:23 asmax Exp $
* $Id: text.cpp,v 1.12 2003/07/13 14:55:17 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -83,39 +83,6 @@ extern intf_thread_t *g_pIntf;
}
//-----------------------------------------------------------------------
#elif defined GTK2_SKINS
//-----------------------------------------------------------------------
// Gtk2 methods
//-----------------------------------------------------------------------
gboolean ScrollingTextTimer( gpointer data )
{
if( (ControlText *)data != NULL )
{
if( !( (ControlText *)data )->IsScrolling() )
return false;
if( !( (ControlText *)data )->GetSelected() )
( (ControlText *)data )->DoScroll();
return true;
}
else
{
return false;
}
}
//-----------------------------------------------------------------------
void ControlText::StartScrolling()
{
g_timeout_add( 100, (GSourceFunc)ScrollingTextTimer, (gpointer)this );
}
//-----------------------------------------------------------------------
void ControlText::StopScrolling()
{
}
//-----------------------------------------------------------------------
#elif defined X11_SKINS
//-----------------------------------------------------------------------
......
modules/gui/skins/os_bitmap.h
View file @ a5969564
......@@ -2,7 +2,7 @@
* os_bitmap.h: Wrapper for the Bitmap class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: os_bitmap.h,v 1.5 2003/04/28 14:12:32 asmax Exp $
* $Id: os_bitmap.h,v 1.6 2003/07/13 14:55:16 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -27,9 +27,6 @@
#if defined( WIN32 )
#include "win32/win32_bitmap.h"
#define OSBitmap Win32Bitmap
#elif defined GTK2_SKINS
#include "gtk2/gtk2_bitmap.h"
#define OSBitmap GTK2Bitmap
#elif defined X11_SKINS
#include "x11/x11_bitmap.h"
#define OSBitmap X11Bitmap
......
modules/gui/skins/os_event.h
View file @ a5969564
......@@ -2,7 +2,7 @@
* os_event.h: Wrapper for the Event class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: os_event.h,v 1.5 2003/04/28 14:12:32 asmax Exp $
* $Id: os_event.h,v 1.6 2003/07/13 14:55:16 gbazin Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -27,9 +27,6 @@
#if defined( WIN32 )
#include "win32/win32_event.h"
#define OSEvent Win32Event
#elif defined GTK2_SKINS
#include "gtk2/gtk2_event.h"
#define OSEvent GTK2Event
#elif defined X11_SKINS
#include "x11/x11_event.h"
#define OSEvent X11Event
......
modules/gui/skins/os_font.h
View file @ a5969564
......@@ -2,7 +2,7 @@
* os_font.h: Wrapper for the OSFont class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: os_font.h,v 1.6 2003/04/28 14:12:32 asmax Exp $
* $Id: os_font.h,v 1.7 2003/07/13 14:55:16 gbazin Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -32,14 +32,6 @@
#define VLC_FONT_ALIGN_CENTER DT_CENTER
#define VLC_FONT_ALIGN_RIGHT DT_RIGHT
#elif defined GTK2_SKINS
#include "gtk2/gtk2_font.h"
#define OSFont GTK2Font
#define VLC_FONT_ALIGN_LEFT PANGO_ALIGN_LEFT
#define VLC_FONT_ALIGN_CENTER PANGO_ALIGN_CENTER
#define VLC_FONT_ALIGN_RIGHT PANGO_ALIGN_RIGHT
#elif defined X11_SKINS
#include "x11/x11_font.h"
#define OSFont X11Font
......
modules/gui/skins/os_graphics.h
View file @ a5969564
......@@ -2,7 +2,7 @@
* os_graphics.h: Wrapper for the Graphics and Region classes
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: os_graphics.h,v 1.6 2003/04/28 14:12:32 asmax Exp $
* $Id: os_graphics.h,v 1.7 2003/07/13 14:55:16 gbazin Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -30,12 +30,6 @@
#define SRC_AND SRCAND
#define OSGraphics Win32Graphics
#define OSRegion Win32Region
#elif defined GTK2_SKINS
#include "gtk2/gtk2_graphics.h"
#define SRC_COPY 1
#define SRC_AND 2
#define OSGraphics GTK2Graphics
#define OSRegion GTK2Region
#elif defined X11_SKINS
#include "x11/x11_graphics.h"
#define SRC_COPY 1
......
modules/gui/skins/os_theme.h
View file @ a5969564
......@@ -2,7 +2,7 @@
* os_theme.h: Wrapper for the OSTheme class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: os_theme.h,v 1.5 2003/04/28 14:12:32 asmax Exp $
* $Id: os_theme.h,v 1.6 2003/07/13 14:55:16 gbazin Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -27,9 +27,6 @@
#if defined( WIN32 )
#include "win32/win32_theme.h"
#define OSTheme Win32Theme
#elif defined GTK2_SKINS
#include "gtk2/gtk2_theme.h"
#define OSTheme GTK2Theme
#elif defined X11_SKINS
#include "x11/x11_theme.h"
#define OSTheme X11Theme
......
modules/gui/skins/os_window.h
View file @ a5969564
......@@ -2,7 +2,7 @@
* os_window.h: Wrapper for the OSWindow class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: os_window.h,v 1.5 2003/04/28 14:12:32 asmax Exp $
* $Id: os_window.h,v 1.6 2003/07/13 14:55:16 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -28,10 +28,6 @@
#include "win32/win32_dragdrop.h"
#include "win32/win32_window.h"
#define OSWindow Win32Window
#elif defined GTK2_SKINS
#include "gtk2/gtk2_dragdrop.h"
#include "gtk2/gtk2_window.h"
#define OSWindow GTK2Window
#elif defined X11_SKINS
#include "x11/x11_dragdrop.h"
#include "x11/x11_window.h"
......
modules/gui/skins/src/dialogs.cpp
View file @ a5969564
......@@ -2,7 +2,7 @@
* dialogs.cpp: Handles all the different dialog boxes we provide.
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: dialogs.cpp,v 1.8 2003/06/28 13:04:52 sam Exp $
* $Id: dialogs.cpp,v 1.9 2003/07/13 14:55:17 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -79,11 +79,7 @@ class Instance: public wxApp
{
public:
Instance();
#ifdef GTK2_SKINS
Instance( intf_thread_t *_p_intf, CallBackObjects *callback );
#else
Instance( intf_thread_t *_p_intf );
#endif
bool OnInit();
int OnExit();
......@@ -91,10 +87,6 @@ public:
private:
intf_thread_t *p_intf;
#ifdef GTK2_SKINS
CallBackObjects *callbackobj;
#endif
DECLARE_EVENT_TABLE();
};
......@@ -115,20 +107,11 @@ Instance::Instance( )
{
}
#ifdef GTK2_SKINS
Instance::Instance( intf_thread_t *_p_intf, CallBackObjects *callback )
{
// Initialization
p_intf = _p_intf;
callbackobj = callback;
}
#else
Instance::Instance( intf_thread_t *_p_intf )
{
// Initialization
p_intf = _p_intf;
}
#endif
IMPLEMENT_APP_NO_MAIN(Instance)
......@@ -136,11 +119,6 @@ bool Instance::OnInit()
{
p_intf->p_sys->p_icon = new wxIcon( vlc_xpm );
#ifdef GTK2_SKINS
// Set event callback. Yes, it's a big hack ;)
gdk_event_handler_set( GTK2Proc, (gpointer)callbackobj, NULL );
#endif
// Create all the dialog boxes
p_intf->p_sys->p_dialogs->OpenDlg =
new OpenDialog( p_intf, NULL, FILE_ACCESS );
......@@ -148,11 +126,6 @@ bool Instance::OnInit()
p_intf->p_sys->p_dialogs->PrefsDlg = new PrefsDialog( p_intf, NULL );
p_intf->p_sys->p_dialogs->FileInfoDlg = new FileInfo( p_intf, NULL );
#ifdef GTK2_SKINS
// Add timer
g_timeout_add( 200, (GSourceFunc)RefreshTimer, (gpointer)p_intf );
#endif
// OK, initialization is over, now the other thread can go on working...
vlc_thread_ready( p_intf->p_sys->p_dialogs->p_thread );
......
modules/gui/skins/src/skin_main.cpp
View file @ a5969564
......@@ -2,7 +2,7 @@
* skin-main.cpp: skins plugin for VLC
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: skin_main.cpp,v 1.43 2003/07/05 15:35:28 sam Exp $
* $Id: skin_main.cpp,v 1.44 2003/07/13 14:55:17 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -120,15 +120,7 @@ static int Open ( vlc_object_t *p_this )
p_intf->p_sys->p_playlist = (playlist_t *)vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
#ifdef GTK2_SKINS
// Initialize GDK
int i_args = 3;
char *p_args[] = { "", "", "--sync", NULL };
char **pp_args = p_args;
gdk_init( &i_args, &pp_args );
#elif defined X11_SKINS
#if defined X11_SKINS
// Initialize X11
Display *display = XOpenDisplay( NULL );
p_intf->p_sys->display = display;
......
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