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/ChangePasswordDialog.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/ChangePasswordDialog.cpp')
-rw-r--r-- | src/Main/Forms/ChangePasswordDialog.cpp | 3 |
1 files changed, 1 insertions, 2 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> volumePath, Mode::Enum mode, shared_ptr <VolumePassword> password, shared_ptr <KeyfileList> keyfiles, shared_ptr <VolumePassword> newPassword, shared_ptr <KeyfileList> 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: |