Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-22 05:54:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use std::wstring unconditionally

Browse Source 
Don't test for its existence in configure and CMake and don't use
wxStdWideString in the code.
This commit is contained in:
Vadim Zeitlin
2022-10-11 00:45:30 +02:00
parent eb97bf90e4
commit 0a387693c6
14 changed files with 25 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/strings/stdstrings.cpp
+4 -4
View File
@@ -526,7 +526,7 @@ TEST_CASE("StdString::Substr", "[stdstring]")
TEST_CASE("StdString::Conversion", "[stdstring]")
{
std::string strStd("std::string value");
wxStdWideString strStdWide(L"std::wstring value");
std::wstring strStdWide(L"std::wstring value");
wxString s1(strStd);
CHECK( s1 == "std::string value" );
@@ -553,9 +553,9 @@ TEST_CASE("StdString::Conversion", "[stdstring]")
CHECK( s5 == "hello" );
#if wxUSE_STL
wxStdWideString s6 = s4;
std::wstring s6 = s4;
#else
wxStdWideString s6 = s4.ToStdWstring();
std::wstring s6 = s4.ToStdWstring();
#endif
CHECK( s6 == "hello" );
@@ -564,7 +564,7 @@ TEST_CASE("StdString::Conversion", "[stdstring]")
CHECK( s7 == "hello" );
#endif
wxStdWideString s8(s4);
std::wstring s8(s4);
CHECK( s8 == "hello" );
#if wxUSE_UNICODE