* modules/gui/wxwindows/*: a few fixes for the win32 build.

diff --git a/modules/gui/wxwindows/interface.cpp b/modules/gui/wxwindows/interface.cpp
index bf0b7bebf83562cec4aab2e3c62d1cb987c1a1d3..cb449bc6a43ff33adb546188193303cf3f7d5fcd 100644 (file)
--- a/modules/gui/wxwindows/interface.cpp
+++ b/modules/gui/wxwindows/interface.cpp
@@ -2,7 +2,7 @@
  * interface.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: interface.cpp,v 1.7 2002/11/23 14:28:51 gbazin Exp $
+ * $Id: interface.cpp,v 1.8 2002/11/23 16:17:12 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -29,18 +29,19 @@
 #include <string.h>                                            /* strerror() */
 #include <stdio.h>
 
-#include <wx/wxprec.h>
-#include <wx/wx.h>
-
-/* Let vlc take care of the i18n stuff */
-#undef _
+#include <vlc/vlc.h>
 
 #ifdef WIN32                                                 /* mingw32 hack */
 #undef Yield
 #undef CreateDialog
 #endif
 
-#include <vlc/vlc.h>
+/* Let vlc take care of the i18n stuff */
+#define WXINTL_NO_GETTEXT_MACRO
+
+#include <wx/wxprec.h>
+#include <wx/wx.h>
+
 #include <vlc/intf.h>
 
 #include "wxwindows.h"
@@ -58,6 +59,8 @@
 #include "bitmaps/previous.xpm"
 #include "bitmaps/next.xpm"
 #include "bitmaps/playlist.xpm"
+#define TOOLBAR_BMP_WIDTH 24
+#define TOOLBAR_BMP_HEIGHT 24
 
 /* include the icon graphic */
 #include "share/vlc32x32.xpm"
@@ -252,6 +255,8 @@ void Interface::CreateOurToolBar()
     wxToolBar *toolbar = CreateToolBar(
         wxTB_HORIZONTAL | wxTB_TEXT | wxTB_FLAT | wxTB_DOCKABLE );
 
+    toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) );
+
     toolbar->AddTool( OpenFile_Event, _("File"), *p_bmp_file, HELP_FILE );
     toolbar->AddTool( OpenFile_Event, _("Disc"), *p_bmp_disc, HELP_DISC );
     toolbar->AddTool( OpenFile_Event, _("Net"), *p_bmp_net, HELP_NET );

diff --git a/modules/gui/wxwindows/playlist.cpp b/modules/gui/wxwindows/playlist.cpp
index b5943beb0bf2107ba7edea86cff78d63d9728917..dd1f9043439d55b78f9f0565f7ae0f42dd055b47 100644 (file)
--- a/modules/gui/wxwindows/playlist.cpp
+++ b/modules/gui/wxwindows/playlist.cpp
@@ -29,19 +29,20 @@
 #include <string.h>                                            /* strerror() */
 #include <stdio.h>
 
-#include <wx/wxprec.h>
-#include <wx/wx.h>
-#include <wx/listctrl.h>
-
-/* Let vlc take care of the i18n stuff */
-#undef _
+#include <vlc/vlc.h>
 
 #ifdef WIN32                                                 /* mingw32 hack */
 #undef Yield
 #undef CreateDialog
 #endif
 
-#include <vlc/vlc.h>
+/* Let vlc take care of the i18n stuff */
+#define WXINTL_NO_GETTEXT_MACRO
+
+#include <wx/wxprec.h>
+#include <wx/wx.h>
+#include <wx/listctrl.h>
+
 #include <vlc/intf.h>
 
 #include "wxwindows.h"

diff --git a/modules/gui/wxwindows/timer.cpp b/modules/gui/wxwindows/timer.cpp
index c6ea022b941b0ad728868db52468781b18a186cf..bb06a7c7a0c77cfdd44461d99f2d73ab67fba59a 100644 (file)
--- a/modules/gui/wxwindows/timer.cpp
+++ b/modules/gui/wxwindows/timer.cpp
@@ -2,7 +2,7 @@
  * timer.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: timer.cpp,v 1.4 2002/11/23 14:28:51 gbazin Exp $
+ * $Id: timer.cpp,v 1.5 2002/11/23 16:17:12 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -29,19 +29,20 @@
 #include <string.h>                                            /* strerror() */
 #include <stdio.h>
 
-#include <wx/wxprec.h>
-#include <wx/wx.h>
-#include <wx/timer.h>
-
-/* Let vlc take care of the i18n stuff */
-#undef _
+#include <vlc/vlc.h>
 
 #ifdef WIN32                                                 /* mingw32 hack */
 #undef Yield
 #undef CreateDialog
 #endif
 
-#include <vlc/vlc.h>
+/* Let vlc take care of the i18n stuff */
+#define WXINTL_NO_GETTEXT_MACRO
+
+#include <wx/wxprec.h>
+#include <wx/wx.h>
+#include <wx/timer.h>
+
 #include <vlc/intf.h>
 
 #include "wxwindows.h"

diff --git a/modules/gui/wxwindows/wxwindows.cpp b/modules/gui/wxwindows/wxwindows.cpp
index bfab686d797274cf116a393fe60a4eadf658aefe..9233a9335a0220b58127dbfb321891b08a9acda4 100644 (file)
--- a/modules/gui/wxwindows/wxwindows.cpp
+++ b/modules/gui/wxwindows/wxwindows.cpp
@@ -2,7 +2,7 @@
  * wxwindows.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: wxwindows.cpp,v 1.5 2002/11/23 14:28:51 gbazin Exp $
+ * $Id: wxwindows.cpp,v 1.6 2002/11/23 16:17:12 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -29,18 +29,19 @@
 #include <string.h>                                            /* strerror() */
 #include <stdio.h>
 
-#include <wx/wxprec.h>
-#include <wx/wx.h>
-
-/* Let vlc take care of the i18n stuff */
-#undef _
+#include <vlc/vlc.h>
 
 #ifdef WIN32                                                 /* mingw32 hack */
 #undef Yield
 #undef CreateDialog
 #endif
 
-#include <vlc/vlc.h>
+/* Let vlc take care of the i18n stuff */
+#define WXINTL_NO_GETTEXT_MACRO
+
+#include <wx/wxprec.h>
+#include <wx/wx.h>
+
 #include <vlc/intf.h>
 
 #include "wxwindows.h"
@@ -77,6 +78,8 @@ vlc_module_begin();
     set_description( (char *) _("wxWindows interface module") );
     set_capability( "interface", 50 );
     set_callbacks( Open, Close );
+    add_shortcut( "wxwindows" );
+    add_shortcut( "wxwin" );
     set_program( "wxvlc" );
 vlc_module_end();
 
@@ -138,7 +141,9 @@ static void Close( vlc_object_t *p_this )
  *****************************************************************************/
 static void Run( intf_thread_t *p_intf )
 {
+#if !defined( WIN32 )
     static char  *p_args[] = { "" };
+#endif
 
     /* Hack to pass the p_intf pointer to the new wxWindow Instance object */
     wxTheApp = new Instance( p_intf );