From 4a8040735b800ec016c1a7e24292e24579dbabd8 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Mon, 6 Apr 2015 18:58:47 +0200 Subject: MacOSX: Correctly handle OSX dock "reopen-application" event and Cocoa openFiles message instead of the deprecated Carbon "open-document" event --- src/Main/GraphicUserInterface.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'src/Main/GraphicUserInterface.cpp') diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp index c29eef22..3b4da416 100644 --- a/src/Main/GraphicUserInterface.cpp +++ b/src/Main/GraphicUserInterface.cpp @@ -622,10 +622,20 @@ namespace VeraCrypt } #ifdef TC_MACOSX - void GraphicUserInterface::MacOpenFile (const wxString &fileName) + void GraphicUserInterface::MacOpenFiles (const wxArrayString &fileNames) { - OpenVolumeSystemRequestEventArgs eventArgs (fileName); - OpenVolumeSystemRequestEvent.Raise (eventArgs); + if (fileNames.GetCount() > 0) + { + // we can only put one volume path at a time on the text field + // so we take the first on the list + OpenVolumeSystemRequestEventArgs eventArgs (fileNames[0]); + OpenVolumeSystemRequestEvent.Raise (eventArgs); + } + } + + void GraphicUserInterface::MacReopenApp () + { + SetBackgroundMode (false); } #endif -- cgit v1.2.3