Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-12 19:38:26 -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

2
src/Main/Forms/MainFrame.cpp
View File

@@ -828,7 +828,7 @@ namespace TrueCrypt
// File-hosted volumes
if (!volume->Path.IsDevice() && !mountPoint.IsEmpty())
{
if (wxString (volume->Path).Upper().StartsWith (wstring (mountPoint).c_str()))
if (wxString (wstring(volume->Path)).Upper().StartsWith (wstring (mountPoint).c_str()))
{
removedVolumes.push_back (volume);
continue;

2
src/Main/Forms/SelectDirectoryWizardPage.cpp
View File

@@ -16,7 +16,7 @@ namespace TrueCrypt
{
if (!DirectoryTextCtrl->IsEmpty())
{
return FilesystemPath (DirectoryTextCtrl->GetValue()).IsDirectory();
return FilesystemPath (DirectoryTextCtrl->GetValue().wc_str()).IsDirectory();
}
return false;

2
src/Main/Forms/SelectDirectoryWizardPage.h
View File

@@ -18,7 +18,7 @@ namespace TrueCrypt
public:
SelectDirectoryWizardPage (wxPanel* parent) : SelectDirectoryWizardPageBase (parent) { }
DirectoryPath GetDirectory () const { return DirectoryPath (DirectoryTextCtrl->GetValue()); }
DirectoryPath GetDirectory () const { return DirectoryPath (DirectoryTextCtrl->GetValue().wc_str()); }
bool IsValid ();
void SetDirectory (const DirectoryPath &path) { DirectoryTextCtrl->SetValue (wstring (path)); }
void SetMaxStaticTextWidth (int width) { InfoStaticText->Wrap (width); }