X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b6dbb09746f8f5ee0549a2ff39ae0ac4c725898..bd3e41f6003fa1d589c1477a327931c3f57516f2:/include/wx/motif/region.h

diff --git a/include/wx/motif/region.h b/include/wx/motif/region.h
index 99a2ef63f9..ffd3e993db 100644
--- a/include/wx/motif/region.h
+++ b/include/wx/motif/region.h
@@ -18,9 +18,14 @@
 
 #include "wx/list.h"
 #include "wx/gdiobj.h"
+#include "wx/gdicmn.h"
+
+// ----------------------------------------------------------------------------
+// A list of rectangles type used by wxRegion and wxWindow
+// ----------------------------------------------------------------------------
+
+WX_DECLARE_LIST(wxRect, wxRectList);
 
-class WXDLLEXPORT wxRect;
-class WXDLLEXPORT wxPoint;
 
 enum wxRegionContain {
 	wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
@@ -39,7 +44,7 @@ class WXDLLEXPORT wxRegion : public wxGDIObject {
 DECLARE_DYNAMIC_CLASS(wxRegion);
 	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();
@@ -56,49 +61,63 @@ public:
 	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(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(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_AND); }
+	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(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(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_XOR); }
+	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(long& x, long& y, long&w, long &h) const;
+	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(); }
+        inline bool IsEmpty() const { return Empty(); }
+        bool Ok() const { return (m_refData != NULL) ; }
 
 	//# Tests
 	// Does the region contain the point (x,y)?
-	wxRegionContain Contains(long x, long y) const;
+	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(long x, long y, long w, long h) const;
+	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(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.
+    bool UsingRects() const;
+    wxRect* GetRects();
+    int GetRectCount() const;
+    void SetRects(const wxRectList& rectList);
+    void SetRects(int count, const wxRect* rects);
 };
 
 class WXDLLEXPORT wxRegionIterator : public wxObject {
@@ -117,18 +136,19 @@ public:
 	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;
+	size_t	 m_current;
+	size_t	 m_numRects;
 	wxRegion m_region;
-    wxRect*  m_rects;
+        wxRect*  m_rects;
 };
 
 #endif