MacOSX: Correctly handle OSX dock "reopen-application" event and Cocoa openFiles message instead of the deprecated Carbon "open-document" event

This commit is contained in:
Mounir IDRASSI committed 2015-04-06 19:50:27 +02:00
1 parent ae28d51016
commit 4a8040735b
2 files changed
+15 -4

No files matched your search

+13 -3
View File
@@ -622,10 +622,20 @@ namespace VeraCrypt
} }
#ifdef TC_MACOSX #ifdef TC_MACOSX
void GraphicUserInterface::MacOpenFile (const wxString &fileName) void GraphicUserInterface::MacOpenFiles (const wxArrayString &fileNames)
{ {
OpenVolumeSystemRequestEventArgs eventArgs (fileName); if (fileNames.GetCount() > 0)
OpenVolumeSystemRequestEvent.Raise (eventArgs); {
// 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 #endif
+2 -1
View File
@@ -94,7 +94,8 @@ namespace VeraCrypt
void ExecuteWaitThreadRoutine (wxWindow *parent, WaitThreadRoutine *pRoutine) const; void ExecuteWaitThreadRoutine (wxWindow *parent, WaitThreadRoutine *pRoutine) const;
#ifdef TC_MACOSX #ifdef TC_MACOSX
virtual void MacOpenFile (const wxString &fileName); virtual void MacOpenFiles (const wxArrayString &fileNames);
virtual void MacReopenApp ();
#endif #endif
template <class T> template <class T>