X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a56a532f29c35adfe6eb2c1c81315fa1e7ba921..be4da8f0315e36de2322cd312c7184f55c0333f5:/include/wx/os2/region.h diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h index 0fca2f9090..a2a669b0de 100644 --- a/include/wx/os2/region.h +++ b/include/wx/os2/region.h @@ -9,32 +9,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_REGION_H_ -#define _WX_REGION_H_ +#ifndef _WX_OS2_REGION_H_ +#define _WX_OS2_REGION_H_ #include "wx/list.h" -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" +#include "wx/os2/private.h" -class WXDLLEXPORT wxRect; -class WXDLLEXPORT wxPoint; - -enum wxRegionContain { - wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2 -}; - -// So far, for internal use only -enum wxRegionOp { wxRGN_AND // Creates the intersection of the two combined regions. - ,wxRGN_COPY // Creates a copy of the region identified by hrgnSrc1. - ,wxRGN_DIFF // Combines the parts of hrgnSrc1 that are not part of hrgnSrc2. - ,wxRGN_OR // Creates the union of two combined regions. - ,wxRGN_XOR // Creates the union of two combined regions except for any overlapping areas. - }; - -class WXDLLEXPORT wxRegion : public wxGDIObject +class WXDLLEXPORT wxRegion : public wxRegionWithCombine { -DECLARE_DYNAMIC_CLASS(wxRegion); - friend class WXDLLEXPORT wxRegionIterator; public: wxRegion( wxCoord x ,wxCoord y @@ -45,169 +27,56 @@ public: ,const wxPoint& rBottomRight ); wxRegion(const wxRect& rRect); - wxRegion(WXHRGN hRegion); // Hangs on to this region - - wxRegion(); - ~wxRegion(); - - // - // Copying - // - inline wxRegion(const wxRegion& rSrc) - { Ref(rSrc); } - inline wxRegion& operator = (const wxRegion& rSrc) - { Ref(rSrc); return (*this); } - - // - // Modify region - // - - // - // Clear current region - // - void Clear(void); - - // - // Union rectangle or region with this. - // - inline bool Union( wxCoord x - ,wxCoord y - ,wxCoord vWidth - ,wxCoord vHeight - ) + wxRegion(WXHRGN hRegion, WXHDC hPS); // Hangs on to this region + wxRegion( const wxBitmap& bmp) { - return Combine( x - ,y - ,vWidth - ,vHeight - ,wxRGN_OR - ); + Union(bmp); } - inline bool Union( const wxRect& rRect) { return Combine(rRect, wxRGN_OR); } - inline bool Union(const wxRegion& rRegion) { return Combine(rRegion, wxRGN_OR); } - - // - // Intersect rectangle or region with this. - // - inline bool Intersect( wxCoord x - ,wxCoord y - ,wxCoord vWidth - ,wxCoord vHeight - ) + wxRegion( const wxBitmap& bmp, + const wxColour& transColour, int tolerance = 0) { - return Combine( x - ,y - ,vWidth - ,vHeight - ,wxRGN_AND - ); + Union(bmp, transColour, tolerance); } - inline bool Intersect(const wxRect& rRect) { return Combine(rRect, wxRGN_AND); } - inline bool Intersect(const wxRegion& rRegion) { return Combine(rRegion, wxRGN_AND); } - // - // Subtract rectangle or region from this: - // Combines the parts of 'this' that are not part of the second region. - // - inline bool Subtract( wxCoord x - ,wxCoord y - ,wxCoord vWidth - ,wxCoord vHeight - ) - { - return Combine( x - ,y - ,vWidth - ,vHeight - ,wxRGN_DIFF - ); - } - inline bool Subtract(const wxRect& rRect) { return Combine(rRect, wxRGN_DIFF); } - inline bool Subtract(const wxRegion& rRegion) { return Combine(rRegion, wxRGN_DIFF); } + wxRegion(); + virtual ~wxRegion(); // - // XOR: the union of two combined regions except for any overlapping areas. + // Modify region // - inline bool Xor( wxCoord x - ,wxCoord y - ,wxCoord vWidth - ,wxCoord vHeight - ) - { - return Combine( x - ,y - ,vWidth - ,vHeight - ,wxRGN_XOR - ); - } - inline bool Xor(const wxRect& rRect) { return Combine(rRect, wxRGN_XOR); } - inline bool Xor(const wxRegion& rRegion) { return Combine(rRegion, wxRGN_XOR); } // - // Information on region - // Outer bounds of region + // Clear current region // - void GetBox( wxCoord& rX - ,wxCoord& rY - ,wxCoord& rWidth - ,wxCoord& rHeight - ) const; - wxRect GetBox(void) const; + virtual void Clear(); // // Is region empty? // - bool Empty(void) const; - inline bool IsEmpty() const { return Empty(); } + virtual bool IsEmpty() const; // - // Tests - // Does the region contain the point (x,y)? - // - wxRegionContain Contains( wxCoord lX - ,wxCoord lY - ) const; - // - // Does the region contain the point pt? + // Get internal region handle // - wxRegionContain Contains(const wxPoint& rPoint) const; + WXHRGN GetHRGN() const; - // - // Does the region contain the rectangle (x, y, w, h)? - // - wxRegionContain Contains( wxCoord x - ,wxCoord y - ,wxCoord lWidth - ,wxCoord lHeight - ) const; + void SetPS(HPS hPS); - // - // Does the region contain the rectangle rect? - // - wxRegionContain Contains(const wxRect& rRect) const; +protected: + virtual wxObjectRefData* CreateData(void) const; + virtual wxObjectRefData* CloneData(const wxObjectRefData* pData) const; - // - // Internal - // - bool Combine( wxCoord x - ,wxCoord y - ,wxCoord vWidth - ,wxCoord vHeight - ,wxRegionOp eOp - ); - bool Combine( const wxRegion& rRegion - ,wxRegionOp eOp - ); - bool Combine( const wxRect& rRect - ,wxRegionOp eOp - ); + virtual bool DoIsEqual(const wxRegion& region) const; + virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const; + virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const; + virtual wxRegionContain DoContainsRect(const wxRect& rect) const; + + virtual bool DoOffset(wxCoord x, wxCoord y); + virtual bool DoCombine(const wxRegion& region, wxRegionOp op); + + friend class WXDLLEXPORT wxRegionIterator; + DECLARE_DYNAMIC_CLASS(wxRegion); - // - // Get internal region handle - // - WXHRGN GetHRGN(void) const; - void SetPS(HPS hPS); }; // end of CLASS wxRegion class WXDLLEXPORT wxRegionIterator : public wxObject @@ -216,7 +85,7 @@ DECLARE_DYNAMIC_CLASS(wxRegionIterator); public: wxRegionIterator(); wxRegionIterator(const wxRegion& rRegion); - ~wxRegionIterator(); + virtual ~wxRegionIterator(); void Reset(void) { m_lCurrent = 0; } void Reset(const wxRegion& rRegion); @@ -242,5 +111,4 @@ private: wxRect* m_pRects; }; // end of wxRegionIterator -#endif - // _WX_REGION_H_ +#endif // _WX_OS2_REGION_H_