* should have repaired win32 skins

diff --git a/modules/gui/skins/gtk2/gtk2_api.cpp b/modules/gui/skins/gtk2/gtk2_api.cpp
index 7e43e76487993cf291c69c4f73124a74ba27d861..4269b5174e829cd77154082122da43d7b82e2268 100644 (file)
--- a/modules/gui/skins/gtk2/gtk2_api.cpp
+++ b/modules/gui/skins/gtk2/gtk2_api.cpp
@@ -2,7 +2,7 @@
  * gtk2_api.cpp: Various gtk2-specific functions
  *****************************************************************************
  * 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>
  *
@@ -22,6 +22,7 @@
  * USA.
  *****************************************************************************/
 
+#if !defined WIN32
 
 //--- GTK2 ------------------------------------------------------------------
 #include <gdk/gdk.h>
@@ -159,3 +160,4 @@ bool OSAPI_RmDir( string path )
 }
 //---------------------------------------------------------------------------
 
+#endif

diff --git a/modules/gui/skins/gtk2/gtk2_bitmap.cpp b/modules/gui/skins/gtk2/gtk2_bitmap.cpp
index caef11b80a1e5f3c72e72717773ec217a778c591..5a37e408af5ee2a8a47c74142a506c03f51e7a52 100644 (file)
--- a/modules/gui/skins/gtk2/gtk2_bitmap.cpp
+++ b/modules/gui/skins/gtk2/gtk2_bitmap.cpp
@@ -2,7 +2,7 @@
  * gtk2_bitmap.cpp: GTK2 implementation of the Bitmap class
  *****************************************************************************
  * 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>
  *
@@ -22,6 +22,7 @@
  * USA.
  *****************************************************************************/
 
+#if !defined WIN32
 
 //--- GTK2 -----------------------------------------------------------------
 //#define WINVER  0x0500
@@ -171,3 +172,4 @@ void GTK2Bitmap::SetBmpPixel( int x, int y, int color )
 }
 //---------------------------------------------------------------------------
 
+#endif

diff --git a/modules/gui/skins/gtk2/gtk2_dialog.cpp b/modules/gui/skins/gtk2/gtk2_dialog.cpp
index 3525494e15c9fe757e9bf6213d465afbfde015f6..29a6d48ad01574bbb0c9703be020aedf00846483 100644 (file)
--- a/modules/gui/skins/gtk2/gtk2_dialog.cpp
+++ b/modules/gui/skins/gtk2/gtk2_dialog.cpp
@@ -2,7 +2,7 @@
  * gtk2_dialog.cpp: GTK2 implementation of some dialog boxes
  *****************************************************************************
  * 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>
  *
@@ -22,6 +22,7 @@
  * USA.
  *****************************************************************************/
 
+#if !defined WIN32
 
 //--- VLC -------------------------------------------------------------------
 #include <vlc/intf.h>
@@ -358,3 +359,4 @@ void GTK2LogWindow::Hide()
 }
 //---------------------------------------------------------------------------
 
+#endif

diff --git a/modules/gui/skins/gtk2/gtk2_dragdrop.cpp b/modules/gui/skins/gtk2/gtk2_dragdrop.cpp
index da185aeb2ddcd22a6d21abba830c36cf5146a78c..2b8c7e85f0fe0d5f6ca6bee455c6ef597c6f1986 100644 (file)
--- a/modules/gui/skins/gtk2/gtk2_dragdrop.cpp
+++ b/modules/gui/skins/gtk2/gtk2_dragdrop.cpp
@@ -2,7 +2,7 @@
  * gtk2_dragdrop.cpp: GTK2 implementation of the drag & drop
  *****************************************************************************
  * 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>
  *
@@ -22,6 +22,7 @@
  * USA.
  *****************************************************************************/
 
+#if !defined WIN32
 
 //--- GTK2 -----------------------------------------------------------------
 //#include <windows.h>
@@ -163,3 +164,5 @@ STDMETHODIMP GTK2DropObject::Drop( LPDATAOBJECT pDataObj, DWORD grfKeyState,
     return S_OK;
 }
 */
+
+#endif

diff --git a/modules/gui/skins/gtk2/gtk2_event.cpp b/modules/gui/skins/gtk2/gtk2_event.cpp
index 2f928f194e284ce07fdc45d7d68eb887f178230e..703bd37af652ea7498a15f4123a1d6d2e146f919 100644 (file)
--- a/modules/gui/skins/gtk2/gtk2_event.cpp
+++ b/modules/gui/skins/gtk2/gtk2_event.cpp
@@ -2,7 +2,7 @@
  * gtk2_event.cpp: GTK2 implementation of the Event class
  *****************************************************************************
  * 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>
  *
@@ -22,6 +22,7 @@
  * USA.
  *****************************************************************************/
 
+#if !defined WIN32
 
 //--- GTK2 -----------------------------------------------------------------
 #include <gdk/gdk.h>
@@ -118,3 +119,4 @@ GdkWindow *GTK2Event::GetWindowFromName( string name )
 }
 //---------------------------------------------------------------------------
 
+#endif

diff --git a/modules/gui/skins/gtk2/gtk2_font.cpp b/modules/gui/skins/gtk2/gtk2_font.cpp
index fed3954db38814f8735a642cac6a3d3ae0ea10fe..ebfbe016005b79234708efe9b6926f03b6a7a50d 100644 (file)
--- a/modules/gui/skins/gtk2/gtk2_font.cpp
+++ b/modules/gui/skins/gtk2/gtk2_font.cpp
@@ -2,7 +2,7 @@
  * gtk2_font.cpp: GTK2 implementation of the Font class
  *****************************************************************************
  * 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>
  *
