VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2015-04-06 18:58:47 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2015-04-06 19:50:27 +0200
commit4a8040735b800ec016c1a7e24292e24579dbabd8 (patch)
tree5b5ff4ce114cce985fe2d6717d95068ca72e378f
parentae28d510163d6108f3746ee1e5d64d00350ac8ee (diff)
downloadVeraCrypt-4a8040735b800ec016c1a7e24292e24579dbabd8.tar.gz
VeraCrypt-4a8040735b800ec016c1a7e24292e24579dbabd8.zip
MacOSX: Correctly handle OSX dock "reopen-application" event and Cocoa openFiles message instead of the deprecated Carbon "open-document" event
-rw-r--r--src/Main/GraphicUserInterface.cpp16
-rw-r--r--src/Main/GraphicUserInterface.h3
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>