* configure.ac.in: fixed the wx-config detection by the skins plugin.

* modules/gui/wxwindows/*: fixed a couple of breakage.

diff --git a/configure.ac.in b/configure.ac.in
index 5728f0344180385f029045de13b1eb20fc14be70..d199c6aaeea54f834a12ab65eeb9bb0ff915ebb3 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -2385,15 +2385,15 @@ if test "x${enable_skins}" != "xno"; then
         WXWINDOWS_PATH="${with_skins_wx_config_path}:${PATH}"
       fi ])
   # look for wx-config
-  AC_PATH_PROG(WX_CONFIG, wx-config, no, ${WXWINDOWS_PATH})
-  if test "x${WX_CONFIG}" != "xno"
+  AC_PATH_PROG(WX_CONFIG_SKINS, wx-config, no, ${WXWINDOWS_PATH})
+  if test "x${WX_CONFIG_SKINS}" != "xno"
   then
-    if expr 2.3.0 \> `${WX_CONFIG} --version` >/dev/null
+    if expr 2.3.0 \> `${WX_CONFIG_SKINS} --version` >/dev/null
     then
       AC_MSG_ERROR([Your development package for wxWindows is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-skins.])
     fi
-    CPPFLAGS_skins="${CPPFLAGS_skins} `${WX_CONFIG} --cxxflags` -DWX_SKINS"
-    LDFLAGS_skins="${LDFLAGS_skins} `${WX_CONFIG} --libs`"
+    CPPFLAGS_skins="${CPPFLAGS_skins} `${WX_CONFIG_SKINS} --cxxflags` -DWX_SKINS"
+    LDFLAGS_skins="${LDFLAGS_skins} `${WX_CONFIG_SKINS} --libs`"
   fi
 
   if test "x${SYS}" = "xmingw32" -o "x${SYS}" = "xcygwin"; then

diff --git a/modules/gui/wxwindows/fileinfo.cpp b/modules/gui/wxwindows/fileinfo.cpp
index 877c992f75a3d91666ca19ea0aed553dc4e4891f..1b85330e84165029ff9f6d198372ba493c504c0d 100644 (file)
--- a/modules/gui/wxwindows/fileinfo.cpp
+++ b/modules/gui/wxwindows/fileinfo.cpp
@@ -2,7 +2,7 @@
  * fileinfo.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: fileinfo.cpp,v 1.12 2003/05/11 13:22:23 gbazin Exp $
+ * $Id: fileinfo.cpp,v 1.13 2003/05/11 13:45:21 gbazin Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *
@@ -158,7 +158,7 @@ void FileInfo::UpdateFileInfo()
         input_info_t *p_info = p_cat->p_info;
         while( p_info )
         {
-            fileinfo_tree->AppendItem( cat, wxU(p_info->psz_name) +
+            fileinfo_tree->AppendItem( cat, (wxString)wxU(p_info->psz_name) +
                                        wxT(": ") + wxU(p_info->psz_value) );
             p_info = p_info->p_next;
         }

diff --git a/modules/gui/wxwindows/interface.cpp b/modules/gui/wxwindows/interface.cpp
index 6e5758d71b65e00e0ace85b884073423097b9a05..c3cd5f387621a76691f19cd92639efdf9143c1aa 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.24 2003/05/11 13:22:23 gbazin Exp $
+ * $Id: interface.cpp,v 1.25 2003/05/11 13:45:21 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -477,7 +477,8 @@ void Interface::OnExit( wxCommandEvent& WXUNUSED(event) )
 void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
 {
     wxString msg;
-    msg.Printf( wxT(VOUT_TITLE) + wxU(_(" (wxWindows interface)\n\n")) +
+    msg.Printf( wxString(wxT(VOUT_TITLE)) +
+        wxU(_(" (wxWindows interface)\n\n")) +
         wxU(_("(C) 1996-2003 - the VideoLAN Team\n\n")) +
         wxU(_("The VideoLAN team <videolan@videolan.org>\n"
               "http://www.videolan.org/\n\n")) +