diff --git a/xvaga/xvaga.cpp b/xvaga/xvaga.cpp index 94d0e1b71..764a243c6 100755 --- a/xvaga/xvaga.cpp +++ b/xvaga/xvaga.cpp @@ -3666,7 +3666,11 @@ int xvt_rect_get_width(RCT *rctp) BOOLEAN xvt_rect_has_point(RCT *rctp, PNT pnt) { const wxRect rct = NormalizeRCT(rctp); - return rct.Contains(pnt.h, pnt.v); + #if wxCHECK_VERSION(2,8,0) + return rct.Contains(pnt.h, pnt.v); + #else + return rct.Inside(pnt.h, pnt.v); + #endif } BOOLEAN xvt_rect_intersect(RCT *drctp, RCT *rctp1, RCT *rctp2) @@ -4467,10 +4471,14 @@ int xvt_sys_get_session_id() unsigned long xvt_sys_get_free_memory() { unsigned long mem = 0; +#if wxCHECK_VERSION(2,8,0) if (::wxGetFreeMemory().GetHi()) mem = -1; else mem = ::wxGetFreeMemory().GetLo(); +#else + mem = ::wxGetFreeMemory(); +#endif return mem; }