X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b80278886518c75cb0552e21e21bc321112d2862..55fbde1232bff0ed44c23775911574ac1b2f8a0a:/include/wx/msw/region.h diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h index 72f8dfcd02..e9463fdd13 100644 --- a/include/wx/msw/region.h +++ b/include/wx/msw/region.h @@ -1,46 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/msw/region.h // Purpose: wxRegion class -// Author: Markus Holzem, Julian Smart +// Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart +// Copyright: (c) 1997-2002 wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_REGION_H_ -#define _WX_REGION_H_ +#ifndef _WX_MSW_REGION_H_ +#define _WX_MSW_REGION_H_ -#ifdef __GNUG__ -#pragma interface "region.h" -#endif - -#include "wx/list.h" -#include "wx/gdiobj.h" -#include "wx/gdicmn.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 { public: wxRegion(); @@ -49,70 +21,21 @@ public: wxRegion(const wxRect& rect); wxRegion(WXHRGN hRegion); // Hangs on to this region wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); + wxRegion( const wxBitmap& bmp) + { + Union(bmp); + } + wxRegion( const wxBitmap& bmp, + const wxColour& transColour, int tolerance = 0) + { + Union(bmp, transColour, tolerance); + } virtual ~wxRegion(); - // Copying - wxRegion(const wxRegion& r) - { Ref(r); } - wxRegion& operator = (const wxRegion& r) - { Ref(r); return (*this); } - - // Modify region - // ------------- - - // Clear current region - void Clear(); - - // Move the region - bool Offset(wxCoord x, wxCoord y); - - // Union rectangle or region with this. - bool Union(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_OR); } - bool Union(const wxRect& rect) { return Combine(rect, wxRGN_OR); } - bool Union(const wxRegion& region) { return Combine(region, wxRGN_OR); } - - // Intersect rectangle or region with this. - bool Intersect(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_AND); } - bool Intersect(const wxRect& rect) { return Combine(rect, wxRGN_AND); } - bool Intersect(const wxRegion& region) { return Combine(region, wxRGN_AND); } - - // Subtract rectangle or region from this: - // Combines the parts of 'this' that are not part of the second region. - bool Subtract(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_DIFF); } - bool Subtract(const wxRect& rect) { return Combine(rect, wxRGN_DIFF); } - bool Subtract(const wxRegion& region) { return Combine(region, wxRGN_DIFF); } - - // XOR: the union of two combined regions except for any overlapping areas. - bool Xor(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_XOR); } - bool Xor(const wxRect& rect) { return Combine(rect, wxRGN_XOR); } - bool Xor(const wxRegion& region) { return Combine(region, wxRGN_XOR); } - - // Information on region - // --------------------- - - // Outer bounds of region - void GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const; - wxRect GetBox(void) const ; - - // Is region empty? - bool Empty(void) const; - inline bool IsEmpty(void) const { return Empty(); } - - // Tests - // Does the region contain the point (x,y)? - wxRegionContain Contains(wxCoord x, wxCoord y) const; - // Does the region contain the point pt? - wxRegionContain Contains(const wxPoint& pt) const; - // Does the region contain the rectangle (x, y, w, h)? - wxRegionContain Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h) const; - // Does the region contain the rectangle rect? - wxRegionContain Contains(const wxRect& rect) const; - -// Internal - bool Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op); - bool Combine(const wxRegion& region, wxRegionOp op); - bool Combine(const wxRect& rect, wxRegionOp op); + // wxRegionBase methods + virtual void Clear(); + virtual bool IsEmpty() const; // Get internal region handle WXHRGN GetHRGN() const; @@ -121,7 +44,15 @@ protected: virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - friend class WXDLLEXPORT wxRegionIterator; + 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 WXDLLIMPEXP_FWD_CORE wxRegionIterator; DECLARE_DYNAMIC_CLASS(wxRegion) }; @@ -129,38 +60,43 @@ protected: class WXDLLEXPORT wxRegionIterator : public wxObject { public: - wxRegionIterator(void); + wxRegionIterator() { Init(); } wxRegionIterator(const wxRegion& region); - ~wxRegionIterator(void); + wxRegionIterator(const wxRegionIterator& ri) : wxObject(ri) { Init(); *this = ri; } + + wxRegionIterator& operator=(const wxRegionIterator& ri); - void Reset(void) { m_current = 0; } + virtual ~wxRegionIterator(); + + void Reset() { m_current = 0; } void Reset(const wxRegion& region); -#ifndef __SALFORDC__ - operator bool (void) const { return (m_current < m_numRects); } -#endif + bool HaveRects() const { return (m_current < m_numRects); } + + operator bool () const { return HaveRects(); } - bool HaveRects(void) const { return (m_current < m_numRects); } + wxRegionIterator& operator++(); + wxRegionIterator operator++(int); - void operator ++ (void); - void operator ++ (int); + wxCoord GetX() const; + wxCoord GetY() const; + wxCoord GetW() const; + wxCoord GetWidth() const { return GetW(); } + wxCoord GetH() const; + wxCoord GetHeight() const { return GetH(); } - wxCoord GetX(void) const; - wxCoord GetY(void) const; - wxCoord GetW(void) const; - wxCoord GetWidth(void) const { return GetW(); } - wxCoord GetH(void) const; - wxCoord GetHeight(void) const { return GetH(); } - wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); } + wxRect GetRect() const { return wxRect(GetX(), GetY(), GetW(), GetH()); } private: + // common part of all ctors + void Init(); + long m_current; long m_numRects; wxRegion m_region; wxRect* m_rects; - DECLARE_DYNAMIC_CLASS(wxRegionIterator); + DECLARE_DYNAMIC_CLASS(wxRegionIterator) }; -#endif - // _WX_REGION_H_ +#endif // _WX_MSW_REGION_H_