1
0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 19:08:26 -06:00

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.
This commit is contained in:
Mounir IDRASSI
2015-02-27 15:33:41 +01:00
parent 31b238872e
commit 176bec1bb2
8 changed files with 14 additions and 14 deletions

View File

@@ -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: