From: Rémi Denis-Courmont <rem@videolan.org>
Date: Tue, 8 Mar 2005 17:31:31 +0000 (+0000)
Subject: Same fix for non-constant string.
X-Git-Tag: 0.8.2~900
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=38a90d280d865fbbe2ffa6083a644ae31acb18ce;p=vlc

Same fix for non-constant string.

The playlist works fine again (with ASCII/Latin locale charset).
When in UTF8, it might be a good idea to check for invalid bytes
sequences and replace them with question mark - at the moment
wxWidgets still leave the whole text blank which result in blank
playlist item in the playlist.
---

diff --git a/modules/gui/wxwindows/wxwindows.h b/modules/gui/wxwindows/wxwindows.h
index 210f38254e..5fabab2f63 100644
--- a/modules/gui/wxwindows/wxwindows.h
+++ b/modules/gui/wxwindows/wxwindows.h
@@ -69,7 +69,7 @@ DECLARE_LOCAL_EVENT_TYPE( wxEVT_INTF, 1 );
 #if wxUSE_UNICODE
 #   define wxU(ansi) wxString(ansi, wxConvLocal)
 #else
-#   define wxU(ansi) ansi
+#   define wxU(ansi) (ansi)
 #endif
 #define ISUTF8 0
 
@@ -77,11 +77,7 @@ DECLARE_LOCAL_EVENT_TYPE( wxEVT_INTF, 1 );
 
 /* 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