X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0dbd6262a9ee7d735fb3930707346298f71b2cb7..c6eaa6fb6733d8472a14e220a5656787eafda398:/include/wx/mac/region.h?ds=sidebyside

diff --git a/include/wx/mac/region.h b/include/wx/mac/region.h
index 04d143c2e9..d9fc31f073 100644
--- a/include/wx/mac/region.h
+++ b/include/wx/mac/region.h
@@ -43,93 +43,114 @@ public:
     wxRegion(long x, long y, long w, long h);
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
-	wxRegion();
-	~wxRegion();
-
-	//# Copying
-	inline wxRegion(const wxRegion& r)
-		{ Ref(r); }
-	inline wxRegion& operator = (const wxRegion& r)
-		{ Ref(r); return (*this); }
-
-	//# Modify region
-	// Clear current region
-	void Clear();
-
-	// Union rectangle or region with this.
-	inline bool Union(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_OR); }
-	inline bool Union(const wxRect& rect) { return Combine(rect, wxRGN_OR); }
-	inline bool Union(const wxRegion& region) { return Combine(region, wxRGN_OR); }
-
-	// Intersect rectangle or region with this.
-	inline bool Intersect(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_AND); }
-	inline bool Intersect(const wxRect& rect)  { return Combine(rect, wxRGN_AND); }
-	inline bool Intersect(const wxRegion& region)  { return Combine(region, wxRGN_AND); }
-
-	// Subtract rectangle or region from this:
+    wxRegion( WXHRGN hRegion );
+    wxRegion();
+    ~wxRegion();
+    
+    //# Copying
+    wxRegion(const wxRegion& r)
+        : wxGDIObject()
+    { Ref(r); }
+    wxRegion& operator = (const wxRegion& r)
+    { Ref(r); return (*this); }
+    
+    //# Modify region
+    // Clear current region
+    void Clear();
+    
+    // Union rectangle or region with this.
+    bool Union(long x, long y, long width, long 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(long x, long y, long width, long 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.
-	inline bool Subtract(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_DIFF); }
-	inline bool Subtract(const wxRect& rect)  { return Combine(rect, wxRGN_DIFF); }
-	inline bool Subtract(const wxRegion& region)  { return Combine(region, wxRGN_DIFF); }
-
-	// XOR: the union of two combined regions except for any overlapping areas.
-	inline bool Xor(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_XOR); }
-	inline bool Xor(const wxRect& rect)  { return Combine(rect, wxRGN_XOR); }
-	inline bool Xor(const wxRegion& region)  { return Combine(region, wxRGN_XOR); }
-
-	//# Information on region
-	// Outer bounds of region
-	void GetBox(long& x, long& y, long&w, long &h) const;
-	wxRect GetBox() const ;
-
-	// Is region empty?
-	bool Empty() const;
+    bool Subtract(long x, long y, long width, long 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(long x, long y, long width, long 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() const ;
+    
+    // Is region empty?
+    bool Empty() const;
     inline bool IsEmpty() const { return Empty(); }
-
-	//# Tests
-	// Does the region contain the point (x,y)?
-	wxRegionContain Contains(long x, long 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(long x, long y, long w, long h) const;
-	// Does the region contain the rectangle rect?
-	wxRegionContain Contains(const wxRect& rect) const;
-
-// Internal
-	bool Combine(long x, long y, long width, long height, wxRegionOp op);
-	bool Combine(const wxRegion& region, wxRegionOp op);
-	bool Combine(const wxRect& rect, wxRegionOp op);
+    
+    //# Tests
+    // Does the region contain the point (x,y)?
+    wxRegionContain Contains(long x, long 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(long x, long y, long w, long h) const;
+    // Does the region contain the rectangle rect?
+    wxRegionContain Contains(const wxRect& rect) const;
+    
+    // Internal
+    bool Combine(long x, long y, long width, long height, wxRegionOp op);
+    bool Combine(const wxRegion& region, wxRegionOp op);
+    bool Combine(const wxRect& rect, wxRegionOp op);
+    const WXHRGN GetWXHRGN() const ;
 };
 
-class WXDLLEXPORT wxRegionIterator : public wxObject {
-DECLARE_DYNAMIC_CLASS(wxRegionIterator);
+class WXDLLEXPORT wxRegionIterator : public wxObject
+{
+    DECLARE_DYNAMIC_CLASS(wxRegionIterator)
+        
 public:
-	wxRegionIterator();
-	wxRegionIterator(const wxRegion& region);
-	~wxRegionIterator();
-
-	void Reset() { m_current = 0; }
-	void Reset(const wxRegion& region);
-
-	operator bool () const { return m_current < m_numRects; }
-	bool HaveRects() const { return m_current < m_numRects; }
-
-	void operator ++ ();
-	void operator ++ (int);
-
-	long GetX() const;
-	long GetY() const;
-	long GetW() const;
-	long GetWidth() const { return GetW(); }
-	long GetH() const;
-	long GetHeight() const { return GetH(); }
+    wxRegionIterator();
+    wxRegionIterator(const wxRegion& region);
+    wxRegionIterator(const wxRegionIterator& iterator);
+    ~wxRegionIterator();
+
+    wxRegionIterator& operator=(const wxRegionIterator& iterator);
+
+    void Reset() { m_current = 0; }
+    void Reset(const wxRegion& region);
+    
+    operator bool () const { return m_current < m_numRects; }
+    bool HaveRects() const { return m_current < m_numRects; }
+
+    wxRegionIterator& operator++();
+    wxRegionIterator operator++(int);
+    
+    long GetX() const;
+    long GetY() const;
+    long GetW() const;
+    long GetWidth() const { return GetW(); }
+    long GetH() const;
+    long GetHeight() const { return GetH(); }
     wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
-
 private:
-	long	 m_current;
-	long	 m_numRects;
-	wxRegion m_region;
+    void SetRects(long numRects, wxRect *rects);
+
+    long     m_current;
+    long     m_numRects;
+    wxRegion m_region;
     wxRect*  m_rects;
 };