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 89541c1d1587ee5accd7917e27faa11cf8c3b53a..c4f58a97d773845bd66ed7f80a0b5643cdc282d3 100644 (file)
--- a/include/wx/gtk1/region.h
+++ b/include/wx/gtk1/region.h
@@ -52,21 +52,37 @@ enum wxRegionOp
 class wxRegion : public wxGDIObject
 {
 public:
 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(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
-    virtual ~wxRegion();
+    wxRegion() { }

 
 

-    wxRegion( const wxRegion& r ) { Ref(r); }
-    wxRegion& operator = ( const wxRegion& r ) { Ref(r); return *this; }
+    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( 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 Offset( wxCoord x, wxCoord y );
 
     bool Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height );


@@ -97,15 +113,15 @@ public:
     wxRegionContain Contains(const wxRect& rect) const;
 
 public:
     wxRegionContain Contains(const wxRect& rect) const;
 
 public:

-    wxList    *GetRectList() const;

     GdkRegion *GetRegion() const;
 
 protected:
     GdkRegion *GetRegion() const;
 
 protected:

-    // helper of Intersect()
-    bool IntersectRegionOnly(const wxRegion& reg);
-
-    // call this before modifying the region
-    void Unshare();
+    // 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:
     DECLARE_DYNAMIC_CLASS(wxRegion);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxRegion);