added support for polygons to wxRegion

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

docs/changes.txt

@@ -17,6 +17,7 @@ All (GUI):
 - support for virtual list control added
 - wxFindReplaceDialog added (based on work of Markus Greither)
 - wxTextCtrl::SetMaxLength() added (wxMSW/wxGTK)
+- polygon support in wxRegion (Klaas Holwerda)
 
 wxHTML:
 

docs/latex/wx/region.tex

@@ -40,6 +40,14 @@ Constructs a rectangular region a wxRect object.
 
 Constructs a region by copying another region.
 
+\func{}{wxRegion}{\param{size\_t}{ n}, \param{const wxPoint }{*points}, \param{int }{fillStyle = wxWINDING\_RULE}}
+
+Constructs a region corresponding to the polygon made of {\it n} points in the
+provided array. {\it fillStyle} parameter may have values 
+{\tt wxWINDING\_RULE} or {\tt wxODDEVEN\_RULE}.
+
+{\bf NB:} This constructor is only implemented for Win32 and GTK+ wxWindows ports.
+
 \membersection{wxRegion::\destruct{wxRegion}}
 
 \func{}{\destruct{wxRegion}}{\void}

include/wx/gtk/region.h

@@ -52,10 +52,11 @@ enum wxRegionOp
 class wxRegion : public wxGDIObject
 {
 public:
+    wxRegion();
     wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h );
     wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight );
     wxRegion( const wxRect& rect );
-    wxRegion();
+    wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
     virtual ~wxRegion();
 
     wxRegion( const wxRegion& r ) { Ref(r); }

include/wx/gtk1/region.h

@@ -52,10 +52,11 @@ enum wxRegionOp
 class wxRegion : public wxGDIObject
 {
 public:
+    wxRegion();
     wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h );
     wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight );
     wxRegion( const wxRect& rect );
-    wxRegion();
+    wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
     virtual ~wxRegion();
 
     wxRegion( const wxRegion& r ) { Ref(r); }

include/wx/msw/region.h

@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        region.h
+// Name:        wx/msw/region.h
 // Purpose:     wxRegion class
 // Author:      Markus Holzem, Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_REGION_H_
@@ -23,123 +23,132 @@
 class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxPoint;
 
