From 86529dadde9af8407711d55d0096330429f79742 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
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/ChangePasswordDialog.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/Main/Forms/ChangePasswordDialog.cpp')

diff --git a/src/Main/Forms/ChangePasswordDialog.cpp b/src/Main/Forms/ChangePasswordDialog.cpp
index d4a8853f..e8ab2847 100644
--- a/src/Main/Forms/ChangePasswordDialog.cpp
+++ b/src/Main/Forms/ChangePasswordDialog.cpp
@@ -16,11 +16,12 @@ 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:
-- 
cgit v1.2.3