From: Steve Brokenshire Date: Fri, 13 May 2016 21:57:24 +0000 (+0100) Subject: Remove pre-processor definition of FRMACTIVITYMGR_H from frmActivityMgr.cpp as it... X-Git-Tag: release-0.13~31 X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=b73b96cf9e05a5d975626969977559a97230eec2 Remove pre-processor definition of FRMACTIVITYMGR_H from frmActivityMgr.cpp as it shouldn't be there. Whoops. --- diff --git a/source/actmgr/frmActivityMgr.cpp b/source/actmgr/frmActivityMgr.cpp index 6cf9ad7..b63d827 100644 --- a/source/actmgr/frmActivityMgr.cpp +++ b/source/actmgr/frmActivityMgr.cpp @@ -38,9 +38,6 @@ #include "../vcard/vcard34conv.h" #include "../vcard/vcard.h" -#ifndef FRMACTIVITYMGR_H -#define FRMACTIVITYMGR_H - DEFINE_EVENT_TYPE(ACTMGR_RESUMEPROC); DEFINE_EVENT_TYPE(ACTMGR_TOGGLECONN); DEFINE_EVENT_TYPE(ACTMGR_STARTTIMER); @@ -2080,6 +2077,4 @@ void frmActivityMgr::UpdateStatusLabel(wxCommandEvent& event){ } -} - -#endif \ No newline at end of file +} \ No newline at end of file