diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-02-27 15:33:41 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-02-27 18:07:33 +0100 |
| commit | 176bec1bb2a6d1e1a6acf03747981238dc555784 (patch) | |
| tree | 47e6ed9a88b0e1758eac68b1e6c45ac07cbde6c5 /src/Main/Forms/Forms.cpp | |
| parent | 31b238872ecc0b092ba6dd32116867635b3d1bf4 (diff) | |
| download | VeraCrypt-176bec1bb2a6d1e1a6acf03747981238dc555784.tar.gz VeraCrypt-176bec1bb2a6d1e1a6acf03747981238dc555784.zip | |
Revert "Linux/MacOSX: solve the 'X' icon not closing some dialog. This was caused by a bug of wxFormBuilder that calls SetExtraStyle without taking care of the previous value."
This reverts commit 400fd599f812b057b0674f2ae0e0141e7c35a332.
Diffstat (limited to 'src/Main/Forms/Forms.cpp')
| -rw-r--r-- | src/Main/Forms/Forms.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp index 2c610b2b..5e28afdb 100644 --- a/src/Main/Forms/Forms.cpp +++ b/src/Main/Forms/Forms.cpp @@ -840,6 +840,7 @@ BenchmarkDialogBase::~BenchmarkDialogBase() ChangePasswordDialogBase::ChangePasswordDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+ this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
wxBoxSizer* bSizer30;
bSizer30 = new wxBoxSizer( wxVERTICAL );
@@ -908,6 +909,7 @@ ChangePasswordDialogBase::~ChangePasswordDialogBase() DeviceSelectionDialogBase::DeviceSelectionDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+ this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
wxBoxSizer* bSizer3;
bSizer3 = new wxBoxSizer( wxVERTICAL );
@@ -1214,6 +1216,7 @@ FavoriteVolumesDialogBase::~FavoriteVolumesDialogBase() KeyfilesDialogBase::KeyfilesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+ this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
wxBoxSizer* bSizer26;
bSizer26 = new wxBoxSizer( wxVERTICAL );
@@ -1496,6 +1499,7 @@ LegalNoticesDialogBase::~LegalNoticesDialogBase() MountOptionsDialogBase::MountOptionsDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+ this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
wxBoxSizer* bSizer5;
bSizer5 = new wxBoxSizer( wxVERTICAL );
@@ -1753,6 +1757,7 @@ NewSecurityTokenKeyfileDialogBase::~NewSecurityTokenKeyfileDialogBase() PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+ this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
wxBoxSizer* bSizer32;
bSizer32 = new wxBoxSizer( wxVERTICAL );
@@ -2352,6 +2357,7 @@ RandomPoolEnrichmentDialogBase::~RandomPoolEnrichmentDialogBase() SecurityTokenKeyfilesDialogBase::SecurityTokenKeyfilesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+ this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
wxBoxSizer* bSizer3;
bSizer3 = new wxBoxSizer( wxVERTICAL );
|