From 86529dadde9af8407711d55d0096330429f79742 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sat, 14 Feb 2015 23:42:15 +0100 Subject: 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. --- src/Main/Forms/Forms.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/Main/Forms/Forms.cpp') diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp index 5e28afdb..2c610b2b 100644 --- a/src/Main/Forms/Forms.cpp +++ b/src/Main/Forms/Forms.cpp @@ -840,7 +840,6 @@ 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 ); @@ -909,7 +908,6 @@ 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 ); @@ -1216,7 +1214,6 @@ 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 ); @@ -1499,7 +1496,6 @@ 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 ); @@ -1757,7 +1753,6 @@ 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 ); @@ -2357,7 +2352,6 @@ 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 ); -- cgit v1.2.3