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

Enforce consistency of encoding-related macros

Browse Source 
Force wxNO_UNSAFE_WXSTRING_CONV on if wxNO_IMPLICIT_WXSTRING_ENCODING is
on, as the latter is even stronger than the former.
This commit is contained in:
Arrigo Marchiori
2020-04-04 12:58:51 +02:00
committed by Vadim Zeitlin
parent f44121378e
commit 57e136d9e1
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/string.h
View File

@@ -81,6 +81,11 @@ class WXDLLIMPEXP_FWD_BASE wxString;
#define WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER 1 #define WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER 1
#endif #endif
// enforce consistency among encoding-related macros
#if defined wxNO_IMPLICIT_WXSTRING_ENCODING && !defined wxNO_UNSAFE_WXSTRING_CONV
#define wxNO_UNSAFE_WXSTRING_CONV
#endif
namespace wxPrivate namespace wxPrivate
{ {
template <typename T> struct wxStringAsBufHelper; template <typename T> struct wxStringAsBufHelper;