Add support for wxNO_IMPLICIT_WXSTRING_CONV_TO_PTR to wxString

This symbol is similar to the existing wxNO_IMPLICIT_WXSTRING_ENCODING
and can be defined when building the application (as opposed to when
building the library) to disable implicit wxString conversions to
pointer types, i.e. char*, wchat_t* and void*.

This makes the just added wxUSE_CHAR_CONV_IN_WXSTRING library build
option unnecessary, so remove it.
This commit is contained in:
Vadim Zeitlin
2023-04-16 01:16:56 +02:00
parent 4913857ef7
commit 889845fbc4
16 changed files with 44 additions and 141 deletions
+1 -1
View File
@@ -1018,7 +1018,7 @@ TEST_CASE("StringCStrDataImplicitConversion", "[wxString]")
CHECK( CheckStrConstWChar(s, s.c_str()) );
CHECK( CheckStrConstChar(s, s.c_str()) );
#if wxUSE_CHAR_CONV_IN_WXSTRING
#ifndef wxNO_IMPLICIT_WXSTRING_CONV_TO_PTR
CHECK( CheckStrConstWChar(s, s) );
#ifndef wxNO_UNSAFE_WXSTRING_CONV
CHECK( CheckStrConstChar(s, s) );