mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-09-21 21:47:55 +08:00
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:
@@ -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) );
|
||||
|
||||
Reference in New Issue
Block a user