X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de6185e212ebc37ff11ff70278e3c4f68419b097..9b49405777342458dc1666001865eef7309b6c30:/src/generic/regiong.cpp?ds=inline diff --git a/src/generic/regiong.cpp b/src/generic/regiong.cpp index c81364b059..6c358e10ad 100644 --- a/src/generic/regiong.cpp +++ b/src/generic/regiong.cpp @@ -17,7 +17,7 @@ #pragma hdrstop #endif -#include "wx/generic/region.h" +#include "wx/region.h" #ifndef WX_PRECOMP #include "wx/utils.h" @@ -176,12 +176,12 @@ protected: // wxRegionRefData // ======================================================================== -class wxRegionRefData : public wxObjectRefData, +class wxRegionRefData : public wxGDIRefData, public REGION { public: wxRegionRefData() - : wxObjectRefData(), + : wxGDIRefData(), REGION() { size = 1; @@ -194,7 +194,7 @@ public: } wxRegionRefData(const wxPoint& topLeft, const wxPoint& bottomRight) - : wxObjectRefData(), + : wxGDIRefData(), REGION() { rects = (BOX*)malloc(sizeof(BOX)); @@ -208,7 +208,7 @@ public: } wxRegionRefData(const wxRect& rect) - : wxObjectRefData(), + : wxGDIRefData(), REGION(rect) { rects = (BOX*)malloc(sizeof(BOX)); @@ -216,7 +216,7 @@ public: } wxRegionRefData(const wxRegionRefData& refData) - : wxObjectRefData(), + : wxGDIRefData(), REGION() { size = refData.size; @@ -226,7 +226,7 @@ public: extents = refData.extents; } - ~wxRegionRefData() + virtual ~wxRegionRefData() { free(rects); } @@ -271,115 +271,104 @@ 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(); + if (!m_refData) + m_refData = new wxRegionRefData(wxRect(0,0,0,0)); } -wxObjectRefData *wxRegionGeneric::CreateRefData() const +wxGDIRefData *wxRegionGeneric::CreateGDIRefData() const { return new wxRegionRefData; } -wxObjectRefData *wxRegionGeneric::CloneRefData(const wxObjectRefData *data) const +wxGDIRefData *wxRegionGeneric::CloneGDIRefData(const wxGDIRefData *data) const { return new wxRegionRefData(*(wxRegionRefData *)data); } -bool wxRegionGeneric::operator== (const wxRegionGeneric& region) const +bool wxRegionGeneric::DoIsEqual(const wxRegion& region) const { - wxASSERT(m_refData && region.m_refData); return REGION::XEqualRegion(M_REGIONDATA,M_REGIONDATA_OF(region)); } -wxRect wxRegionGeneric::GetBox() const +bool wxRegionGeneric::DoGetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const { - wxASSERT(m_refData); - wxRect rect; - REGION::XClipBox(M_REGIONDATA,&rect); - return rect; -} + if ( !m_refData ) + return false; -void wxRegionGeneric::GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const -{ - wxASSERT(m_refData); wxRect rect; REGION::XClipBox(M_REGIONDATA,&rect); x = rect.x; y = rect.y; w = rect.width; h = rect.height; + return true; } // ---------------------------------------------------------------------------- // wxRegionGeneric operations // ---------------------------------------------------------------------------- -bool wxRegionGeneric::Union(const wxRect& rect) -/* XUnionRectWithRegion */ +bool wxRegionGeneric::DoUnionWithRect(const wxRect& rect) { - if (!rect.width || !rect.height) - return false; + if ( rect.IsEmpty() ) + { + // nothing to do + return true; + } AllocExclusive(); REGION region(rect); return REGION::XUnionRegion(®ion,M_REGIONDATA,M_REGIONDATA); } -bool wxRegionGeneric::Union(const wxRegionGeneric& region) +bool wxRegionGeneric::DoUnionWithRegion(const wxRegion& region) { AllocExclusive(); return REGION::XUnionRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA); } -bool wxRegionGeneric::Intersect(const wxRect& rect) -{ - if (!rect.width || !rect.height) - return false; - AllocExclusive(); - REGION region(rect); - - return REGION::XIntersectRegion(®ion,M_REGIONDATA,M_REGIONDATA); -} - -bool wxRegionGeneric::Intersect(const wxRegionGeneric& region) +bool wxRegionGeneric::DoIntersect(const wxRegion& region) { AllocExclusive(); return REGION::XIntersectRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA); } -bool wxRegionGeneric::Subtract(const wxRect& rect) +bool wxRegionGeneric::DoSubtract(const wxRegion& region) { - if (!rect.width || !rect.height) - return false; - AllocExclusive(); - REGION region(rect); - - return REGION::XSubtractRegion(®ion,M_REGIONDATA,M_REGIONDATA); -} + if ( region.IsEmpty() ) + { + // nothing to do + return true; + } -bool wxRegionGeneric::Subtract(const wxRegionGeneric& region) -{ return REGION::XSubtractRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA); } -bool wxRegionGeneric::Xor(const wxRect& rect) -{ - if (!rect.width || !rect.height) - return false; - AllocExclusive(); - REGION region(rect); - - return REGION::XXorRegion(®ion,M_REGIONDATA,M_REGIONDATA); -} - -bool wxRegionGeneric::Xor(const wxRegionGeneric& region) +bool wxRegionGeneric::DoXor(const wxRegion& region) { AllocExclusive(); return REGION::XXorRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA); } -bool wxRegionGeneric::Offset(wxCoord x, wxCoord y) +bool wxRegionGeneric::DoOffset(wxCoord x, wxCoord y) { AllocExclusive(); return REGION::XOffsetRegion(M_REGIONDATA, x, y); @@ -389,35 +378,21 @@ bool wxRegionGeneric::Offset(wxCoord x, wxCoord y) // wxRegionGeneric comparison // ---------------------------------------------------------------------------- -bool wxRegionGeneric::Empty() const +bool wxRegionGeneric::IsEmpty() const { wxASSERT(m_refData); return REGION::XEmptyRegion(M_REGIONDATA); } // Does the region contain the point (x,y)? -wxRegionContain wxRegionGeneric::Contains(long x, long y) const -{ - wxASSERT(m_refData); - return REGION::XPointInRegion(M_REGIONDATA,x,y)?wxInRegion:wxOutRegion; -} - -// Does the region contain the point pt? -wxRegionContain wxRegionGeneric::Contains(const wxPoint& pt) const +wxRegionContain wxRegionGeneric::DoContainsPoint(wxCoord x, wxCoord y) const { wxASSERT(m_refData); - return REGION::XPointInRegion(M_REGIONDATA,pt.x,pt.y)?wxInRegion:wxOutRegion; -} - -// Does the region contain the rectangle (x, y, w, h)? -wxRegionContain wxRegionGeneric::Contains(long x, long y, long w, long h) const -{ - wxASSERT(m_refData); - return REGION::XRectInRegion(M_REGIONDATA,x,y,w,h); + return REGION::XPointInRegion(M_REGIONDATA,x,y) ? wxInRegion : wxOutRegion; } // Does the region contain the rectangle rect? -wxRegionContain wxRegionGeneric::Contains(const wxRect& rect) const +wxRegionContain wxRegionGeneric::DoContainsRect(const wxRect& rect) const { wxASSERT(m_refData); return REGION::XRectInRegion(M_REGIONDATA,rect.x,rect.y,rect.width,rect.height); @@ -631,14 +606,17 @@ SOFTWARE. */ /* Create a new empty region */ -Region REGION:: -XCreateRegion(void) +Region REGION::XCreateRegion(void) { - Region temp; + Region temp = new REGION; - if (! (temp = new REGION)) + if (!temp) return (Region) NULL; - if (! (temp->rects = ( BOX * )malloc( (unsigned) sizeof( BOX )))) { + + temp->rects = ( BOX * )malloc( (unsigned) sizeof( BOX )); + + if (!temp->rects) + { free((char *) temp); return (Region) NULL; } @@ -651,10 +629,7 @@ XCreateRegion(void) return( temp ); } -bool REGION:: -XClipBox( - Region r, - wxRect *rect) +bool REGION::XClipBox(Region r, wxRect *rect) { rect->x = r->extents.x1; rect->y = r->extents.y1; @@ -887,9 +862,10 @@ miRegionCopy( { BOX *prevRects = dstrgn->rects; - if (! (dstrgn->rects = (BOX *) + dstrgn->rects = (BOX *) realloc((char *) dstrgn->rects, - (unsigned) rgn->numRects * (sizeof(BOX))))) + (unsigned) rgn->numRects * (sizeof(BOX))); + if (!dstrgn->rects) { free(prevRects); return; @@ -1156,8 +1132,10 @@ miRegionOp( */ newReg->size = wxMax(reg1->numRects,reg2->numRects) * 2; - if (! (newReg->rects = (BoxPtr) - malloc ((unsigned) (sizeof(BoxRec) * newReg->size)))) { + newReg->rects = (BoxPtr)malloc((unsigned) (sizeof(BoxRec) * newReg->size)); + + if (!newReg->rects) + { newReg->size = 0; return; } @@ -1786,11 +1764,7 @@ miSubtractO ( *----------------------------------------------------------------------- */ -bool REGION:: -XSubtractRegion( - Region regM, - Region regS, - register Region regD) +bool REGION::XSubtractRegion(Region regM, Region regS, register Region regD) { /* check for trivial reject */ if ( (!(regM->numRects)) || (!(regS->numRects)) || @@ -1814,13 +1788,16 @@ XSubtractRegion( return true; } -bool REGION:: -XXorRegion(Region sra, Region srb, Region dr) +bool REGION::XXorRegion(Region sra, Region srb, Region dr) { - Region tra, trb; + Region tra = XCreateRegion(); + + wxCHECK_MSG( tra, false, wxT("region not created") ); + + Region trb = XCreateRegion(); + + wxCHECK_MSG( trb, false, wxT("region not created") ); - if ((! (tra = XCreateRegion())) || (! (trb = XCreateRegion()))) - return 0; (void) XSubtractRegion(sra,srb,tra); (void) XSubtractRegion(srb,sra,trb); (void) XUnionRegion(tra,trb,dr); @@ -1833,9 +1810,7 @@ XXorRegion(Region sra, Region srb, Region dr) * Check to see if the region is empty. Assumes a region is passed * as a parameter */ -bool REGION:: -XEmptyRegion( - Region r) +bool REGION::XEmptyRegion(Region r) { if( r->numRects == 0 ) return true; else return false; @@ -1844,8 +1819,7 @@ XEmptyRegion( /* * Check to see if two regions are equal */ -bool REGION:: -XEqualRegion(Region r1, Region r2) +bool REGION::XEqualRegion(Region r1, Region r2) { int i; @@ -1864,10 +1838,7 @@ XEqualRegion(Region r1, Region r2) return true; } -bool REGION:: -XPointInRegion( - Region pRegion, - int x, int y) +bool REGION::XPointInRegion(Region pRegion, int x, int y) { int i; @@ -1883,11 +1854,10 @@ XPointInRegion( return false; } -wxRegionContain REGION:: -XRectInRegion( - register Region region, - int rx, int ry, - unsigned int rwidth, unsigned int rheight) +wxRegionContain REGION::XRectInRegion(register Region region, + int rx, int ry, + unsigned int rwidth, + unsigned int rheight) { register BoxPtr pbox; register BoxPtr pboxEnd;