amy/upiwin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hackathon-dev #1

Merged
amy merged 101 commits from hackathon-dev into develop 2019-12-12 13:56:11 -07:00
Conversation 0 Commits 101 Files Changed 67 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c388dbc1d2 - Show all commits

4
src/devctxt.c
View File

@ -155,9 +155,9 @@ BOOL DC_SolidRectangle(PDCTXT pdctxt, INT32 left, INT32 top, INT32 right, INT32
{ {
RECT rect, actual; RECT rect, actual;
G_set_rect(&rect, left, top, right, bottom); 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 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) UINT32 DC_GetROP2(PDCTXT pdctxt)

2
src/ep_devctxt.c
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)); old_pbmp = (PBITMAP)DC_SelectObject(self->pdctxt, (PGFXOBJECT)(newbmp->pbmp));
if (!old_bitmap) if (!old_bitmap)
{ {
old_bitmap = Epython_wrap_bitmap(old_pbmp); old_bitmap = (BitmapObject *)Epython_wrap_bitmap(old_pbmp);
if (!old_bitmap) if (!old_bitmap)
{ {
DC_SelectObject(self->pdctxt, (PGFXOBJECT)old_pbmp); DC_SelectObject(self->pdctxt, (PGFXOBJECT)old_pbmp);