merge 291142 290134 292693
tags 291142 +patch
thank

 Hello,

The reported issue has been fixed in VLC's trunk. Here is a patch.
A possible work-around in the mean time is to run vlc with a UTF-8 
locale, e.g. :

$ LANG=fr_FR.UTF-8 vlc

There seems to be a regression in wxWidgets with the wxConvCurrent 
global variable or something related.

Have a nice day,

-- 
RÃmi Denis-Courmont
http://www.simphalempin.com/home/
Index: vlc-trunk/modules/gui/wxwindows/wxwindows.h
===================================================================
--- vlc-trunk/modules/gui/wxwindows/wxwindows.h	(revision 10211)
+++ vlc-0.8.1/modules/gui/wxwindows/wxwindows.h	(revision 10213)
@@ -67,9 +67,9 @@
 
 #else // ENABLE_NLS && ENABLE_UTF8
 #if wxUSE_UNICODE
-#   define wxU(ansi) wxString(ansi, *wxConvCurrent)
+#   define wxU(ansi) wxString(ansi, wxConvLocal)
 #else
-#   define wxU(ansi) ansi
+#   define wxU(ansi) (ansi)
 #endif
 #define ISUTF8 0
 
@@ -77,11 +77,7 @@
 
 /* wxL2U (locale to unicode) is used to convert ansi strings to unicode
  * strings (wchar_t) */
-#if wxUSE_UNICODE
-#   define wxL2U(ansi) wxString(ansi, *wxConvCurrent)
-#else
-#   define wxL2U(ansi) ansi
-#endif
+#define wxL2U(ansi) wxU(ansi)
 
 #define WRAPCOUNT 80
 

Attachment: pgp5WY3s8KmoV.pgp
Description: PGP signature

Reply via email to