* 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 Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
}
//-----------------------------------------------------------------------
- #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
//-----------------------------------------------------------------------
* 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 Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
#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
* 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>
#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
* 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>
#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
* 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>
#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
* 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>
#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
* 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 Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
#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"
* dialogs.cpp: Handles all the different dialog boxes we provide.\r
*****************************************************************************\r
* Copyright (C) 2003 VideoLAN\r
- * $Id: dialogs.cpp,v 1.8 2003/06/28 13:04:52 sam Exp $\r
+ * $Id: dialogs.cpp,v 1.9 2003/07/13 14:55:17 gbazin Exp $\r
*\r
* Authors: Gildas Bazin <gbazin@netcourrier.com>\r
*\r
{\r
public:\r
Instance();\r
-#ifdef GTK2_SKINS\r
- Instance( intf_thread_t *_p_intf, CallBackObjects *callback );\r
-#else\r
Instance( intf_thread_t *_p_intf );\r
-#endif\r
\r
bool OnInit();\r
int OnExit();\r
private:\r
intf_thread_t *p_intf;\r
\r
-#ifdef GTK2_SKINS\r
- CallBackObjects *callbackobj;\r
-#endif\r
-\r
DECLARE_EVENT_TABLE();\r
};\r
\r
{\r
}\r
\r
-#ifdef GTK2_SKINS\r
-Instance::Instance( intf_thread_t *_p_intf, CallBackObjects *callback )\r
-{\r
- // Initialization\r
- p_intf = _p_intf;\r
- callbackobj = callback;\r
-}\r
-#else\r
Instance::Instance( intf_thread_t *_p_intf )\r
{\r
// Initialization\r
p_intf = _p_intf;\r
}\r
-#endif\r
\r
IMPLEMENT_APP_NO_MAIN(Instance)\r
\r
{\r
p_intf->p_sys->p_icon = new wxIcon( vlc_xpm );\r
\r
-#ifdef GTK2_SKINS\r
- // Set event callback. Yes, it's a big hack ;)\r
- gdk_event_handler_set( GTK2Proc, (gpointer)callbackobj, NULL );\r
-#endif\r
-\r
// Create all the dialog boxes\r
p_intf->p_sys->p_dialogs->OpenDlg =\r
new OpenDialog( p_intf, NULL, FILE_ACCESS );\r
p_intf->p_sys->p_dialogs->PrefsDlg = new PrefsDialog( p_intf, NULL );\r
p_intf->p_sys->p_dialogs->FileInfoDlg = new FileInfo( p_intf, NULL );\r
\r
-#ifdef GTK2_SKINS\r
- // Add timer\r
- g_timeout_add( 200, (GSourceFunc)RefreshTimer, (gpointer)p_intf );\r
-#endif\r
-\r
// OK, initialization is over, now the other thread can go on working...\r
vlc_thread_ready( p_intf->p_sys->p_dialogs->p_thread );\r
\r
* 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 Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
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;
projects / vlc / commitdiff