SetTextColour is gone

[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 504a944e3b4416a537752455d981175fe9b05987..83f02a155e605af156fdfb000576bffcc149fba5 100644 (file)
--- a/include/wx/mac/carbon/region.h
+++ b/include/wx/mac/carbon/region.h
@@ -9,28 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_REGION_H_
-#define _WX_REGION_H_
+#ifndef _WX_MAC_CARBON_REGION_H_
+#define _WX_MAC_CARBON_REGION_H_

 
 #include "wx/list.h"
 
 #include "wx/list.h"

-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
-
-class WXDLLEXPORT wxRect;
-class WXDLLEXPORT wxPoint;
-
-// So far, for internal use only
-enum wxRegionOp {
-wxRGN_AND,          // Creates the intersection of the two combined regions.
-wxRGN_COPY,         // Creates a copy of the region identified by hrgnSrc1.
-wxRGN_DIFF,         // Combines the parts of hrgnSrc1 that are not part of hrgnSrc2.
-wxRGN_OR,           // Creates the union of two combined regions.
-wxRGN_XOR           // Creates the union of two combined regions except for any overlapping areas.
-};

 
 

-class WXDLLEXPORT wxRegion : public wxGDIObject {
-DECLARE_DYNAMIC_CLASS(wxRegion)
-    friend class WXDLLEXPORT wxRegionIterator;
+class WXDLLEXPORT wxRegion : public wxRegionWithCombine
+{

 public:
     wxRegion(long x, long y, long w, long h);
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
 public:
     wxRegion(long x, long y, long w, long h);
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);


@@ -48,96 +33,36 @@ public:
         Union(bmp, transColour, tolerance);
     }
 
         Union(bmp, transColour, tolerance);
     }
 

-    ~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); }
-    bool Union(const wxRect& rect)
-        { return Combine(rect, wxRGN_OR); }
-    bool Union(const wxRegion& region)
-        { return Combine(region, wxRGN_OR); }
-
-    // Intersect rectangle or region with this.
-    bool Intersect(long x, long y, long width, long height)
-        { return Combine(x, y, width, height, wxRGN_AND); }
-    bool Intersect(const wxRect& rect)
-        { return Combine(rect, wxRGN_AND); }
-    bool Intersect(const wxRegion& region)
-        { return Combine(region, wxRGN_AND); }
-
-    // Subtract rectangle or region from this:
-    // Combines the parts of 'this' that are not part of the second region.
-    bool Subtract(long x, long y, long width, long height)
-        { return Combine(x, y, width, height, wxRGN_DIFF); }
-    bool Subtract(const wxRect& rect)
-        { return Combine(rect, wxRGN_DIFF); }
-    bool Subtract(const wxRegion& region)
-        { return Combine(region, wxRGN_DIFF); }
-
-    // XOR: the union of two combined regions except for any overlapping areas.
-    bool Xor(long x, long y, long width, long height)
-        { return Combine(x, y, width, height, wxRGN_XOR); }
-    bool Xor(const wxRect& rect)
-        { return Combine(rect, wxRGN_XOR); }
-    bool Xor(const wxRegion& region)
-        { return Combine(region, wxRGN_XOR); }
-
-    //# Information on region
-    // Outer bounds of region
-    void GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const;
-    wxRect GetBox() const ;
-
-    // Is region empty?
-    bool Empty() const;
-    inline bool IsEmpty() const { return Empty(); }
-
-    //# Tests
-    // Does the region contain the point (x,y)?
-    wxRegionContain Contains(long x, long y) const;
-    // Does the region contain the point pt?
-    wxRegionContain Contains(const wxPoint& pt) const;
-    // Does the region contain the rectangle (x, y, w, h)?
-    wxRegionContain Contains(long x, long y, long w, long h) const;
-    // Does the region contain the rectangle rect?
-    wxRegionContain Contains(const wxRect& rect) const;
-
-    // Convert the region to a B&W bitmap with the white pixels being inside
-    // the region.
-    wxBitmap ConvertToBitmap() const;
-
-    // Use the non-transparent pixels of a wxBitmap for the region to combine
-    // with this region.  First version takes transparency from bitmap's mask,
-    // second lets the user specify the colour to be treated as transparent
-    // along with an optional tolerance value.
-    // NOTE: implemented in common/rgncmn.cpp
-    bool Union(const wxBitmap& bmp);
-    bool Union(const wxBitmap& bmp,
-               const wxColour& transColour, int tolerance = 0);
+    virtual ~wxRegion();
+
+    // wxRegionBase methods
+    virtual void Clear();
+    virtual bool IsEmpty() const;

 
     // Internal
 
     // Internal

-    bool Combine(long x, long y, long width, long height, wxRegionOp op);
-    bool Combine(const wxRegion& region, wxRegionOp op);
-    bool Combine(const wxRect& rect, wxRegionOp op);

     const WXHRGN GetWXHRGN() const ;
     const WXHRGN GetWXHRGN() const ;

+
+protected:
+    virtual bool DoIsEqual(const wxRegion& region) const;
+    virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const;
+    virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const;
+    virtual wxRegionContain DoContainsRect(const wxRect& rect) const;
+
+    virtual bool DoOffset(wxCoord x, wxCoord y);
+    virtual bool DoCombine(const wxRegion& region, wxRegionOp op);
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxRegion)
+    friend class WXDLLEXPORT wxRegionIterator;

 };
 
 class WXDLLEXPORT wxRegionIterator : public wxObject
 {
 };
 
 class WXDLLEXPORT wxRegionIterator : public wxObject
 {

-    DECLARE_DYNAMIC_CLASS(wxRegionIterator)
-

 public:
     wxRegionIterator();
     wxRegionIterator(const wxRegion& region);
     wxRegionIterator(const wxRegionIterator& iterator);
 public:
     wxRegionIterator();
     wxRegionIterator(const wxRegion& region);
     wxRegionIterator(const wxRegionIterator& iterator);

-    ~wxRegionIterator();
+    virtual ~wxRegionIterator();

 
     wxRegionIterator& operator=(const wxRegionIterator& iterator);
 
 
     wxRegionIterator& operator=(const wxRegionIterator& iterator);
 


@@ -157,6 +82,7 @@ public:
     long GetH() const;
     long GetHeight() const { return GetH(); }
     wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
     long GetH() const;
     long GetHeight() const { return GetH(); }
     wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }

+

 private:
     void SetRects(long numRects, wxRect *rects);
 
 private:
     void SetRects(long numRects, wxRect *rects);
 


@@ -164,7 +90,8 @@ private:
     long     m_numRects;
     wxRegion m_region;
     wxRect*  m_rects;
     long     m_numRects;
     wxRegion m_region;
     wxRect*  m_rects;

+
+    DECLARE_DYNAMIC_CLASS(wxRegionIterator)

 };
 
 };
 

-#endif
-    // _WX_REGION_H_
+#endif // _WX_MAC_CARBON_REGION_H_