X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1208c3103734c8581c9854c344b97323e381897..cafbad8f17e0c3f1f4453dfd098ac3fa09eaa4a0:/include/wx/gtk/region.h

diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 7369192305..d98a1f9cff 100644
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/region.h
@@ -30,13 +30,13 @@ class wxRegion;
 
 enum wxRegionContain
 {
-    wxOutRegion = 0, 
-    wxPartRegion = 1, 
+    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.
@@ -45,29 +45,44 @@ enum wxRegionOp
    wxRGN_XOR           // Creates the union of two combined regions except for any overlapping areas.
 };
 
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // wxRegion
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
 class wxRegion : public wxGDIObject
 {
 public:
-    wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h );
-    wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight );
-    wxRegion( const wxRect& rect );
-    wxRegion();
-    ~wxRegion();
+    wxRegion() { }
+
+    wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
+    {
+        InitRect(x, y, w, h);
+    }
+
+    wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight )
+    {
+        InitRect(topLeft.x, topLeft.y,
+                 bottomRight.x - topLeft.x, bottomRight.y - topLeft.y);
+    }
+
+    wxRegion( const wxRect& rect )
+    {
+        InitRect(rect.x, rect.y, rect.width, rect.height);
+    }
+
+    wxRegion( size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
+    virtual ~wxRegion();
 
-    inline wxRegion( const wxRegion& r ): wxGDIObject()
-      { Ref(r); }
-    inline wxRegion& operator = ( const wxRegion& r )
-      { Ref(r); return (*this); }
+    wxRegion( const wxRegion& r ) { Ref(r); }
+    wxRegion& operator = ( const wxRegion& r ) { Ref(r); return *this; }
 
     bool operator == ( const wxRegion& region );
     bool operator != ( const wxRegion& region );
 
     void Clear();
 
+    bool Offset( wxCoord x, wxCoord y );
+
     bool Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
     bool Union( const wxRect& rect );
     bool Union( const wxRegion& region );
@@ -98,11 +113,22 @@ public:
 public:
     wxList    *GetRectList() const;
     GdkRegion *GetRegion() const;
-    
+
+protected:
+    // common part of ctors for a rectangle region
+    void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
+
+    // helper of Intersect()
+    bool IntersectRegionOnly(const wxRegion& reg);
+
 private:
-  DECLARE_DYNAMIC_CLASS(wxRegion);
+    DECLARE_DYNAMIC_CLASS(wxRegion);
 };
 
+// ----------------------------------------------------------------------------
+// wxRegionIterator: decomposes a region into rectangles
+// ----------------------------------------------------------------------------
+
 class wxRegionIterator: public wxObject
 {
 public:
@@ -124,7 +150,7 @@ public:
     wxCoord GetWidth() const { return GetW(); }
     wxCoord GetH() const;
     wxCoord GetHeight() const { return GetH(); }
-    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
+    wxRect GetRect() const;
 
 private:
     size_t   m_current;