From 176bec1bb2a6d1e1a6acf03747981238dc555784 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Fri, 27 Feb 2015 15:33:41 +0100 Subject: 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. --- src/Main/Forms/ChangePasswordDialog.cpp | 3 +-- src/Main/Forms/DeviceSelectionDialog.cpp | 2 -- src/Main/Forms/Forms.cpp | 6 ++++++ src/Main/Forms/KeyfilesDialog.cpp | 1 - src/Main/Forms/MountOptionsDialog.cpp | 1 - src/Main/Forms/PreferencesDialog.cpp | 2 +- src/Main/Forms/SecurityTokenKeyfilesDialog.cpp | 1 - src/Main/Forms/TrueCrypt.fbp | 12 ++++++------ 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Main/Forms/ChangePasswordDialog.cpp b/src/Main/Forms/ChangePasswordDialog.cpp index e8ab2847..d4a8853f 100644 --- a/src/Main/Forms/ChangePasswordDialog.cpp +++ b/src/Main/Forms/ChangePasswordDialog.cpp @@ -16,12 +16,11 @@ namespace VeraCrypt { ChangePasswordDialog::ChangePasswordDialog (wxWindow* parent, shared_ptr volumePath, Mode::Enum mode, shared_ptr password, shared_ptr keyfiles, shared_ptr newPassword, shared_ptr newKeyfiles) : ChangePasswordDialogBase (parent), DialogMode (mode), Path (volumePath) - { + { bool enableNewPassword = false; bool enableNewKeyfiles = false; bool enablePkcs5Prf = false; - SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY ); switch (mode) { case Mode::ChangePasswordAndKeyfiles: diff --git a/src/Main/Forms/DeviceSelectionDialog.cpp b/src/Main/Forms/DeviceSelectionDialog.cpp index 3a0d0fc8..4c5173c1 100644 --- a/src/Main/Forms/DeviceSelectionDialog.cpp +++ b/src/Main/Forms/DeviceSelectionDialog.cpp @@ -16,8 +16,6 @@ namespace VeraCrypt DeviceSelectionDialog::DeviceSelectionDialog (wxWindow* parent) : DeviceSelectionDialogBase (parent) { - SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY ); - wxBusyCursor busy; list colPermilles; 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 ); diff --git a/src/Main/Forms/KeyfilesDialog.cpp b/src/Main/Forms/KeyfilesDialog.cpp index 1dbf872c..2bcdf2f9 100644 --- a/src/Main/Forms/KeyfilesDialog.cpp +++ b/src/Main/Forms/KeyfilesDialog.cpp @@ -15,7 +15,6 @@ namespace VeraCrypt KeyfilesDialog::KeyfilesDialog (wxWindow* parent, shared_ptr keyfiles) : KeyfilesDialogBase (parent), Keyfiles (keyfiles) { - SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY ); mKeyfilesPanel = new KeyfilesPanel (this, keyfiles); PanelSizer->Add (mKeyfilesPanel, 1, wxALL | wxEXPAND); diff --git a/src/Main/Forms/MountOptionsDialog.cpp b/src/Main/Forms/MountOptionsDialog.cpp index cc32d46e..e60492e1 100644 --- a/src/Main/Forms/MountOptionsDialog.cpp +++ b/src/Main/Forms/MountOptionsDialog.cpp @@ -20,7 +20,6 @@ namespace VeraCrypt #endif ), Options (options) { - SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY ); if (!title.empty()) this->SetTitle (title); else if (options.Path && !options.Path->IsEmpty()) diff --git a/src/Main/Forms/PreferencesDialog.cpp b/src/Main/Forms/PreferencesDialog.cpp index 0c65c5c4..e22e304b 100644 --- a/src/Main/Forms/PreferencesDialog.cpp +++ b/src/Main/Forms/PreferencesDialog.cpp @@ -27,7 +27,7 @@ namespace VeraCrypt RestoreValidatorBell (false) { #define TC_CHECK_BOX_VALIDATOR(NAME) (TC_JOIN(NAME,CheckBox))->SetValidator (wxGenericValidator (&Preferences.NAME)); - SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY ); + #ifdef TC_MACOSX PreferencesNotebook->SetMinSize (wxSize (Gui->GetCharWidth (PreferencesNotebook) * 108, -1)); #endif diff --git a/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp b/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp index 29dfa60a..a0930726 100644 --- a/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp +++ b/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp @@ -17,7 +17,6 @@ namespace VeraCrypt SecurityTokenKeyfilesDialog::SecurityTokenKeyfilesDialog (wxWindow* parent, bool selectionMode) : SecurityTokenKeyfilesDialogBase (parent) { - SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY ); if (selectionMode) SetTitle (LangString["SELECT_TOKEN_KEYFILES"]); diff --git a/src/Main/Forms/TrueCrypt.fbp b/src/Main/Forms/TrueCrypt.fbp index 3ae5ea60..c03beab9 100644 --- a/src/Main/Forms/TrueCrypt.fbp +++ b/src/Main/Forms/TrueCrypt.fbp @@ -4972,7 +4972,7 @@ - + wxWS_EX_VALIDATE_RECURSIVELY @@ -5300,7 +5300,7 @@ Select a Partition or Device - + wxWS_EX_VALIDATE_RECURSIVELY @@ -8117,7 +8117,7 @@ Select Keyfiles - + wxWS_EX_VALIDATE_RECURSIVELY @@ -10851,7 +10851,7 @@ Enter VeraCrypt Volume Password - + wxWS_EX_VALIDATE_RECURSIVELY @@ -12987,7 +12987,7 @@ Preferences - + wxWS_EX_VALIDATE_RECURSIVELY @@ -18975,7 +18975,7 @@ Security Token Keyfiles - + wxWS_EX_VALIDATE_RECURSIVELY -- cgit v1.2.3