From 084a8ee85c24fbc7077d6c789c97aacdb31b4e39 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sun, 8 Jun 2014 00:45:49 +0200 Subject: wxWidgets 3.0 compatibility modifications --- src/Main/Forms/MainFrame.cpp | 2 +- src/Main/Forms/SelectDirectoryWizardPage.cpp | 2 +- src/Main/Forms/SelectDirectoryWizardPage.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Main/Forms') diff --git a/src/Main/Forms/MainFrame.cpp b/src/Main/Forms/MainFrame.cpp index 6100a7ab..3443ea3b 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 a6a3ab02..1299e22b 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 52335fc5..2ea8b0dc 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); } -- cgit v1.2.3