@@ -22,6 +22,7 @@
  * USA.
  *****************************************************************************/
 
+#if !defined WIN32
 
 //--- GTK2 -----------------------------------------------------------------
 #include <gdk/gdk.h>
@@ -158,3 +159,4 @@ void GTK2Font::PrintColor( Graphics *dest, string text, int x, int y, int w,
 }
 //---------------------------------------------------------------------------
 
+#endif

diff --git a/modules/gui/skins/gtk2/gtk2_graphics.cpp b/modules/gui/skins/gtk2/gtk2_graphics.cpp
index 52dbd1eb99a87fbf3a8f71ecbdf7d46300e25bee..725fe69950c8bec49aee27d4fe57b96b4143e974 100644 (file)
--- a/modules/gui/skins/gtk2/gtk2_graphics.cpp
+++ b/modules/gui/skins/gtk2/gtk2_graphics.cpp
@@ -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.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>
  *
@@ -22,6 +22,7 @@
  * USA.
  *****************************************************************************/
 
+#if !defined WIN32
 
 //--- GTK2 -----------------------------------------------------------------
 #include <gdk/gdk.h>
@@ -141,3 +142,4 @@ bool GTK2Region::Hit( int x, int y )
 }
 //---------------------------------------------------------------------------
 
+#endif

diff --git a/modules/gui/skins/gtk2/gtk2_run.cpp b/modules/gui/skins/gtk2/gtk2_run.cpp
index 94eaf6746e6974e130937ea62680d464f7336f47..51c5081dab1d77f80f8c72fa5c78833c80ec50c9 100644 (file)
--- a/modules/gui/skins/gtk2/gtk2_run.cpp
+++ b/modules/gui/skins/gtk2/gtk2_run.cpp
@@ -2,7 +2,7 @@
  * gtk2_run.cpp:
  *****************************************************************************
  * 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>
  *
@@ -22,6 +22,7 @@
  * USA.
  *****************************************************************************/
 
+#if !defined WIN32
 
 //--- GTK2 ------------------------------------------------------------------
 #include <glib.h>
@@ -186,3 +187,4 @@ bool IsVLCEvent( unsigned int msg )
 //---------------------------------------------------------------------------
 
 
+#endif

diff --git a/modules/gui/skins/gtk2/gtk2_theme.cpp b/modules/gui/skins/gtk2/gtk2_theme.cpp
index 97338ccf8e15ab427d29df34f6d0b6c3bb40a2f3..116b8eb5cc1901267c5cb4af87fb969c63d307c3 100644 (file)
--- a/modules/gui/skins/gtk2/gtk2_theme.cpp
+++ b/modules/gui/skins/gtk2/gtk2_theme.cpp
@@ -2,7 +2,7 @@
  * gtk2_theme.cpp: GTK2 implementation of the Theme class
  *****************************************************************************
  * 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>
  *
@@ -22,6 +22,7 @@
  * USA.
  *****************************************************************************/
 
+#if !defined WIN32
 
 //--- GTK2 -----------------------------------------------------------------
 #include <gdk/gdk.h>
@@ -380,3 +381,4 @@ void GTK2Theme::ChangeTaskbar()
 }
 //---------------------------------------------------------------------------
 
+#endif

diff --git a/modules/gui/skins/gtk2/gtk2_window.cpp b/modules/gui/skins/gtk2/gtk2_window.cpp
index 385ce6e15d4d6757c0f9a1c7e9277da13b0516ea..4349ceaf7e0f899da16e920c2a7c7656976a0061 100644 (file)
--- a/modules/gui/skins/gtk2/gtk2_window.cpp
+++ b/modules/gui/skins/gtk2/gtk2_window.cpp
@@ -2,7 +2,7 @@
  * gtk2_window.cpp: GTK2 implementation of the Window class
  *****************************************************************************
  * 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>
  *
@@ -22,6 +22,7 @@
  * USA.
  *****************************************************************************/
 
+#if !defined WIN32
 
 //--- GENERAL ---------------------------------------------------------------
 //#include <math.h>
@@ -302,3 +303,4 @@ void GTK2Window::ChangeToolTipText( string text )
 }
 //---------------------------------------------------------------------------
 
+#endif

diff --git a/modules/gui/skins/src/theme.cpp b/modules/gui/skins/src/theme.cpp
index 79effba05792968f4c6ad641372b9e8a1ffcf870..887c9334d9afbbef45726c156a6368a12da89395 100644 (file)
--- a/modules/gui/skins/src/theme.cpp
+++ b/modules/gui/skins/src/theme.cpp
@@ -2,7 +2,7 @@
  * theme.cpp: Theme class
  *****************************************************************************
  * 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 Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -195,15 +195,13 @@ void Theme::StartTheme( bool log, int magnet )
 void Theme::InitTheme()
 {
     // Initialize the events
-/* FIXME */
-fprintf(stderr, "FIXME in theme.cpp !\n");
-//    EvtBank->Init();
+    EvtBank->Init();
 
     // Initialize the controls
     InitControls();
 
     // Initialize the windows
-//    InitWindows();
+    InitWindows();
 }
 //---------------------------------------------------------------------------
 void Theme::InitWindows()