VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main/Forms
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2014-06-07 22:45:49 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2014-11-08 22:19:29 (GMT)
commit084a8ee85c24fbc7077d6c789c97aacdb31b4e39 (patch)
tree7022ec0ced1d57ca287202a772a28787e1bb2408 /src/Main/Forms
parentc386beb69c2bb2475316c085f66a91ac0d9bdc73 (diff)
downloadVeraCrypt-084a8ee85c24fbc7077d6c789c97aacdb31b4e39.zip
VeraCrypt-084a8ee85c24fbc7077d6c789c97aacdb31b4e39.tar.gz
wxWidgets 3.0 compatibility modifications
Diffstat (limited to 'src/Main/Forms')
-rw-r--r--src/Main/Forms/MainFrame.cpp2
-rw-r--r--src/Main/Forms/SelectDirectoryWizardPage.cpp2
-rw-r--r--src/Main/Forms/SelectDirectoryWizardPage.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Main/Forms/MainFrame.cpp b/src/Main/Forms/MainFrame.cpp
index 6100a7a..3443ea3 100644
--- a/src/Main/Forms/MainFrame.cpp
+++ b/src/Main/Forms/MainFrame.cpp
@@ -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;
diff --git a/src/Main/Forms/SelectDirectoryWizardPage.cpp b/src/Main/Forms/SelectDirectoryWizardPage.cpp
index a6a3ab0..1299e22 100644
--- a/src/Main/Forms/SelectDirectoryWizardPage.cpp
+++ b/src/Main/Forms/SelectDirectoryWizardPage.cpp
@@ -16,7 +16,7 @@ namespace TrueCrypt
{
if (!DirectoryTextCtrl->IsEmpty())
{
- return FilesystemPath (DirectoryTextCtrl->GetValue()).IsDirectory();
+ return FilesystemPath (DirectoryTextCtrl->GetValue().wc_str()).IsDirectory();
}
return false;
diff --git a/src/Main/Forms/SelectDirectoryWizardPage.h b/src/Main/Forms/SelectDirectoryWizardPage.h
index 52335fc..2ea8b0d 100644
--- a/src/Main/Forms/SelectDirectoryWizardPage.h
+++ b/src/Main/Forms/SelectDirectoryWizardPage.h
@@ -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); }