truecrypt/trunk/wxwidgets31.patch

   1 From 2c6e9fc15c6467d559cc5e212bd63b02f82640bb Mon Sep 17 00:00:00 2001
   2 From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
   3 Date: Sun, 26 Oct 2014 17:28:59 +0100
   4 Subject: [PATCH] Replace deprecated wxTextValidator::SetBellOnError whose
   5  logic whose inverted by the new wxTextValidator::SuppressBellOnError. Since
   6  its used in constructor only for TC_WINDOWS, we do the same in the
   7  destructor.
   8
   9 ---
  10  src/Main/Forms/PreferencesDialog.cpp | 6 ++++--
  11  1 file changed, 4 insertions(+), 2 deletions(-)
  12
  13 diff --git a/src/Main/Forms/PreferencesDialog.cpp b/src/Main/Forms/PreferencesDialog.cpp
  14 index 50c9c300c..e22e304b6 100644
  15 --- a/src/Main/Forms/PreferencesDialog.cpp
  16 +++ b/src/Main/Forms/PreferencesDialog.cpp
  17 @@ -154,7 +154,7 @@ namespace VeraCrypt
  18                 Gui->SetListCtrlColumnWidths (HotkeyListCtrl, colPermilles);
  19
  20                 RestoreValidatorBell = !wxTextValidator::IsSilent();
  21 -               wxTextValidator::SetBellOnError (true);
  22 +               wxTextValidator::SuppressBellOnError (true);
  23                 HotkeyTextCtrl->SetValidator (wxTextValidator (wxFILTER_INCLUDE_CHAR_LIST));
  24
  25                 UpdateHotkeyButtons();
  26 @@ -203,8 +203,10 @@ namespace VeraCrypt
  27
  28         PreferencesDialog::~PreferencesDialog ()
  29         {
  30 +#ifdef TC_WINDOWS
  31                 if (RestoreValidatorBell)
  32 -                       wxTextValidator::SetBellOnError (false);
  33 +                       wxTextValidator::SuppressBellOnError (false);
  34 +#endif
  35         }
  36
  37         void PreferencesDialog::SelectPage (wxPanel *page)