fixed a serious bug in Shrink()

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

diff --git a/include/wx/mac/region.h b/include/wx/mac/region.h
index ee40f921f7e88d3f5c76ff5709bc50cf21f50334..e91e4ab36df6b7f66953bbdb306acae763763c8c 100644 (file)
--- a/include/wx/mac/region.h
+++ b/include/wx/mac/region.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        region.h
 // Purpose:     wxRegion class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_REGION_H_
 #define _WX_REGION_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "region.h"
 #endif
 
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxPoint;
 
 enum wxRegionContain {
-       wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
+    wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
 };
 
 // So far, for internal use only
@@ -38,7 +38,7 @@ wxRGN_XOR           // Creates the union of two combined regions except for any
 
 class WXDLLEXPORT wxRegion : public wxGDIObject {
 DECLARE_DYNAMIC_CLASS(wxRegion);
-       friend class WXDLLEXPORT wxRegionIterator;
+    friend class WXDLLEXPORT wxRegionIterator;
 public:
     wxRegion(long x, long y, long w, long h);
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
@@ -128,13 +128,13 @@ public:
     ~wxRegionIterator();
 
     wxRegionIterator& operator=(const wxRegionIterator& iterator);
-    
+
     void Reset() { m_current = 0; }
     void Reset(const wxRegion& region);
     
     operator bool () const { return m_current < m_numRects; }
     bool HaveRects() const { return m_current < m_numRects; }
-    
+
     wxRegionIterator& operator++();
     wxRegionIterator operator++(int);
     
@@ -146,6 +146,8 @@ public:
     long GetHeight() const { return GetH(); }
     wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
 private:
+    void SetRects(long numRects, wxRect *rects);
+
     long     m_current;
     long     m_numRects;
     wxRegion m_region;
@@ -153,4 +155,4 @@ private:
 };
 
 #endif
-       // _WX_REGION_H_
+    // _WX_REGION_H_