VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2015-02-14 23:42:15 +0100
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2015-02-16 00:19:24 +0100
commit86529dadde9af8407711d55d0096330429f79742 (patch)
treefb3fa9c303324dac4cb4ed9195abb15435b7915d
parent544c55debc4d1a99588de099ae2eede3d8f24585 (diff)
downloadVeraCrypt-86529dadde9af8407711d55d0096330429f79742.tar.gz
VeraCrypt-86529dadde9af8407711d55d0096330429f79742.zip
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.
Diffstat
-rw-r--r--src/Main/Forms/ChangePasswordDialog.cpp3
-rw-r--r--src/Main/Forms/DeviceSelectionDialog.cpp2
-rw-r--r--src/Main/Forms/Forms.cpp6
-rw-r--r--src/Main/Forms/KeyfilesDialog.cpp1
-rw-r--r--src/Main/Forms/MountOptionsDialog.cpp1
-rw-r--r--src/Main/Forms/PreferencesDialog.cpp2
-rw-r--r--src/Main/Forms/SecurityTokenKeyfilesDialog.cpp1
-rw-r--r--src/Main/Forms/TrueCrypt.fbp12
8 files changed, 14 insertions, 14 deletions
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:
diff --git a/src/Main/Forms/DeviceSelectionDialog.cpp b/src/Main/Forms/DeviceSelectionDialog.cpp
index 4c5173c1..3a0d0fc8 100644
--- a/src/Main/Forms/DeviceSelectionDialog.cpp
+++ b/src/Main/Forms/DeviceSelectionDialog.cpp
@@ -16,6 +16,8 @@ namespace VeraCrypt
DeviceSelectionDialog::DeviceSelectionDialog (wxWindow* parent)
: DeviceSelectionDialogBase (parent)
{
+ SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
+
wxBusyCursor busy;
list <int> colPermilles;
diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp
index 5e28afdb..2c610b2b 100644
--- a/src/Main/Forms/Forms.cpp
+++ b/src/Main/Forms/Forms.cpp
@@ -840,7 +840,6 @@ 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 );
@@ -909,7 +908,6 @@ 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 );
@@ -1216,7 +1214,6 @@ 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 );
@@ -1499,7 +1496,6 @@ 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 );
@@ -1757,7 +1753,6 @@ 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 );
@@ -2357,7 +2352,6 @@ 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 2bcdf2f9..1dbf872c 100644
--- a/src/Main/Forms/KeyfilesDialog.cpp
+++ b/src/Main/Forms/KeyfilesDialog.cpp
@@ -15,6 +15,7 @@ namespace VeraCrypt
KeyfilesDialog::KeyfilesDialog (wxWindow* parent, shared_ptr <KeyfileList> 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 e60492e1..cc32d46e 100644
--- a/src/Main/Forms/MountOptionsDialog.cpp
+++ b/src/Main/Forms/MountOptionsDialog.cpp
@@ -20,6 +20,7 @@ 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 e22e304b..0c65c5c4 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 a0930726..29dfa60a 100644
--- a/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp
+++ b/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp
@@ -17,6 +17,7 @@ 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 c03beab9..3ae5ea60 100644
--- a/src/Main/Forms/TrueCrypt.fbp
+++ b/src/Main/Forms/TrueCrypt.fbp
@@ -4972,7 +4972,7 @@
<property name="subclass"></property>
<property name="title"></property>
<property name="tooltip"></property>
- <property name="window_extra_style">wxWS_EX_VALIDATE_RECURSIVELY</property>
+ <property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnActivate"></event>
@@ -5300,7 +5300,7 @@
<property name="subclass"></property>
<property name="title">Select a Partition or Device</property>
<property name="tooltip"></property>
- <property name="window_extra_style">wxWS_EX_VALIDATE_RECURSIVELY</property>
+ <property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnActivate"></event>
@@ -8117,7 +8117,7 @@
<property name="subclass"></property>
<property name="title">Select Keyfiles</property>
<property name="tooltip"></property>
- <property name="window_extra_style">wxWS_EX_VALIDATE_RECURSIVELY</property>
+ <property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnActivate"></event>
@@ -10851,7 +10851,7 @@
<property name="subclass"></property>
<property name="title">Enter VeraCrypt Volume Password</property>
<property name="tooltip"></property>
- <property name="window_extra_style">wxWS_EX_VALIDATE_RECURSIVELY</property>
+ <property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnActivate"></event>
@@ -12987,7 +12987,7 @@
<property name="subclass"></property>
<property name="title">Preferences</property>
<property name="tooltip"></property>
- <property name="window_extra_style">wxWS_EX_VALIDATE_RECURSIVELY</property>
+ <property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnActivate"></event>
@@ -18975,7 +18975,7 @@
<property name="subclass"></property>
<property name="title">Security Token Keyfiles</property>
<property name="tooltip"></property>
- <property name="window_extra_style">wxWS_EX_VALIDATE_RECURSIVELY</property>
+ <property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnActivate"></event>