more errors

This commit is contained in:
Amy Bowersox 2019-12-11 11:05:36 -07:00
parent e59e6e0bae
commit c388dbc1d2
2 changed files with 3 additions and 3 deletions

View File

@ -155,9 +155,9 @@ BOOL DC_SolidRectangle(PDCTXT pdctxt, INT32 left, INT32 top, INT32 right, INT32
{
RECT rect, actual;
G_set_rect(&rect, left, top, right, bottom);
if (!G_intersect_rect(&actual, &rect, &(pdctxt->cliprect)))
if (!G_rect_intersect(&actual, &rect, &(pdctxt->cliprect)))
return TRUE;
return (*(pdctxt->funcs-solid_rect))(pdctxt->privdata, &actual, pdctxt->color, pdctxt->rop2);
return (*(pdctxt->funcs->solid_rect))(pdctxt->privdata, &actual, pdctxt->color, pdctxt->rop2);
}
UINT32 DC_GetROP2(PDCTXT pdctxt)

View File

@ -153,7 +153,7 @@ static PyObject *devctxt_select_bitmap(DevCtxtObject *self, BitmapObject *newbmp
old_pbmp = (PBITMAP)DC_SelectObject(self->pdctxt, (PGFXOBJECT)(newbmp->pbmp));
if (!old_bitmap)
{
old_bitmap = Epython_wrap_bitmap(old_pbmp);
old_bitmap = (BitmapObject *)Epython_wrap_bitmap(old_pbmp);
if (!old_bitmap)
{
DC_SelectObject(self->pdctxt, (PGFXOBJECT)old_pbmp);