VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2014-06-08 00:45:49 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2014-11-08 23:19:29 +0100
commit084a8ee85c24fbc7077d6c789c97aacdb31b4e39 (patch)
tree7022ec0ced1d57ca287202a772a28787e1bb2408 /src/Main
parentc386beb69c2bb2475316c085f66a91ac0d9bdc73 (diff)
downloadVeraCrypt-084a8ee85c24fbc7077d6c789c97aacdb31b4e39.tar.gz
VeraCrypt-084a8ee85c24fbc7077d6c789c97aacdb31b4e39.zip
wxWidgets 3.0 compatibility modifications
Diffstat (limited to 'src/Main')
-rw-r--r--src/Main/Application.cpp6
-rw-r--r--src/Main/CommandLineInterface.cpp12
-rw-r--r--src/Main/Forms/MainFrame.cpp2
-rw-r--r--src/Main/Forms/SelectDirectoryWizardPage.cpp2
-rw-r--r--src/Main/Forms/SelectDirectoryWizardPage.h2
-rw-r--r--src/Main/GraphicUserInterface.cpp6
-rw-r--r--src/Main/TextUserInterface.cpp2
-rw-r--r--src/Main/UserPreferences.cpp2
8 files changed, 17 insertions, 17 deletions
diff --git a/src/Main/Application.cpp b/src/Main/Application.cpp
index 8c6dea18..2d491696 100644
--- a/src/Main/Application.cpp
+++ b/src/Main/Application.cpp
@@ -36,7 +36,7 @@ namespace TrueCrypt
FilePath Application::GetConfigFilePath (const wxString &configFileName, bool createConfigDir)
{
- wxStandardPaths stdPaths;
+ wxStandardPaths& stdPaths = wxStandardPaths::Get();
DirectoryPath configDir;
if (!Core->IsInPortableMode())
@@ -61,12 +61,12 @@ namespace TrueCrypt
DirectoryPath Application::GetExecutableDirectory ()
{
- return wstring (wxFileName (wxStandardPaths().GetExecutablePath()).GetPath());
+ return wstring (wxFileName (wxStandardPaths::Get().GetExecutablePath()).GetPath());
}
FilePath Application::GetExecutablePath ()
{
- return wstring (wxStandardPaths().GetExecutablePath());
+ return wstring (wxStandardPaths::Get().GetExecutablePath());
}
void Application::Initialize (UserInterfaceType::Enum type)
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);
}
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); }
diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp
index 41eb7808..64e9e4be 100644
--- a/src/Main/GraphicUserInterface.cpp
+++ b/src/Main/GraphicUserInterface.cpp
@@ -1384,7 +1384,7 @@ namespace TrueCrypt
#else
L"",
#endif
- L"", wxDD_DEFAULT_STYLE | (existingOnly ? wxDD_DIR_MUST_EXIST : 0), wxDefaultPosition, parent));
+ L"", wxDD_DEFAULT_STYLE | (existingOnly ? wxDD_DIR_MUST_EXIST : 0), wxDefaultPosition, parent).wc_str());
}
FilePathList GraphicUserInterface::SelectFiles (wxWindow *parent, const wxString &caption, bool saveMode, bool allowMultiple, const list < pair <wstring, wstring> > &fileExtensions, const DirectoryPath &directory) const
@@ -1428,14 +1428,14 @@ namespace TrueCrypt
if (dialog.ShowModal() == wxID_OK)
{
if (!allowMultiple)
- files.push_back (make_shared <FilePath> (dialog.GetPath()));
+ files.push_back (make_shared <FilePath> (dialog.GetPath().wc_str()));
else
{
wxArrayString paths;
dialog.GetPaths (paths);
foreach (const wxString &path, paths)
- files.push_back (make_shared <FilePath> (path));
+ files.push_back (make_shared <FilePath> (path.wc_str()));
}
}
diff --git a/src/Main/TextUserInterface.cpp b/src/Main/TextUserInterface.cpp
index d9e93e6f..c7af0990 100644
--- a/src/Main/TextUserInterface.cpp
+++ b/src/Main/TextUserInterface.cpp
@@ -116,7 +116,7 @@ namespace TrueCrypt
for (size_t i = 0; i < length && i < VolumePassword::MaxSize; ++i)
{
passwordBuf[i] = (wchar_t) passwordStr[i];
- const_cast <wchar_t *> (passwordStr.c_str())[i] = L'X';
+ const_cast <wchar_t *> (passwordStr.wc_str())[i] = L'X';
}
if (verify && verPhase)
diff --git a/src/Main/UserPreferences.cpp b/src/Main/UserPreferences.cpp
index e0e82336..6608f795 100644
--- a/src/Main/UserPreferences.cpp
+++ b/src/Main/UserPreferences.cpp
@@ -219,7 +219,7 @@ namespace TrueCrypt
foreach_ref (const Keyfile &keyfile, DefaultKeyfiles)
{
- keyfilesXml.InnerNodes.push_back (XmlNode (L"keyfile", wxString (FilesystemPath (keyfile))));
+ keyfilesXml.InnerNodes.push_back (XmlNode (L"keyfile", wxString (wstring(FilesystemPath (keyfile)))));
}
XmlWriter keyfileWriter (keyfilesCfgPath);