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 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/Main/Forms/ChangePasswordDialog.cpp') 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: -- cgit v1.2.3