diff options
Diffstat (limited to 'src/Main/Forms/VolumeCreationWizard.h')
| -rw-r--r-- | src/Main/Forms/VolumeCreationWizard.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/Main/Forms/VolumeCreationWizard.h b/src/Main/Forms/VolumeCreationWizard.h index 8e6e15d4..fd4b3e06 100644 --- a/src/Main/Forms/VolumeCreationWizard.h +++ b/src/Main/Forms/VolumeCreationWizard.h @@ -3,9 +3,9 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. Modifications and additions to the original source code (contained in this file) - and all other portions of this file are Copyright (c) 2013-2016 IDRIX + and all other portions of this file are Copyright (c) 2013-2017 IDRIX and are governed by the Apache License 2.0 the full text of which is contained in the file License.txt included in VeraCrypt binary and source code distribution packages. */ @@ -23,8 +23,12 @@ namespace VeraCrypt public: VolumeCreationWizard (wxWindow* parent); ~VolumeCreationWizard (); +#ifdef TC_MACOSX + virtual bool ProcessEvent(wxEvent& event); +#endif + protected: struct Step { enum Enum @@ -62,10 +66,10 @@ namespace VeraCrypt shared_ptr <VolumeCreator> Creator; bool CrossPlatformSupport; static bool DeviceWarningConfirmed; bool DisplayKeyInfo; - auto_ptr <wxTimer> ProgressTimer; - auto_ptr <wxTimer> RandomPoolUpdateTimer; + unique_ptr <wxTimer> ProgressTimer; + unique_ptr <wxTimer> RandomPoolUpdateTimer; shared_ptr <KeyfileList> Keyfiles; bool LargeFilesSupport; uint64 MaxHiddenVolumeSize; shared_ptr <VolumeInfo> MountedOuterVolume; @@ -77,9 +81,11 @@ namespace VeraCrypt VolumePath SelectedVolumePath; VolumeHostType::Enum SelectedVolumeHostType; VolumeType::Enum SelectedVolumeType; shared_ptr <VolumePassword> Password; + shared_ptr <VolumePassword> OuterPassword; int Pim; + int OuterPim; shared_ptr <Pkcs5Kdf> Kdf; uint32 SectorSize; shared_ptr <Hash> SelectedHash; uint64 VolumeSize; |