Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

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

Browse Source
This commit is contained in:
Mounir IDRASSI
2015-04-06 18:58:47 +02:00
parent ae28d51016
commit 4a8040735b
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Main/GraphicUserInterface.cpp
View File

@@ -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

3
src/Main/GraphicUserInterface.h
View File

@@ -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>