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/MountOptionsDialog.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

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

diff --git a/src/Main/Forms/MountOptionsDialog.cpp b/src/Main/Forms/MountOptionsDialog.cpp
index 9a9f2691..c33cf9fe 100644
--- a/src/Main/Forms/MountOptionsDialog.cpp
+++ b/src/Main/Forms/MountOptionsDialog.cpp
@@ -17,6 +17,17 @@
 
 namespace VeraCrypt
 {
+#ifdef TC_MACOSX
+
+	bool MountOptionsDialog::ProcessEvent(wxEvent& event)
+	{
+		if(GraphicUserInterface::HandlePasswordEntryCustomEvent (event))
+			return true;
+		else
+			return MountOptionsDialogBase::ProcessEvent(event);
+	}
+#endif
+
 	MountOptionsDialog::MountOptionsDialog (wxWindow *parent, MountOptions &options, const wxString &title, bool disableMountOptions)
 		: MountOptionsDialogBase (parent, wxID_ANY, wxString()
 #ifdef __WXGTK__ // GTK apparently needs wxRESIZE_BORDER to support dynamic resizing
@@ -33,6 +44,11 @@ namespace VeraCrypt
 
 		if (disableMountOptions)
 			OptionsButton->Show (false);
+			
+
+#ifdef TC_MACOSX
+		GraphicUserInterface::InstallPasswordEntryCustomKeyboardShortcuts (this);
+#endif
 
 		PasswordPanel = new VolumePasswordPanel (this, &options, options.Password, disableMountOptions, options.Keyfiles, !disableMountOptions, true, true, false, true, true);
 		PasswordPanel->SetCacheCheckBoxValidator (wxGenericValidator (&Options.CachePassword));
-- 
cgit v1.2.3