From: Steve Brokenshire Date: Sat, 9 Apr 2016 07:44:55 +0000 (+0100) Subject: Added initial OS X support for frmActivityMgr.h X-Git-Tag: release-0.12~23 X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=4bf3e76fa05aad77c1cd5673dd87a551dbffc718 Added initial OS X support for frmActivityMgr.h --- diff --git a/source/actmgr/frmActivityMgr.h b/source/actmgr/frmActivityMgr.h index 71b8515..45f56fb 100644 --- a/source/actmgr/frmActivityMgr.h +++ b/source/actmgr/frmActivityMgr.h @@ -26,6 +26,11 @@ Subclass of frmActivityMgrADT, which is generated by wxFormBuilder. #include #include +#if defined(__APPLE__) +#import +#import +#include "../frmMain.h" +#endif #include "../AppXestiaAddrBk.h" #include "../carddav/carddav.h" @@ -55,6 +60,15 @@ struct ActivityMgrLabelUpdate{ wxString ItemDes; }; +#if defined(__APPLE__) +struct SSLInvalidTrustNotifObj{ + SecTrustRef SecurityTrustObject; + int *ResultValue; + bool *PausePtr; + wxString AccountName; +}; +#endif + /** Implementing frmActivityMgrADT */ class frmActivityMgr : public frmActivityMgrADT { @@ -87,6 +101,9 @@ class frmActivityMgr : public frmActivityMgrADT //int ConflictResult = 0; wxETagProcessTimer *ETagTmrPtr; void *frmMainPtr; +#if defined(__APPLE__) + int DisplayTrustPanel(SecTrustRef SecurityTrustObject, wxString AccountNameFriendly); +#endif //frmMain *frmMainPtr; protected: // Handlers for frmActivityMgrADT events.