mirror of
https://github.com/veracrypt/VeraCrypt
synced 2024-11-28 05:53:29 +01:00
MacOSX: fix truncated algorithms description in the Encryption Options page of the volume creation wizard, which happened after moving to wxWidgets 3.1.2
This commit is contained in:
parent
6bf37280d6
commit
0ca62a37d6
@ -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();
|
||||
|
@ -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;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user