Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid using wxNO_IMPLICIT_WXSTRING_ENCODING in utf-8-only builds

Browse Source
This commit is contained in:
Arrigo Marchiori
2020-04-13 09:13:21 +02:00
committed by Vadim Zeitlin
parent 40d1a3da35
commit 464aeb8f84
7 changed files with 85 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/string.h
View File

@@ -82,10 +82,18 @@ class WXDLLIMPEXP_FWD_BASE wxString;
#endif
// enforce consistency among encoding-related macros
#if defined wxNO_IMPLICIT_WXSTRING_ENCODING && !defined wxNO_UNSAFE_WXSTRING_CONV
#ifdef wxNO_IMPLICIT_WXSTRING_ENCODING
#ifndef wxNO_UNSAFE_WXSTRING_CONV
#define wxNO_UNSAFE_WXSTRING_CONV
#endif
#if wxUSE_UTF8_LOCALE_ONLY
#error wxNO_IMPLICIT_WXSTRING_ENCODING cannot be used in UTF-8 only builds
#endif
#endif
namespace wxPrivate
{
template <typename T> struct wxStringAsBufHelper;