Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

wxWidgets 3.0 compatibility modifications

Browse Source
This commit is contained in:
Mounir IDRASSI
2014-06-08 00:45:49 +02:00
parent c386beb69c
commit 084a8ee85c
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Main/CommandLineInterface.cpp
View File

@@ -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);
}