From e39f5fa5d6b1b09df16271cabb1dda5d42c0b980 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sun, 29 Apr 2018 17:33:33 +0200
Subject: MacOSX: support pasting values to password fields using keyboard
 (CMD+V and CMD+A now working properly). This make using password managers
 with VeraCrypt easier.

---
 src/Main/Forms/ChangePasswordDialog.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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

diff --git a/src/Main/Forms/ChangePasswordDialog.cpp b/src/Main/Forms/ChangePasswordDialog.cpp
index 2f8e1e47..819d9bf2 100644
--- a/src/Main/Forms/ChangePasswordDialog.cpp
+++ b/src/Main/Forms/ChangePasswordDialog.cpp
@@ -18,6 +18,17 @@
 
 namespace VeraCrypt
 {
+#ifdef TC_MACOSX
+
+	bool ChangePasswordDialog::ProcessEvent(wxEvent& event)
+	{
+		if(GraphicUserInterface::HandlePasswordEntryCustomEvent (event))
+			return true;
+		else
+			return ChangePasswordDialogBase::ProcessEvent(event);
+	}
+#endif
+
 	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)
 	{
@@ -57,6 +68,10 @@ namespace VeraCrypt
 		default:
 			throw ParameterIncorrect (SRC_POS);
 		}
+		
+#ifdef TC_MACOSX
+		GraphicUserInterface::InstallPasswordEntryCustomKeyboardShortcuts (this);
+#endif
 
 		CurrentPasswordPanel = new VolumePasswordPanel (this, NULL, password, false, keyfiles, false, true, true, false, true, true);
 		CurrentPasswordPanel->UpdateEvent.Connect (EventConnector <ChangePasswordDialog> (this, &ChangePasswordDialog::OnPasswordPanelUpdate));
-- 
cgit v1.2.3