-enum wxRegionContain {
+enum wxRegionContain
-	wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
+{
+    wxOutRegion = 0,
+    wxPartRegion = 1,
+    wxInRegion = 2
 };
 
 // So far, for internal use only
-enum wxRegionOp {
+enum wxRegionOp
-wxRGN_AND,          // Creates the intersection of the two combined regions.
+{
-wxRGN_COPY,         // Creates a copy of the region identified by hrgnSrc1.
+    wxRGN_AND,          // Creates the intersection of the two combined regions.
-wxRGN_DIFF,         // Combines the parts of hrgnSrc1 that are not part of hrgnSrc2.
+    wxRGN_COPY,         // Creates a copy of the region identified by hrgnSrc1.
-wxRGN_OR,           // Creates the union of two combined regions.
+    wxRGN_DIFF,         // Combines the parts of hrgnSrc1 that are not part of hrgnSrc2.
-wxRGN_XOR           // Creates the union of two combined regions except for any overlapping areas.
+    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 wxGDIObject
-DECLARE_DYNAMIC_CLASS(wxRegion);
+{
-	friend class WXDLLEXPORT wxRegionIterator;
 public:
+    wxRegion();
     wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
     wxRegion(WXHRGN hRegion); // Hangs on to this region
+    wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
 
-	wxRegion(void);
+    virtual ~wxRegion();
-	~wxRegion(void);
 
-	//# Copying
+    // Copying
-	inline wxRegion(const wxRegion& r)
+    wxRegion(const wxRegion& r)
-		{ Ref(r); }
+        { Ref(r); }
-	inline wxRegion& operator = (const wxRegion& r)
+    wxRegion& operator = (const wxRegion& r)
-		{ Ref(r); return (*this); }
+        { Ref(r); return (*this); }
 
-	//# Modify region
+    // Modify region
-	// Clear current region
+    // Clear current region
-	void Clear(void);
+    void Clear(void);
 
-	// Union rectangle or region with this.
+    // 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(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 wxRect& rect) { return Combine(rect, wxRGN_OR); }
-	inline bool Union(const wxRegion& region) { return Combine(region, wxRGN_OR); }
+    inline bool Union(const wxRegion& region) { return Combine(region, wxRGN_OR); }
 
-	// Intersect rectangle or region with this.
+    // 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(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 wxRect& rect)  { return Combine(rect, wxRGN_AND); }
-	inline bool Intersect(const wxRegion& region)  { return Combine(region, wxRGN_AND); }
+    inline bool Intersect(const wxRegion& region)  { return Combine(region, wxRGN_AND); }
 
-	// Subtract rectangle or region from this:
+    // 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(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 wxRect& rect)  { return Combine(rect, wxRGN_DIFF); }
-	inline bool Subtract(const wxRegion& region)  { return Combine(region, 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.
+    // 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(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 wxRect& rect)  { return Combine(rect, wxRGN_XOR); }
-	inline bool Xor(const wxRegion& region)  { return Combine(region, wxRGN_XOR); }
+    inline bool Xor(const wxRegion& region)  { return Combine(region, wxRGN_XOR); }
 
-	//# Information on region
+    // Information on region
-	// Outer bounds of region
+    // Outer bounds of region
-	void GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const;
+    void GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const;
-	wxRect GetBox(void) const ;
+    wxRect GetBox(void) const ;
 
-	// Is region empty?
+    // Is region empty?
-	bool Empty(void) const;
+    bool Empty(void) const;
     inline bool IsEmpty(void) const { return Empty(); }
 
-	//# Tests
+    // Tests
-	// Does the region contain the point (x,y)?
+    // Does the region contain the point (x,y)?
-	wxRegionContain Contains(wxCoord x, wxCoord y) const;
+    wxRegionContain Contains(wxCoord x, wxCoord y) const;
-	// Does the region contain the point pt?
+    // Does the region contain the point pt?
-	wxRegionContain Contains(const wxPoint& pt) const;
+    wxRegionContain Contains(const wxPoint& pt) const;
-	// Does the region contain the rectangle (x, y, w, h)?
+    // Does the region contain the rectangle (x, y, w, h)?
-	wxRegionContain Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h) const;
+    wxRegionContain Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h) const;
-	// Does the region contain the rectangle rect?
+    // Does the region contain the rectangle rect?
-	wxRegionContain Contains(const wxRect& rect) const;
+    wxRegionContain Contains(const wxRect& rect) const;
 
 // Internal
-	bool Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord 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 wxRegion& region, wxRegionOp op);
-	bool Combine(const wxRect& rect, wxRegionOp op);
+    bool Combine(const wxRect& rect, wxRegionOp op);
 
     // Get internal region handle
     WXHRGN GetHRGN() const;
+
+    DECLARE_DYNAMIC_CLASS(wxRegion);
+    friend class WXDLLEXPORT wxRegionIterator;
 };
 
-class WXDLLEXPORT wxRegionIterator : public wxObject {
+class WXDLLEXPORT wxRegionIterator : public wxObject
-DECLARE_DYNAMIC_CLASS(wxRegionIterator);
+{
 public:
-	wxRegionIterator(void);
+    wxRegionIterator(void);
-	wxRegionIterator(const wxRegion& region);
+    wxRegionIterator(const wxRegion& region);
-	~wxRegionIterator(void);
+    ~wxRegionIterator(void);
 
-	void Reset(void) { m_current = 0; }
+    void Reset(void) { m_current = 0; }
-	void Reset(const wxRegion& region);
+    void Reset(const wxRegion& region);
 
 #ifndef __SALFORDC__
-	operator bool (void) const { return (m_current < m_numRects); }
+    operator bool (void) const { return (m_current < m_numRects); }
 #endif
 
-	bool HaveRects(void) const { return (m_current < m_numRects); }
+    bool HaveRects(void) const { return (m_current < m_numRects); }
 
-	void operator ++ (void);
+    void operator ++ (void);
-	void operator ++ (int);
+    void operator ++ (int);
 
-	wxCoord GetX(void) const;
+    wxCoord GetX(void) const;
-	wxCoord GetY(void) const;
+    wxCoord GetY(void) const;
-	wxCoord GetW(void) const;
+    wxCoord GetW(void) const;
-	wxCoord GetWidth(void) const { return GetW(); }
+    wxCoord GetWidth(void) const { return GetW(); }
-	wxCoord GetH(void) const;
+    wxCoord GetH(void) const;
-	wxCoord GetHeight(void) const { return GetH(); }
+    wxCoord GetHeight(void) const { return GetH(); }
     wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
 
 private:
-	long	 m_current;
+    long     m_current;
-	long	 m_numRects;
+    long     m_numRects;
-	wxRegion m_region;
+    wxRegion m_region;
     wxRect*  m_rects;
+
+    DECLARE_DYNAMIC_CLASS(wxRegionIterator);
 };
 
 #endif
-	// _WX_REGION_H_
+    // _WX_REGION_H_

src/gtk/region.cpp

@@ -186,6 +186,30 @@ wxRegion::wxRegion( const wxRect& rect )
 #endif
 }
 
+wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle )
+{
+    GdkPoint *gdkpoints = new GdkPoint[n];
+    for ( size_t i = 0 ; i < n ; i++ )
+    {
+        gdkpoints[i].x = points[i].x;
+        gdkpoints[i].y = points[i].y;
+    }
+
+    m_refData = new wxRegionRefData();
+
+    GdkRegion* reg = gdk_region_polygon
+                     (
+                        gdkpoints,
+                        n,
+                        fillStyle == wxWINDING_RULE ? GDK_WINDING_RULE
+                                                    : GDK_EVEN_ODD_RULE
+                     );
+
+    M_REGIONDATA->m_region = reg;
+
+    delete [] gdkpoints;
+}
+
 wxRegion::~wxRegion()
 {
 }

src/gtk1/region.cpp

@@ -186,6 +186,30 @@ wxRegion::wxRegion( const wxRect& rect )
 #endif
 }
 
+wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle )
+{
+    GdkPoint *gdkpoints = new GdkPoint[n];
+    for ( size_t i = 0 ; i < n ; i++ )
+    {
+        gdkpoints[i].x = points[i].x;
+        gdkpoints[i].y = points[i].y;
+    }
+
+    m_refData = new wxRegionRefData();
+
+    GdkRegion* reg = gdk_region_polygon
+                     (
+                        gdkpoints,
+                        n,
+                        fillStyle == wxWINDING_RULE ? GDK_WINDING_RULE
+                                                    : GDK_EVEN_ODD_RULE
+                     );
+
+    M_REGIONDATA->m_region = reg;
+
+    delete [] gdkpoints;
+}
+
 wxRegion::~wxRegion()
 {
 }

src/msw/region.cpp

@@ -103,6 +103,17 @@ wxRegion::wxRegion(const wxRect& rect)
     M_REGION = ::CreateRectRgn(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
 }
 
+wxRegion::wxRegion(size_t n, const wxPoint *points, int fillStyle)
+{
+    m_refData = new wxRegionRefData;
+    M_REGION = ::CreatePolygonRgn
+               (
+                    (POINT*)points,
+                    n,
+                    fillStyle == wxODDEVEN_RULE ? ALTERNATE : WINDING
+               );
+}
+
 /*
  * Destroy the region.
  */