Window management and sizer layout corrections

[wxWidgets.git] / include / wx / gtk1 / region.h

diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h
index 7369192305fbbe78871d9e3b9a9bb70cd83c9790..c4f58a97d773845bd66ed7f80a0b5643cdc282d3 100644 (file)
--- a/include/wx/gtk1/region.h
+++ b/include/wx/gtk1/region.h
@@ -30,13 +30,13 @@ class wxRegion;
 
 enum wxRegionContain
 {
 
 enum wxRegionContain
 {

-    wxOutRegion = 0, 
-    wxPartRegion = 1, 
+    wxOutRegion = 0,
+    wxPartRegion = 1,

     wxInRegion = 2
 };
 
 // So far, for internal use only
     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_COPY,         // Creates a copy of the region identified by hrgnSrc1.


@@ -45,29 +45,46 @@ enum wxRegionOp
    wxRGN_XOR           // Creates the union of two combined regions except for any overlapping areas.
 };
 
    wxRGN_XOR           // Creates the union of two combined regions except for any overlapping areas.
 };
 

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxRegion
 // wxRegion

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 class wxRegion : public wxGDIObject
 {
 public:
 
 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( 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 );

     ~wxRegion();
 
     ~wxRegion();
 

-    inline wxRegion( const wxRegion& r ): wxGDIObject()
-      { Ref(r); }
-    inline wxRegion& operator = ( const wxRegion& r )
-      { Ref(r); return (*this); }
+    wxRegion( const wxRegion& region ) { Ref(region); }
+    wxRegion& operator = ( const wxRegion& region ) { Ref(region); return *this; }
+
+    bool Ok() const { return m_refData != NULL; }

 
     bool operator == ( const wxRegion& region );
 
     bool operator == ( const wxRegion& region );

-    bool operator != ( const wxRegion& region );
+    bool operator != ( const wxRegion& region ) { return !(*this == region); }

 
     void Clear();
 
 
     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 );
     bool Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
     bool Union( const wxRect& rect );
     bool Union( const wxRegion& region );


@@ -96,13 +113,24 @@ public:
     wxRegionContain Contains(const wxRect& rect) const;
 
 public:
     wxRegionContain Contains(const wxRect& rect) const;
 
 public:

-    wxList    *GetRectList() const;

     GdkRegion *GetRegion() const;
     GdkRegion *GetRegion() const;

+
+protected:
+    // ref counting code
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;

     
     

+    // common part of ctors for a rectangle region
+    void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
+

 private:
 private:

-  DECLARE_DYNAMIC_CLASS(wxRegion);
+    DECLARE_DYNAMIC_CLASS(wxRegion);

 };
 
 };
 

+// ----------------------------------------------------------------------------
+// wxRegionIterator: decomposes a region into rectangles
+// ----------------------------------------------------------------------------
+

 class wxRegionIterator: public wxObject
 {
 public:
 class wxRegionIterator: public wxObject
 {
 public:


@@ -124,7 +152,7 @@ public:
     wxCoord GetWidth() const { return GetW(); }
     wxCoord GetH() const;
     wxCoord GetHeight() const { return GetH(); }
     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;
 
 private:
     size_t   m_current;