diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-02-27 15:47:17 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-02-27 18:07:36 +0100 |
| commit | 6e73a8a393e2cee5fb76d201d89dda542b6c4a97 (patch) | |
| tree | 82d27ffbf0423cdd126bf8cb8f215e8cf4b7079d /src | |
| parent | 176bec1bb2a6d1e1a6acf03747981238dc555784 (diff) | |
| download | VeraCrypt-6e73a8a393e2cee5fb76d201d89dda542b6c4a97.tar.gz VeraCrypt-6e73a8a393e2cee5fb76d201d89dda542b6c4a97.zip | |
Linux/MacOSX: Modify wxFormBuilder generated files directly to solve the 'X' icon not closing some dialog because we can't workaround wxFormBuilder bug without introducing other issues (the correct SetExtraStyle call must be present at the beginning of the constructor, so it must be present in the generated files). Each time we generated new sources, Forms.cpp must be manually modify it to keep this correction.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Main/Forms/Forms.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp index 5e28afdb..c652929b 100644 --- a/src/Main/Forms/Forms.cpp +++ b/src/Main/Forms/Forms.cpp @@ -840,7 +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 );
+ this->SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
wxBoxSizer* bSizer30;
bSizer30 = new wxBoxSizer( wxVERTICAL );
@@ -909,7 +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 );
+ this->SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
wxBoxSizer* bSizer3;
bSizer3 = new wxBoxSizer( wxVERTICAL );
@@ -1216,7 +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 );
+ this->SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
wxBoxSizer* bSizer26;
bSizer26 = new wxBoxSizer( wxVERTICAL );
@@ -1499,7 +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 );
+ this->SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
wxBoxSizer* bSizer5;
bSizer5 = new wxBoxSizer( wxVERTICAL );
@@ -1757,7 +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 );
+ this->SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
wxBoxSizer* bSizer32;
bSizer32 = new wxBoxSizer( wxVERTICAL );
@@ -2357,7 +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 );
+ this->SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
wxBoxSizer* bSizer3;
bSizer3 = new wxBoxSizer( wxVERTICAL );
|