fix memory leak as Dimitri suggested

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

diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h
index c4f58a97d773845bd66ed7f80a0b5643cdc282d3..51e739c73f437c75a8448635952c0f0d7a82a85d 100644 (file)
--- a/include/wx/gtk1/region.h
+++ b/include/wx/gtk1/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);
@@ -73,7 +73,9 @@ public:
     wxRegion( size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
     ~wxRegion();
 
-    wxRegion( const wxRegion& region ) { Ref(region); }
+    wxRegion( const wxRegion& region )
+        : wxGDIObject()
+        { Ref(region); }
     wxRegion& operator = ( const wxRegion& region ) { Ref(region); return *this; }
 
     bool Ok() const { return m_refData != NULL; }
@@ -113,6 +115,10 @@ public:
     wxRegionContain Contains(const wxRect& rect) const;
 
 public:
+    // 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:
@@ -140,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;