diff options
| author | Jertzukka <Jertzukka@gmail.com> | 2024-05-18 04:46:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-18 03:46:39 +0200 |
| commit | 114624b3a57374d69e4e4c7c2dd9d9f8ac308489 (patch) | |
| tree | 4aa67f18d6b2b792051e378031ceba2eabd018a3 | |
| parent | 55c3a8dc58d74bbdd4c39585eff14985838d9896 (diff) | |
| download | VeraCrypt-114624b3a57374d69e4e4c7c2dd9d9f8ac308489.tar.gz VeraCrypt-114624b3a57374d69e4e4c7c2dd9d9f8ac308489.zip | |
Prepare for changes in wxWidgets 3.3 (#1343)
* Move from deprecated wxScopedPtr to std::unique_ptr
wxScopedPtr was included previously through some header hierarchy which as of 3.3 is
no longer the case causing it to break. But instead of including a header for a deprecated
function explicitly, just move to std::unique_ptr as recommended by upstream.
* Convert to explicit conversions from wxString
As of https://github.com/wxWidgets/wxWidgets/pull/23449/commits/35c35c235e9c29b40002131602e050dca8d65b8c
wxWidgets defaults to STL classes, which has a side-effect that
some implicit conversions break. This patch converts those conversions
to explicit in anticipation of wxWidgets 3.3 release.
| -rw-r--r-- | src/Main/Application.cpp | 2 | ||||
| -rw-r--r-- | src/Main/Forms/VolumeCreationWizard.cpp | 2 | ||||
| -rw-r--r-- | src/Main/Resources.cpp | 4 | ||||
| -rw-r--r-- | src/Main/StringFormatter.h | 2 | ||||
| -rw-r--r-- | src/Main/UserInterface.cpp | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/Main/Application.cpp b/src/Main/Application.cpp index c72e2cc6..27b8f55a 100644 --- a/src/Main/Application.cpp +++ b/src/Main/Application.cpp @@ -89,7 +89,7 @@ namespace VeraCrypt FilePath Application::GetConfigFilePath (const wxString &configFileName, bool createConfigDir) { - static wxScopedPtr<const wxString> configDirC; + static std::unique_ptr<const wxString> configDirC; static bool configDirExists = false; if (!configDirExists) diff --git a/src/Main/Forms/VolumeCreationWizard.cpp b/src/Main/Forms/VolumeCreationWizard.cpp index 2653ff66..0eae11d6 100644 --- a/src/Main/Forms/VolumeCreationWizard.cpp +++ b/src/Main/Forms/VolumeCreationWizard.cpp @@ -975,7 +975,7 @@ namespace VeraCrypt if (OuterVolume && VolumeSize > TC_MAX_FAT_SECTOR_COUNT * SectorSize) { uint64 limit = TC_MAX_FAT_SECTOR_COUNT * SectorSize / BYTES_PER_TB; - wstring err = StringFormatter (LangString["LINUX_ERROR_SIZE_HIDDEN_VOL"], limit, limit * 1024); + wstring err = static_cast<wstring>(StringFormatter (LangString["LINUX_ERROR_SIZE_HIDDEN_VOL"], limit, limit * 1024)); if (SectorSize < 4096) { diff --git a/src/Main/Resources.cpp b/src/Main/Resources.cpp index d8bab977..18a58181 100644 --- a/src/Main/Resources.cpp +++ b/src/Main/Resources.cpp @@ -71,12 +71,12 @@ namespace VeraCrypt UserPreferences Preferences; Preferences.Load(); - wstring preferredLang = Preferences.Language; + string preferredLang = string(Preferences.Language.begin(), Preferences.Language.end()); #ifdef DEBUG std::cout << "Config language: " << preferredLang << std::endl; #endif - if (preferredLang == L"system") { + if (preferredLang == "system") { if (const char *env_p = getenv("LANG")) { string lang(env_p); #ifdef DEBUG diff --git a/src/Main/StringFormatter.h b/src/Main/StringFormatter.h index 33a47a35..97c39ae2 100644 --- a/src/Main/StringFormatter.h +++ b/src/Main/StringFormatter.h @@ -52,7 +52,7 @@ namespace VeraCrypt StringFormatter (const wxString &format, StringFormatterArg arg0 = StringFormatterArg(), StringFormatterArg arg1 = StringFormatterArg(), StringFormatterArg arg2 = StringFormatterArg(), StringFormatterArg arg3 = StringFormatterArg(), StringFormatterArg arg4 = StringFormatterArg(), StringFormatterArg arg5 = StringFormatterArg(), StringFormatterArg arg6 = StringFormatterArg(), StringFormatterArg arg7 = StringFormatterArg(), StringFormatterArg arg8 = StringFormatterArg(), StringFormatterArg arg9 = StringFormatterArg()); virtual ~StringFormatter (); - operator wstring () const { return wstring (FormattedString); } + explicit operator wstring () const { return wstring (FormattedString); } operator wxString () const { return FormattedString; } operator StringFormatterArg () const { return FormattedString; } diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp index 3ec2e8dc..09b1fcdd 100644 --- a/src/Main/UserInterface.cpp +++ b/src/Main/UserInterface.cpp @@ -390,7 +390,7 @@ namespace VeraCrypt errOutput += StringConverter::ToWide (execEx->GetErrorOutput()); if (errOutput.empty()) - return errOutput + StringFormatter (LangString["LINUX_COMMAND_GET_ERROR"], execEx->GetCommand(), execEx->GetExitCode()); + return errOutput + static_cast<wstring>(StringFormatter (LangString["LINUX_COMMAND_GET_ERROR"], execEx->GetCommand(), execEx->GetExitCode())); return wxString (errOutput).Trim (true); } @@ -1516,7 +1516,7 @@ namespace VeraCrypt EncryptionTest::TestAll(); // StringFormatter - if (StringFormatter (L"{9} {8} {7} {6} {5} {4} {3} {2} {1} {0} {{0}}", "1", L"2", '3', L'4', 5, 6, 7, 8, 9, 10) != L"10 9 8 7 6 5 4 3 2 1 {0}") + if (static_cast<wstring>(StringFormatter (L"{9} {8} {7} {6} {5} {4} {3} {2} {1} {0} {{0}}", "1", L"2", '3', L'4', 5, 6, 7, 8, 9, 10)) != L"10 9 8 7 6 5 4 3 2 1 {0}") throw TestFailed (SRC_POS); try { |