From f94707e4efaa196d1f13d89fa8c08ddd24e847a0 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Wed, 30 Jul 2014 15:39:17 +0200 Subject: MacOSX : correct compilation issue caused by system API deprication and use of new wxWidgets. --- src/Main/FatalErrorHandler.cpp | 14 ++++---------- src/Main/Forms/MainFrame.cpp | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/Main/FatalErrorHandler.cpp b/src/Main/FatalErrorHandler.cpp index 724b6dcc..bd343578 100644 --- a/src/Main/FatalErrorHandler.cpp +++ b/src/Main/FatalErrorHandler.cpp @@ -20,11 +20,7 @@ #endif #ifdef TC_MACOSX -# ifdef __ppc__ -# include -# else -# include -# endif +# include #elif defined (TC_BSD) # include #endif @@ -54,12 +50,10 @@ namespace VeraCrypt # endif #elif defined (TC_MACOSX) -# ifdef __ppc__ - faultingInstructionAddress = context->uc_mcontext->ss.srr0; -# elif defined (__x86_64__) - faultingInstructionAddress = context->uc_mcontext->ss.rip; +# ifdef __x86_64__ + faultingInstructionAddress = context->uc_mcontext->__ss.__rip; # else - faultingInstructionAddress = context->uc_mcontext->ss.eip; + faultingInstructionAddress = context->uc_mcontext->__ss.__eip; # endif #endif diff --git a/src/Main/Forms/MainFrame.cpp b/src/Main/Forms/MainFrame.cpp index 7c329292..b48f3718 100644 --- a/src/Main/Forms/MainFrame.cpp +++ b/src/Main/Forms/MainFrame.cpp @@ -1020,7 +1020,7 @@ namespace VeraCrypt if (!ListItemRightClickEventPending) { ListItemRightClickEventPending = true; - SlotListCtrl->AddPendingEvent (event); + SlotListCtrl->GetEventHandler()->AddPendingEvent (event); return; } -- cgit v1.2.3