X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ccf6cd7ea228a58ac43989760651796ec8d8600..ac0c4cc396523e217cde2c605e670674b4990de2:/include/wx/motif/region.h?ds=sidebyside

diff --git a/include/wx/motif/region.h b/include/wx/motif/region.h
index ffd3e993db..052eb872f7 100644
--- a/include/wx/motif/region.h
+++ b/include/wx/motif/region.h
@@ -28,91 +28,91 @@ WX_DECLARE_LIST(wxRect, wxRectList);
 
 
 enum wxRegionContain {
-	wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
+    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.
+    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 {
-DECLARE_DYNAMIC_CLASS(wxRegion);
-	friend class WXDLLEXPORT wxRegionIterator;
+    DECLARE_DYNAMIC_CLASS(wxRegion)
+        friend class WXDLLEXPORT wxRegionIterator;
 public:
     wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord 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(wxCoord x, wxCoord y, wxCoord width, wxCoord 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(wxCoord x, wxCoord y, wxCoord width, wxCoord 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();
+    ~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(wxCoord x, wxCoord y, wxCoord width, wxCoord 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(wxCoord x, wxCoord y, wxCoord width, wxCoord 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:
     // Combines the parts of 'this' that are not part of the second region.
-	inline bool Subtract(wxCoord x, wxCoord y, wxCoord width, wxCoord 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(wxCoord x, wxCoord y, wxCoord width, wxCoord 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(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const;
-	wxRect GetBox() const ;
-
-	// Is region empty?
-	bool Empty() const;
-        inline bool IsEmpty() const { return Empty(); }
-        bool Ok() const { return (m_refData != NULL) ; }
-
-	//# 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);
-
+    inline bool Subtract(wxCoord x, wxCoord y, wxCoord width, wxCoord 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(wxCoord x, wxCoord y, wxCoord width, wxCoord 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(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const;
+    wxRect GetBox() const ;
+    
+    // Is region empty?
+    bool Empty() const;
+    inline bool IsEmpty() const { return Empty(); }
+    bool Ok() const { return (m_refData != NULL) ; }
+    
+    //# 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);
+    
     // Get the internal Region handle
     WXRegion GetXRegion() const;
-
-// 'Naughty' functions that allow wxWindows to use a list of rects
-// instead of the region, in certain circumstances (e.g. when
-// making a region out of the update rectangles).
-// These are used by wxPaintDC::wxPaintDC and wxRegionIterator::Reset.
+    
+    // 'Naughty' functions that allow wxWindows to use a list of rects
+    // instead of the region, in certain circumstances (e.g. when
+    // making a region out of the update rectangles).
+    // These are used by wxPaintDC::wxPaintDC and wxRegionIterator::Reset.
     bool UsingRects() const;
     wxRect* GetRects();
     int GetRectCount() const;
@@ -121,35 +121,35 @@ public:
 };
 
 class WXDLLEXPORT wxRegionIterator : public wxObject {
-DECLARE_DYNAMIC_CLASS(wxRegionIterator);
+    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);
-
-	wxCoord GetX() const;
-	wxCoord GetY() const;
-	wxCoord GetW() const;
-	wxCoord GetWidth() const { return GetW(); }
-	wxCoord GetH() const;
-	wxCoord GetHeight() const { return GetH(); }
-        wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
-
+    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);
+    
+    wxCoord GetX() const;
+    wxCoord GetY() const;
+    wxCoord GetW() const;
+    wxCoord GetWidth() const { return GetW(); }
+    wxCoord GetH() const;
+    wxCoord GetHeight() const { return GetH(); }
+    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
+    
 private:
-	size_t	 m_current;
-	size_t	 m_numRects;
-	wxRegion m_region;
-        wxRect*  m_rects;
+    size_t	 m_current;
+    size_t	 m_numRects;
+    wxRegion m_region;
+    wxRect*  m_rects;
 };
 
 #endif
-	// _WX_REGION_H_
+// _WX_REGION_H_