added disambiguation for Clear() too

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

diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h
index d6cac7c66725b1aec4a8ec0f4a0d2e66beb22887..97203acb3f772625c8c7169533e1e98c723fb0ae 100644 (file)
--- a/include/wx/msw/region.h
+++ b/include/wx/msw/region.h
@@ -9,33 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_REGION_H_
-#define _WX_REGION_H_
+#ifndef _WX_MSW_REGION_H_
+#define _WX_MSW_REGION_H_

 
 

-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
-
-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.
-    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
+class WXDLLEXPORT wxRegion : public wxRegionWithCombine

 {
 public:
     wxRegion();
 {
 public:
     wxRegion();


@@ -44,6 +21,7 @@ public:
     wxRegion(const wxRect& rect);
     wxRegion(WXHRGN hRegion); // Hangs on to this region
     wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
     wxRegion(const wxRect& rect);
     wxRegion(WXHRGN hRegion); // Hangs on to this region
     wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );

+#if wxUSE_IMAGE

     wxRegion( const wxBitmap& bmp)
     {
         Union(bmp);
     wxRegion( const wxBitmap& bmp)
     {
         Union(bmp);


@@ -53,77 +31,13 @@ public:
     {
         Union(bmp, transColour, tolerance);
     }
     {
         Union(bmp, transColour, tolerance);
     }

+#endif // wxUSE_IMAGE

 
     virtual ~wxRegion();
 
 
     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(wxCoord x, wxCoord y, wxCoord width, wxCoord 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(wxCoord x, wxCoord y, wxCoord width, wxCoord 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(wxCoord x, wxCoord y, wxCoord width, wxCoord 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(wxCoord x, wxCoord y, wxCoord width, wxCoord 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(wxCoord x, wxCoord 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(wxCoord x, wxCoord y, wxCoord w, wxCoord 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);
-
-// Internal
-    bool Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op);
-    bool Combine(const wxRegion& region, wxRegionOp op);
-    bool Combine(const wxRect& rect, wxRegionOp op);
+    // wxRegionBase methods
+    virtual void Clear();
+    virtual bool IsEmpty() const;

 
     // Get internal region handle
     WXHRGN GetHRGN() const;
 
     // Get internal region handle
     WXHRGN GetHRGN() const;


@@ -132,7 +46,15 @@ protected:
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 

-    friend class WXDLLEXPORT wxRegionIterator;
+    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);
+
+    friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;

 
     DECLARE_DYNAMIC_CLASS(wxRegion)
 };
 
     DECLARE_DYNAMIC_CLASS(wxRegion)
 };


@@ -153,9 +75,7 @@ public:
 
     bool HaveRects() const { return (m_current < m_numRects); }
 
 
     bool HaveRects() const { return (m_current < m_numRects); }
 

-#ifndef __SALFORDC__

     operator bool () const { return HaveRects(); }
     operator bool () const { return HaveRects(); }

-#endif

 
     wxRegionIterator& operator++();
     wxRegionIterator operator++(int);
 
     wxRegionIterator& operator++();
     wxRegionIterator operator++(int);


@@ -181,5 +101,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxRegionIterator)
 };
 
     DECLARE_DYNAMIC_CLASS(wxRegionIterator)
 };
 

-#endif
-    // _WX_REGION_H_
+#endif // _WX_MSW_REGION_H_