diff options
Diffstat (limited to 'src/Main')
| -rw-r--r-- | src/Main/GraphicUserInterface.cpp | 16 | ||||
| -rw-r--r-- | src/Main/GraphicUserInterface.h | 3 |
2 files changed, 15 insertions, 4 deletions
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 diff --git a/src/Main/GraphicUserInterface.h b/src/Main/GraphicUserInterface.h index f2ae5e69..7edea984 100644 --- a/src/Main/GraphicUserInterface.h +++ b/src/Main/GraphicUserInterface.h @@ -94,7 +94,8 @@ namespace VeraCrypt void ExecuteWaitThreadRoutine (wxWindow *parent, WaitThreadRoutine *pRoutine) const; #ifdef TC_MACOSX - virtual void MacOpenFile (const wxString &fileName); + virtual void MacOpenFiles (const wxArrayString &fileNames); + virtual void MacReopenApp (); #endif template <class T> |