VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main/Resources.cpp
diff options
context:
space:
mode:
authorJertzukka <Jertzukka@gmail.com>2024-05-18 04:46:39 +0300
committerGitHub <noreply@github.com>2024-05-18 03:46:39 +0200
commit114624b3a57374d69e4e4c7c2dd9d9f8ac308489 (patch)
tree4aa67f18d6b2b792051e378031ceba2eabd018a3 /src/Main/Resources.cpp
parent55c3a8dc58d74bbdd4c39585eff14985838d9896 (diff)
downloadVeraCrypt-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.
Diffstat (limited to 'src/Main/Resources.cpp')
-rw-r--r--src/Main/Resources.cpp4
1 files changed, 2 insertions, 2 deletions
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