Skip to content

V
vlc-2-2
Commit cad0baca authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

For wxWidgets into so-called Unicode (actually UTF-32) mode

parent 5c46aa11
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 8 deletions
modules/gui/wxwidgets/wxwidgets.h
View file @ cad0baca
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <list> #include <list>
#define wxUSE_UNICODE 1
#include <wx/wxprec.h> #include <wx/wxprec.h>
#include <wx/wx.h> #include <wx/wx.h>
...@@ -63,17 +64,9 @@ DECLARE_LOCAL_EVENT_TYPE( wxEVT_INTF, 1 ); ...@@ -63,17 +64,9 @@ DECLARE_LOCAL_EVENT_TYPE( wxEVT_INTF, 1 );
/* wxU is used to convert ansi/utf8 strings to unicode strings (wchar_t) */ /* wxU is used to convert ansi/utf8 strings to unicode strings (wchar_t) */
#if defined( ENABLE_NLS ) #if defined( ENABLE_NLS )
#if wxUSE_UNICODE
# define wxU(utf8) wxString(utf8, wxConvUTF8) # define wxU(utf8) wxString(utf8, wxConvUTF8)
#else
# define wxU(utf8) wxString(wxConvUTF8.cMB2WC(utf8), *wxConvCurrent)
#endif
#else // ENABLE_NLS #else // ENABLE_NLS
#if wxUSE_UNICODE
# define wxU(ansi) wxString(ansi, wxConvLocal) # define wxU(ansi) wxString(ansi, wxConvLocal)
#else
# define wxU(ansi) (ansi)
#endif
#endif #endif
/* wxL2U (locale to unicode) is used to convert ansi strings to unicode /* wxL2U (locale to unicode) is used to convert ansi strings to unicode
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment