diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2014-06-08 00:45:49 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2014-11-08 23:19:29 +0100 |
| commit | 084a8ee85c24fbc7077d6c789c97aacdb31b4e39 (patch) | |
| tree | 7022ec0ced1d57ca287202a772a28787e1bb2408 /src/Main/CommandLineInterface.cpp | |
| parent | c386beb69c2bb2475316c085f66a91ac0d9bdc73 (diff) | |
| download | VeraCrypt-084a8ee85c24fbc7077d6c789c97aacdb31b4e39.tar.gz VeraCrypt-084a8ee85c24fbc7077d6c789c97aacdb31b4e39.zip | |
wxWidgets 3.0 compatibility modifications
Diffstat (limited to 'src/Main/CommandLineInterface.cpp')
| -rw-r--r-- | src/Main/CommandLineInterface.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Main/CommandLineInterface.cpp b/src/Main/CommandLineInterface.cpp index ccb03170..61cbd310 100644 --- a/src/Main/CommandLineInterface.cpp +++ b/src/Main/CommandLineInterface.cpp @@ -380,7 +380,7 @@ namespace TrueCrypt ArgQuick = parser.Found (L"quick"); if (parser.Found (L"random-source", &str)) - ArgRandomSourcePath = FilesystemPath (str); + ArgRandomSourcePath = FilesystemPath (str.wc_str()); if (parser.Found (L"restore-headers")) { @@ -471,7 +471,7 @@ namespace TrueCrypt if (param1IsFile) { - ArgFilePath.reset (new FilePath (parser.GetParam (0))); + ArgFilePath.reset (new FilePath (parser.GetParam (0).wc_str())); } } @@ -524,7 +524,7 @@ namespace TrueCrypt arr.Add (L""); continue; } - arr.Last() += token.empty() ? L',' : token; + arr.Last() += token.empty() ? L"," : token.wc_str(); } else arr.Add (token); @@ -562,12 +562,12 @@ namespace TrueCrypt { filteredVolumes.push_back (volume); } - else if (wxString (volume->Path) == pathFilter.GetFullPath()) + else if (wxString (wstring(volume->Path)) == pathFilter.GetFullPath()) { filteredVolumes.push_back (volume); } - else if (wxString (volume->MountPoint) == pathFilter.GetFullPath() - || (wxString (volume->MountPoint) + wxFileName::GetPathSeparator()) == pathFilter.GetFullPath()) + else if (wxString (wstring(volume->MountPoint)) == pathFilter.GetFullPath() + || (wxString (wstring(volume->MountPoint)) + wxFileName::GetPathSeparator()) == pathFilter.GetFullPath()) { filteredVolumes.push_back (volume); } |