Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

MacOSX: fix truncated algorithms description in the Encryption Options page of the volume creation wizard, which happened after moving to wxWidgets 3.1.2

Browse Source
This commit is contained in:
Mounir IDRASSI
2019-10-25 22:48:08 +02:00
parent 6bf37280d6
commit 0ca62a37d6
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Main/Forms/EncryptionOptionsWizardPage.cpp
View File

@@ -24,6 +24,9 @@ namespace VeraCrypt
: EncryptionOptionsWizardPageBase (parent) : EncryptionOptionsWizardPageBase (parent)
{ {
#ifdef TC_MACOSX
EncryptionAlgorithmStaticText->Connect( wxEVT_SIZE, wxSizeEventHandler( EncryptionOptionsWizardPage::HandleOnSize ), NULL, this );
#endif
EncryptionAlgorithms = EncryptionAlgorithm::GetAvailableAlgorithms(); EncryptionAlgorithms = EncryptionAlgorithm::GetAvailableAlgorithms();
foreach (shared_ptr <EncryptionAlgorithm> ea, EncryptionAlgorithms) 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 shared_ptr <EncryptionAlgorithm> EncryptionOptionsWizardPage::GetEncryptionAlgorithm () const
{ {
return Gui->GetSelectedData <EncryptionAlgorithm> (EncryptionAlgorithmChoice)->GetNew(); return Gui->GetSelectedData <EncryptionAlgorithm> (EncryptionAlgorithmChoice)->GetNew();

6
src/Main/Forms/EncryptionOptionsWizardPage.h
View File

@@ -22,6 +22,9 @@ namespace VeraCrypt
public: public:
EncryptionOptionsWizardPage (wxPanel* parent); EncryptionOptionsWizardPage (wxPanel* parent);
#ifdef TC_MACOSX
~EncryptionOptionsWizardPage ();
#endif
shared_ptr <EncryptionAlgorithm> GetEncryptionAlgorithm () const; shared_ptr <EncryptionAlgorithm> GetEncryptionAlgorithm () const;
shared_ptr <Hash> GetHash () const; shared_ptr <Hash> GetHash () const;
bool IsValid () { return true; } bool IsValid () { return true; }
@@ -37,6 +40,9 @@ namespace VeraCrypt
void OnHashHyperlinkClick (wxHyperlinkEvent& event); void OnHashHyperlinkClick (wxHyperlinkEvent& event);
void OnTestButtonClick (wxCommandEvent& event); void OnTestButtonClick (wxCommandEvent& event);
#ifdef TC_MACOSX
void HandleOnSize( wxSizeEvent& event );
#endif
EncryptionAlgorithmList EncryptionAlgorithms; EncryptionAlgorithmList EncryptionAlgorithms;
HashList Hashes; HashList Hashes;
}; };