Initial commit of native OS X list ctrl support. Compile tested on Win, Mac, FC4...

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

diff --git a/include/wx/mac/carbon/region.h b/include/wx/mac/carbon/region.h
index 24c060337f53a0b1c71d2ce3cbe55030ae52fd08..e0f51c0f2ee8a8a30bf4e648a04a7d5e4cc9e2e2 100644 (file)
--- a/include/wx/mac/carbon/region.h
+++ b/include/wx/mac/carbon/region.h
@@ -12,10 +12,6 @@
 #ifndef _WX_REGION_H_
 #define _WX_REGION_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "region.h"
-#endif
-
 #include "wx/list.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
@@ -23,10 +19,6 @@
 class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxPoint;
 
-enum wxRegionContain {
-    wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
-};
-
 // So far, for internal use only
 enum wxRegionOp {
 wxRGN_AND,          // Creates the intersection of the two combined regions.
@@ -37,13 +29,14 @@ wxRGN_XOR           // Creates the union of two combined regions except for any
 };
 
 class WXDLLEXPORT wxRegion : public wxGDIObject {
-DECLARE_DYNAMIC_CLASS(wxRegion);
+DECLARE_DYNAMIC_CLASS(wxRegion)
     friend class WXDLLEXPORT wxRegionIterator;
 public:
     wxRegion(long x, long y, long w, long h);
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
     wxRegion( WXHRGN hRegion );
+    wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
     wxRegion();
     wxRegion(const wxBitmap& bmp)
     {
@@ -55,19 +48,15 @@ public:
         Union(bmp, transColour, tolerance);
     }
 
-    ~wxRegion();
-
-    //# Copying
-    wxRegion(const wxRegion& r)
-        : wxGDIObject()
-    { Ref(r); }
-    wxRegion& operator = (const wxRegion& r)
-    { Ref(r); return (*this); }
+    virtual ~wxRegion();
 
     //# Modify region
     // Clear current region
     void Clear();
 
+    // Move the region
+    bool Offset(wxCoord x, wxCoord y);
+
     // Union rectangle or region with this.
     bool Union(long x, long y, long width, long height)
         { return Combine(x, y, width, height, wxRGN_OR); }
@@ -148,7 +137,7 @@ public:
     wxRegionIterator();
     wxRegionIterator(const wxRegion& region);
     wxRegionIterator(const wxRegionIterator& iterator);
-    ~wxRegionIterator();
+    virtual ~wxRegionIterator();
 
     wxRegionIterator& operator=(const wxRegionIterator& iterator);