diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2019-10-25 22:48:08 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2019-10-26 00:17:16 +0200 |
| commit | 0ca62a37d66c52042fc8565bd2538d7f19f92e66 (patch) | |
| tree | 8656478cf53a567f642750c36720c5e6f1e109e3 /src/Main | |
| parent | 6bf37280d621d3c8fae85cf4e0533df0bc8334ca (diff) | |
| download | VeraCrypt-0ca62a37d66c52042fc8565bd2538d7f19f92e66.tar.gz VeraCrypt-0ca62a37d66c52042fc8565bd2538d7f19f92e66.zip | |
MacOSX: fix truncated algorithms description in the Encryption Options page of the volume creation wizard, which happened after moving to wxWidgets 3.1.2
Diffstat (limited to 'src/Main')
| -rw-r--r-- | src/Main/Forms/EncryptionOptionsWizardPage.cpp | 18 | ||||
| -rw-r--r-- | src/Main/Forms/EncryptionOptionsWizardPage.h | 6 |
2 files changed, 24 insertions, 0 deletions
diff --git a/src/Main/Forms/EncryptionOptionsWizardPage.cpp b/src/Main/Forms/EncryptionOptionsWizardPage.cpp index e20a6593..0d899fb5 100644 --- a/src/Main/Forms/EncryptionOptionsWizardPage.cpp +++ b/src/Main/Forms/EncryptionOptionsWizardPage.cpp @@ -24,6 +24,9 @@ namespace VeraCrypt : EncryptionOptionsWizardPageBase (parent) { +#ifdef TC_MACOSX + EncryptionAlgorithmStaticText->Connect( wxEVT_SIZE, wxSizeEventHandler( EncryptionOptionsWizardPage::HandleOnSize ), NULL, this ); +#endif EncryptionAlgorithms = EncryptionAlgorithm::GetAvailableAlgorithms(); foreach (shared_ptr <EncryptionAlgorithm> ea, EncryptionAlgorithms) { @@ -45,6 +48,21 @@ namespace VeraCrypt } +#ifdef TC_MACOSX + EncryptionOptionsWizardPage::~EncryptionOptionsWizardPage() + { + EncryptionAlgorithmStaticText->Disconnect( wxEVT_SIZE, wxSizeEventHandler( EncryptionOptionsWizardPage::HandleOnSize ), NULL, this ); + } + + void EncryptionOptionsWizardPage::HandleOnSize( wxSizeEvent& event ) + { + int width, height; + EncryptionAlgorithmStaticText->GetClientSize (&width, &height); + EncryptionAlgorithmStaticText->Wrap (width); + event.Skip(); + } +#endif + shared_ptr <EncryptionAlgorithm> EncryptionOptionsWizardPage::GetEncryptionAlgorithm () const { return Gui->GetSelectedData <EncryptionAlgorithm> (EncryptionAlgorithmChoice)->GetNew(); diff --git a/src/Main/Forms/EncryptionOptionsWizardPage.h b/src/Main/Forms/EncryptionOptionsWizardPage.h index b8d42d7e..fbc63f9e 100644 --- a/src/Main/Forms/EncryptionOptionsWizardPage.h +++ b/src/Main/Forms/EncryptionOptionsWizardPage.h @@ -22,6 +22,9 @@ namespace VeraCrypt public: EncryptionOptionsWizardPage (wxPanel* parent); +#ifdef TC_MACOSX + ~EncryptionOptionsWizardPage (); +#endif shared_ptr <EncryptionAlgorithm> GetEncryptionAlgorithm () const; shared_ptr <Hash> GetHash () const; bool IsValid () { return true; } @@ -37,6 +40,9 @@ namespace VeraCrypt void OnHashHyperlinkClick (wxHyperlinkEvent& event); void OnTestButtonClick (wxCommandEvent& event); +#ifdef TC_MACOSX + void HandleOnSize( wxSizeEvent& event ); +#endif EncryptionAlgorithmList EncryptionAlgorithms; HashList Hashes; }; |