Patch level :4.0
Files correlati : Ricompilazione Demo : [ ] Commento :corretto errore riporto git-svn-id: svn://10.65.10.50/trunk@14740 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
parent
a435dd590c
commit
8b83c40d57
@ -3666,7 +3666,11 @@ int xvt_rect_get_width(RCT *rctp)
|
|||||||
BOOLEAN xvt_rect_has_point(RCT *rctp, PNT pnt)
|
BOOLEAN xvt_rect_has_point(RCT *rctp, PNT pnt)
|
||||||
{
|
{
|
||||||
const wxRect rct = NormalizeRCT(rctp);
|
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)
|
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 xvt_sys_get_free_memory()
|
||||||
{
|
{
|
||||||
unsigned long mem = 0;
|
unsigned long mem = 0;
|
||||||
|
#if wxCHECK_VERSION(2,8,0)
|
||||||
if (::wxGetFreeMemory().GetHi())
|
if (::wxGetFreeMemory().GetHi())
|
||||||
mem = -1;
|
mem = -1;
|
||||||
else
|
else
|
||||||
mem = ::wxGetFreeMemory().GetLo();
|
mem = ::wxGetFreeMemory().GetLo();
|
||||||
|
#else
|
||||||
|
mem = ::wxGetFreeMemory();
|
||||||
|
#endif
|
||||||
return mem;
|
return mem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user