From 57e136d9e17abdcc1f8a12784ed8f697dbc9e86f Mon Sep 17 00:00:00 2001 From: Arrigo Marchiori Date: Sat, 4 Apr 2020 12:58:51 +0200 Subject: [PATCH] Enforce consistency of encoding-related macros Force wxNO_UNSAFE_WXSTRING_CONV on if wxNO_IMPLICIT_WXSTRING_ENCODING is on, as the latter is even stronger than the former. --- include/wx/string.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wx/string.h b/include/wx/string.h index 68638d5dda..5bcb6cb4ee 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -81,6 +81,11 @@ class WXDLLIMPEXP_FWD_BASE wxString; #define WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER 1 #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 { template struct wxStringAsBufHelper;