X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e320a79f187558effb04d92020b470372bbe456..8cb9f0d0f82650b707adc39823a73531d080ffec:/include/wx/os2/region.h

diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h
index 04d143c2e9..e524cc157e 100644
--- a/include/wx/os2/region.h
+++ b/include/wx/os2/region.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        region.h
 // Purpose:     wxRegion class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/15/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_REGION_H_
 #define _WX_REGION_H_
 
-#ifdef __GNUG__
-#pragma interface "region.h"
-#endif
-
 #include "wx/list.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
@@ -24,7 +20,7 @@ class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxPoint;
 
 enum wxRegionContain {
-	wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
+    wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
 };
 
 // So far, for internal use only
@@ -38,100 +34,105 @@ wxRGN_XOR           // Creates the union of two combined regions except for any
 
 class WXDLLEXPORT wxRegion : public wxGDIObject {
 DECLARE_DYNAMIC_CLASS(wxRegion);
-	friend class WXDLLEXPORT wxRegionIterator;
+    friend class WXDLLEXPORT wxRegionIterator;
 public:
-    wxRegion(long x, long y, long w, long h);
+    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(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); // Hangs on to this region
+
+    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(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;
+    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(); }
 
-	//# 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;
+    //# 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(long x, long y, long width, long height, wxRegionOp op);
-	bool Combine(const wxRegion& region, wxRegionOp op);
-	bool Combine(const wxRect& rect, wxRegionOp op);
+    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 internal region handle
+    WXHRGN GetHRGN() const;
 };
 
 class WXDLLEXPORT wxRegionIterator : public wxObject {
 DECLARE_DYNAMIC_CLASS(wxRegionIterator);
 public:
-	wxRegionIterator();
-	wxRegionIterator(const wxRegion& region);
-	~wxRegionIterator();
+    wxRegionIterator();
+    wxRegionIterator(const wxRegion& region);
+    ~wxRegionIterator();
 
-	void Reset() { m_current = 0; }
-	void Reset(const wxRegion& region);
+    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; }
+    operator bool () const { return m_current < m_numRects; }
+    bool HaveRects() const { return m_current < m_numRects; }
 
-	void operator ++ ();
-	void operator ++ (int);
+    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(); }
+    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:
-	long	 m_current;
-	long	 m_numRects;
-	wxRegion m_region;
+    long     m_current;
+    long     m_numRects;
+    wxRegion m_region;
     wxRect*  m_rects;
 };
 
 #endif
-	// _WX_REGION_H_
+    // _WX_REGION_H_