Commit 1bab4d17 authored by Cyril Deguet's avatar Cyril Deguet

* should have repaired win32 skins

parent db008d07
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* gtk2_api.cpp: Various gtk2-specific functions * gtk2_api.cpp: Various gtk2-specific functions
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: gtk2_api.cpp,v 1.3 2003/04/13 17:46:22 asmax Exp $ * $Id: gtk2_api.cpp,v 1.4 2003/04/13 19:09:59 asmax Exp $
* *
* Authors: Cyril Deguet <asmax@videolan.org> * Authors: Cyril Deguet <asmax@videolan.org>
* *
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* USA. * USA.
*****************************************************************************/ *****************************************************************************/
#if !defined WIN32
//--- GTK2 ------------------------------------------------------------------ //--- GTK2 ------------------------------------------------------------------
#include <gdk/gdk.h> #include <gdk/gdk.h>
...@@ -159,3 +160,4 @@ bool OSAPI_RmDir( string path ) ...@@ -159,3 +160,4 @@ bool OSAPI_RmDir( string path )
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#endif
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* gtk2_bitmap.cpp: GTK2 implementation of the Bitmap class * gtk2_bitmap.cpp: GTK2 implementation of the Bitmap class
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: gtk2_bitmap.cpp,v 1.1 2003/04/12 21:43:27 asmax Exp $ * $Id: gtk2_bitmap.cpp,v 1.2 2003/04/13 19:09:59 asmax Exp $
* *
* Authors: Cyril Deguet <asmax@videolan.org> * Authors: Cyril Deguet <asmax@videolan.org>
* *
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* USA. * USA.
*****************************************************************************/ *****************************************************************************/
#if !defined WIN32
//--- GTK2 ----------------------------------------------------------------- //--- GTK2 -----------------------------------------------------------------
//#define WINVER 0x0500 //#define WINVER 0x0500
...@@ -171,3 +172,4 @@ void GTK2Bitmap::SetBmpPixel( int x, int y, int color ) ...@@ -171,3 +172,4 @@ void GTK2Bitmap::SetBmpPixel( int x, int y, int color )
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#endif
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* gtk2_dialog.cpp: GTK2 implementation of some dialog boxes * gtk2_dialog.cpp: GTK2 implementation of some dialog boxes
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: gtk2_dialog.cpp,v 1.2 2003/04/12 22:50:42 asmax Exp $ * $Id: gtk2_dialog.cpp,v 1.3 2003/04/13 19:09:59 asmax Exp $
* *
* Authors: Cyril Deguet <asmax@videolan.org> * Authors: Cyril Deguet <asmax@videolan.org>
* *
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* USA. * USA.
*****************************************************************************/ *****************************************************************************/
#if !defined WIN32
//--- VLC ------------------------------------------------------------------- //--- VLC -------------------------------------------------------------------
#include <vlc/intf.h> #include <vlc/intf.h>
...@@ -358,3 +359,4 @@ void GTK2LogWindow::Hide() ...@@ -358,3 +359,4 @@ void GTK2LogWindow::Hide()
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#endif
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* gtk2_dragdrop.cpp: GTK2 implementation of the drag & drop * gtk2_dragdrop.cpp: GTK2 implementation of the drag & drop
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: gtk2_dragdrop.cpp,v 1.1 2003/04/12 21:43:27 asmax Exp $ * $Id: gtk2_dragdrop.cpp,v 1.2 2003/04/13 19:09:59 asmax Exp $
* *
* Authors: Cyril Deguet <asmax@videolan.org> * Authors: Cyril Deguet <asmax@videolan.org>
* *
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* USA. * USA.
*****************************************************************************/ *****************************************************************************/
#if !defined WIN32
//--- GTK2 ----------------------------------------------------------------- //--- GTK2 -----------------------------------------------------------------
//#include <windows.h> //#include <windows.h>
...@@ -163,3 +164,5 @@ STDMETHODIMP GTK2DropObject::Drop( LPDATAOBJECT pDataObj, DWORD grfKeyState, ...@@ -163,3 +164,5 @@ STDMETHODIMP GTK2DropObject::Drop( LPDATAOBJECT pDataObj, DWORD grfKeyState,
return S_OK; return S_OK;
} }
*/ */
#endif
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* gtk2_event.cpp: GTK2 implementation of the Event class * gtk2_event.cpp: GTK2 implementation of the Event class
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: gtk2_event.cpp,v 1.3 2003/04/13 17:46:22 asmax Exp $ * $Id: gtk2_event.cpp,v 1.4 2003/04/13 19:09:59 asmax Exp $
* *
* Authors: Cyril Deguet <asmax@videolan.org> * Authors: Cyril Deguet <asmax@videolan.org>
* *
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* USA. * USA.
*****************************************************************************/ *****************************************************************************/
#if !defined WIN32
//--- GTK2 ----------------------------------------------------------------- //--- GTK2 -----------------------------------------------------------------
#include <gdk/gdk.h> #include <gdk/gdk.h>
...@@ -118,3 +119,4 @@ GdkWindow *GTK2Event::GetWindowFromName( string name ) ...@@ -118,3 +119,4 @@ GdkWindow *GTK2Event::GetWindowFromName( string name )
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#endif
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* gtk2_font.cpp: GTK2 implementation of the Font class * gtk2_font.cpp: GTK2 implementation of the Font class
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: gtk2_font.cpp,v 1.3 2003/04/13 17:46:22 asmax Exp $ * $Id: gtk2_font.cpp,v 1.4 2003/04/13 19:09:59 asmax Exp $
* *
* Authors: Cyril Deguet <asmax@videolan.org> * Authors: Cyril Deguet <asmax@videolan.org>
* *
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* USA. * USA.
*****************************************************************************/ *****************************************************************************/
#if !defined WIN32
//--- GTK2 ----------------------------------------------------------------- //--- GTK2 -----------------------------------------------------------------
#include <gdk/gdk.h> #include <gdk/gdk.h>
...@@ -158,3 +159,4 @@ void GTK2Font::PrintColor( Graphics *dest, string text, int x, int y, int w, ...@@ -158,3 +159,4 @@ void GTK2Font::PrintColor( Graphics *dest, string text, int x, int y, int w,
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#endif
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* gtk2_graphics.cpp: GTK2 implementation of the Graphics and Region classes * gtk2_graphics.cpp: GTK2 implementation of the Graphics and Region classes
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: gtk2_graphics.cpp,v 1.3 2003/04/13 17:46:22 asmax Exp $ * $Id: gtk2_graphics.cpp,v 1.4 2003/04/13 19:09:59 asmax Exp $
* *
* Authors: Cyril Deguet <asmax@videolan.org> * Authors: Cyril Deguet <asmax@videolan.org>
* *
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* USA. * USA.
*****************************************************************************/ *****************************************************************************/
#if !defined WIN32
//--- GTK2 ----------------------------------------------------------------- //--- GTK2 -----------------------------------------------------------------
#include <gdk/gdk.h> #include <gdk/gdk.h>
...@@ -141,3 +142,4 @@ bool GTK2Region::Hit( int x, int y ) ...@@ -141,3 +142,4 @@ bool GTK2Region::Hit( int x, int y )
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#endif
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* gtk2_run.cpp: * gtk2_run.cpp:
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: gtk2_run.cpp,v 1.3 2003/04/13 17:46:22 asmax Exp $ * $Id: gtk2_run.cpp,v 1.4 2003/04/13 19:09:59 asmax Exp $
* *
* Authors: Cyril Deguet <asmax@videolan.org> * Authors: Cyril Deguet <asmax@videolan.org>
* *
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* USA. * USA.
*****************************************************************************/ *****************************************************************************/
#if !defined WIN32
//--- GTK2 ------------------------------------------------------------------ //--- GTK2 ------------------------------------------------------------------
#include <glib.h> #include <glib.h>
...@@ -186,3 +187,4 @@ bool IsVLCEvent( unsigned int msg ) ...@@ -186,3 +187,4 @@ bool IsVLCEvent( unsigned int msg )
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#endif
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* gtk2_theme.cpp: GTK2 implementation of the Theme class * gtk2_theme.cpp: GTK2 implementation of the Theme class
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: gtk2_theme.cpp,v 1.2 2003/04/13 17:46:22 asmax Exp $ * $Id: gtk2_theme.cpp,v 1.3 2003/04/13 19:09:59 asmax Exp $
* *
* Authors: Cyril Deguet <asmax@videolan.org> * Authors: Cyril Deguet <asmax@videolan.org>
* *
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* USA. * USA.
*****************************************************************************/ *****************************************************************************/
#if !defined WIN32
//--- GTK2 ----------------------------------------------------------------- //--- GTK2 -----------------------------------------------------------------
#include <gdk/gdk.h> #include <gdk/gdk.h>
...@@ -380,3 +381,4 @@ void GTK2Theme::ChangeTaskbar() ...@@ -380,3 +381,4 @@ void GTK2Theme::ChangeTaskbar()
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#endif
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* gtk2_window.cpp: GTK2 implementation of the Window class * gtk2_window.cpp: GTK2 implementation of the Window class
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: gtk2_window.cpp,v 1.3 2003/04/13 17:46:22 asmax Exp $ * $Id: gtk2_window.cpp,v 1.4 2003/04/13 19:09:59 asmax Exp $
* *
* Authors: Cyril Deguet <asmax@videolan.org> * Authors: Cyril Deguet <asmax@videolan.org>
* *
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* USA. * USA.
*****************************************************************************/ *****************************************************************************/
#if !defined WIN32
//--- GENERAL --------------------------------------------------------------- //--- GENERAL ---------------------------------------------------------------
//#include <math.h> //#include <math.h>
...@@ -302,3 +303,4 @@ void GTK2Window::ChangeToolTipText( string text ) ...@@ -302,3 +303,4 @@ void GTK2Window::ChangeToolTipText( string text )
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#endif
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* theme.cpp: Theme class * theme.cpp: Theme class
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: theme.cpp,v 1.6 2003/04/13 17:46:23 asmax Exp $ * $Id: theme.cpp,v 1.7 2003/04/13 19:09:59 asmax Exp $
* *
* Authors: Olivier Teulire <ipkiss@via.ecp.fr> * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr> * Emmanuel Puig <karibu@via.ecp.fr>
...@@ -195,15 +195,13 @@ void Theme::StartTheme( bool log, int magnet ) ...@@ -195,15 +195,13 @@ void Theme::StartTheme( bool log, int magnet )
void Theme::InitTheme() void Theme::InitTheme()
{ {
// Initialize the events // Initialize the events
/* FIXME */ EvtBank->Init();
fprintf(stderr, "FIXME in theme.cpp !\n");
// EvtBank->Init();
// Initialize the controls // Initialize the controls
InitControls(); InitControls();
// Initialize the windows // Initialize the windows
// InitWindows(); InitWindows();
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void Theme::InitWindows() void Theme::InitWindows()
......
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