X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c6f2bde16081275f82cca579590966b2864e78af..c282e47d8f2179954ca40688677961c169688084:/src/generic/regiong.cpp?ds=inline diff --git a/src/generic/regiong.cpp b/src/generic/regiong.cpp index d9ee1d95de..caf5cc7a4a 100644 --- a/src/generic/regiong.cpp +++ b/src/generic/regiong.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/region.cpp +// Name: src/generic/regiong.cpp // Purpose: generic wxRegion class // Author: David Elliott // Modified by: @@ -271,6 +271,21 @@ wxRegionGeneric::wxRegionGeneric(const wxPoint& topLeft, const wxPoint& bottomRi m_refData = new wxRegionRefData(topLeft, bottomRight); } +wxRegionGeneric::wxRegionGeneric(const wxBitmap& bmp) +{ + wxFAIL_MSG("NOT IMPLEMENTED: wxRegionGeneric::wxRegionGeneric(const wxBitmap& bmp)"); +} + +wxRegionGeneric::wxRegionGeneric(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle) +{ + wxFAIL_MSG("NOT IMPLEMENTED: wxRegionGeneric::wxRegionGeneric(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle)"); +} + +wxRegionGeneric::wxRegionGeneric(const wxBitmap& bmp, const wxColour& transp, int tolerance) +{ + wxFAIL_MSG("NOT IMPLEMENTED: wxRegionGeneric::wxRegionGeneric(const wxBitmap& bmp, const wxColour& transp, int tolerance)"); +} + void wxRegionGeneric::Clear() { UnRef(); @@ -602,7 +617,7 @@ Region REGION::XCreateRegion(void) if (!temp->rects) { - free((char *) temp); + delete temp; return (Region) NULL; } temp->numRects = 0; @@ -670,7 +685,7 @@ miSetExtents (Region pReg) pExtents->x2 = pBoxEnd->x2; pExtents->y2 = pBoxEnd->y2; - assert(pExtents->y1 < pExtents->y2); + wxASSERT_LEVEL_2(pExtents->y1 < pExtents->y2); while (pBox <= pBoxEnd) { if (pBox->x1 < pExtents->x1) @@ -683,7 +698,7 @@ miSetExtents (Region pReg) } pBox++; } - assert(pExtents->x1 < pExtents->x2); + wxASSERT_LEVEL_2(pExtents->x1 < pExtents->x2); } bool REGION:: @@ -774,7 +789,7 @@ miIntersectO ( */ if (x1 < x2) { - assert(y1rects); pNextRect->x1 = x1; @@ -783,7 +798,7 @@ miIntersectO ( pNextRect->y2 = y2; pReg->numRects += 1; pNextRect++; - assert(pReg->numRects <= pReg->size); + wxASSERT_LEVEL_2(pReg->numRects <= pReg->size); } /* @@ -1364,11 +1379,11 @@ miUnionNonO ( pNextRect = &pReg->rects[pReg->numRects]; - assert(y1 < y2); + wxASSERT_LEVEL_2(y1 < y2); while (r != rEnd) { - assert(r->x1 < r->x2); + wxASSERT_LEVEL_2(r->x1 < r->x2); MEMCHECK(pReg, pNextRect, pReg->rects); pNextRect->x1 = r->x1; pNextRect->y1 = y1; @@ -1377,7 +1392,7 @@ miUnionNonO ( pReg->numRects += 1; pNextRect++; - assert(pReg->numRects<=pReg->size); + wxASSERT_LEVEL_2(pReg->numRects<=pReg->size); r++; } return 0; /* lint */ @@ -1424,7 +1439,7 @@ miUnionO ( if (pNextRect[-1].x2 < r->x2) \ { \ pNextRect[-1].x2 = r->x2; \ - assert(pNextRect[-1].x1numRects += 1; \ pNextRect += 1; \ } \ - assert(pReg->numRects<=pReg->size);\ + wxASSERT_LEVEL_2(pReg->numRects<=pReg->size);\ r++; - assert (y1x1 < r2->x1) @@ -1565,11 +1580,11 @@ miSubtractNonO1 ( pNextRect = &pReg->rects[pReg->numRects]; - assert(y1x1x2); + wxASSERT_LEVEL_2(r->x1x2); MEMCHECK(pReg, pNextRect, pReg->rects); pNextRect->x1 = r->x1; pNextRect->y1 = y1; @@ -1578,7 +1593,7 @@ miSubtractNonO1 ( pReg->numRects += 1; pNextRect++; - assert(pReg->numRects <= pReg->size); + wxASSERT_LEVEL_2(pReg->numRects <= pReg->size); r++; } @@ -1615,7 +1630,7 @@ miSubtractO ( x1 = r1->x1; - assert(y1rects[pReg->numRects]; while ((r1 != r1End) && (r2 != r2End)) @@ -1630,7 +1645,7 @@ miSubtractO ( else if (r2->x1 <= x1) { /* - * Subtrahend preceeds minuend: nuke left edge of minuend. + * Subtrahend precedes minuend: nuke left edge of minuend. */ x1 = r2->x2; if (x1 >= r1->x2) @@ -1658,7 +1673,7 @@ miSubtractO ( * Left part of subtrahend covers part of minuend: add uncovered * part of minuend to region and skip to next subtrahend. */ - assert(x1x1); + wxASSERT_LEVEL_2(x1x1); MEMCHECK(pReg, pNextRect, pReg->rects); pNextRect->x1 = x1; pNextRect->y1 = y1; @@ -1667,7 +1682,7 @@ miSubtractO ( pReg->numRects += 1; pNextRect++; - assert(pReg->numRects<=pReg->size); + wxASSERT_LEVEL_2(pReg->numRects<=pReg->size); x1 = r2->x2; if (x1 >= r1->x2) @@ -1701,7 +1716,7 @@ miSubtractO ( pNextRect->y2 = y2; pReg->numRects += 1; pNextRect++; - assert(pReg->numRects<=pReg->size); + wxASSERT_LEVEL_2(pReg->numRects<=pReg->size); } r1++; if (r1 != r1End) @@ -1714,7 +1729,7 @@ miSubtractO ( */ while (r1 != r1End) { - assert(x1x2); + wxASSERT_LEVEL_2(x1x2); MEMCHECK(pReg, pNextRect, pReg->rects); pNextRect->x1 = x1; pNextRect->y1 = y1; @@ -1723,7 +1738,7 @@ miSubtractO ( pReg->numRects += 1; pNextRect++; - assert(pReg->numRects<=pReg->size); + wxASSERT_LEVEL_2(pReg->numRects<=pReg->size); r1++; if (r1 != r1End)