X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9fe4c99cc5e3cb63ae2fecfdb9e892781732cad6..ec75d791f043b3b43cac9825a2c62e9d5321e616:/include/wx/gtk/region.h?ds=sidebyside

diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index d98a1f9cff..51e739c73f 100644
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/region.h
@@ -10,7 +10,7 @@
 #ifndef _WX_GTK_REGION_H_
 #define _WX_GTK_REGION_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
@@ -53,7 +53,7 @@ class wxRegion : public wxGDIObject
 {
 public:
     wxRegion() { }
-
+    
     wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
     {
         InitRect(x, y, w, h);
@@ -71,13 +71,17 @@ public:
     }
 
     wxRegion( size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
-    virtual ~wxRegion();
+    ~wxRegion();
+
+    wxRegion( const wxRegion& region )
+        : wxGDIObject()
+        { Ref(region); }
+    wxRegion& operator = ( const wxRegion& region ) { Ref(region); return *this; }
 
-    wxRegion( const wxRegion& r ) { Ref(r); }
-    wxRegion& operator = ( const wxRegion& r ) { Ref(r); return *this; }
+    bool Ok() const { return m_refData != NULL; }
 
     bool operator == ( const wxRegion& region );
-    bool operator != ( const wxRegion& region );
+    bool operator != ( const wxRegion& region ) { return !(*this == region); }
 
     void Clear();
 
@@ -111,16 +115,20 @@ public:
     wxRegionContain Contains(const wxRect& rect) const;
 
 public:
-    wxList    *GetRectList() const;
+    // Init with GdkRegion, set ref count to 2 so that
+    // the C++ class will not destroy the region!
+    wxRegion( GdkRegion *region );
+    
     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);
 
-    // helper of Intersect()
-    bool IntersectRegionOnly(const wxRegion& reg);
-
 private:
     DECLARE_DYNAMIC_CLASS(wxRegion);
 };
@@ -138,11 +146,11 @@ public:
     void Reset() { m_current = 0u; }
     void Reset(const wxRegion& region);
 
-    operator bool () const;
     bool HaveRects() const;
+    operator bool () const { return HaveRects(); }
 
-    void operator ++ ();
-    void operator ++ (int);
+    wxRegionIterator& operator ++ ();
+    wxRegionIterator operator ++ (int);
 
     wxCoord GetX() const;
     wxCoord GetY() const;