added fix for MSL under Win32 (by Steve Hartwell)

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

diff --git a/include/wx/cocoa/region.h b/include/wx/cocoa/region.h
index 1d26425b963b84fcca90d14dc0793efb6c766b00..652b5c8b47913dcae9fd01f5a0036ed4404c7b78 100644 (file)
--- a/include/wx/cocoa/region.h
+++ b/include/wx/cocoa/region.h
@@ -1,156 +1,91 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        region.h
+// Name:        wx/cocoa/region.h

 // Purpose:     wxRegion class
 // Purpose:     wxRegion class

-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
+// Author:      David Elliott
+// Modified by: 
+// Created:     2004/04/12

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) 2004 David Elliott

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_REGION_H_
-#define _WX_REGION_H_
+#ifndef _WX_COCOA_REGION_H__
+#define _WX_COCOA_REGION_H__

 
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "region.h"
-#endif
+#include "wx/generic/region.h"

 
 

-#include "wx/list.h"
-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
+typedef struct _NSRect NSRect;

 
 

-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 {
-DECLARE_DYNAMIC_CLASS(wxRegion);
-       friend class WXDLLEXPORT wxRegionIterator;
+class WXDLLEXPORT wxRegion : public wxRegionGeneric
+{
+    DECLARE_DYNAMIC_CLASS(wxRegion);

 public:
 public:

-    wxRegion(long x, long y, long w, long h);
-    wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
-    wxRegion(const wxRect& rect);
-    wxRegion();
-    ~wxRegion();
-    
-    //# Copying
+    wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
+    :   wxRegionGeneric(x,y,w,h)
+    {}
+    wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
+    :   wxRegionGeneric(topLeft, bottomRight)
+    {}
+    wxRegion(const wxRect& rect)
+    :   wxRegionGeneric(rect)
+    {}
+    wxRegion() {}
+    wxRegion(const wxBitmap& bmp,
+            const wxColour& transColour = wxNullColour,
+            int tolerance = 0)
+    :   wxRegionGeneric()
+    {
+        Union(bmp, transColour, tolerance);
+    }
+    ~wxRegion() {}

     wxRegion(const wxRegion& r)
     wxRegion(const wxRegion& r)

-        : wxGDIObject()
-    { Ref(r); }
-    wxRegion& operator = (const wxRegion& r)
-    { Ref(r); return (*this); }
-    
-    //# Modify region
-    // Clear current region
-    void Clear();
-    
-    // Union rectangle or region with this.
+    :   wxRegionGeneric(r)
+    {}
+    wxRegion& operator= (const wxRegion& r)
+    {   return *(wxRegion*)&(this->wxRegionGeneric::operator=(r)); }
+
+    // Cocoa-specific creation
+    wxRegion(const NSRect& rect);
+    wxRegion(const NSRect *rects, int count);
+
+    // Use the non-transparent pixels of a wxBitmap for the region to combine
+    // with this region.  If the bitmap has a mask then it will be used,
+    // otherwise the colour to be treated as transparent may be specified,
+    // along with an optional tolerance value.
+    // NOTE: implemented in common/rgncmn.cpp
+    bool Union(const wxBitmap& bmp,
+               const wxColour& transColour = wxNullColour,
+               int   tolerance = 0);
+    /* And because of function hiding: */

     bool Union(long x, long y, long width, long height)
     bool Union(long x, long y, long width, long height)

-        { return Combine(x, y, width, height, wxRGN_OR); }
+    {   return wxRegionGeneric::Union(x,y,width,height); }

     bool Union(const wxRect& rect)
     bool Union(const wxRect& rect)

-        { return Combine(rect, wxRGN_OR); }
+    {   return wxRegionGeneric::Union(rect); }

     bool Union(const wxRegion& region)
     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;
-    
-    // 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);
+    {   return wxRegionGeneric::Union(region); }
+
+    // Convert the region to a B&W bitmap with the black pixels being inside
+    // the region.
+    // NOTE: implemented in common/rgncmn.cpp
+    wxBitmap ConvertToBitmap() const;
+

 };
 
 };
 

-class WXDLLEXPORT wxRegionIterator : public wxObject
+class WXDLLEXPORT wxRegionIterator : public wxRegionIteratorGeneric

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxRegionIterator)
-        
+//    DECLARE_DYNAMIC_CLASS(wxRegionIteratorGeneric);

 public:
 public:

-    wxRegionIterator();
-    wxRegionIterator(const wxRegion& region);
-    wxRegionIterator(const wxRegionIterator& iterator);
-    ~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);
-    
-    long GetX() const;
-    long GetY() const;
-    long GetW() const;
-    long GetWidth() const { return GetW(); }
-    long GetH() const;
-    long GetHeight() const { return GetH(); }
-    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
-private:
-    void SetRects(long numRects, wxRect *rects);
+    wxRegionIterator() {}
+    wxRegionIterator(const wxRegion& region)
+    :   wxRegionIteratorGeneric(region)
+    {}
+    wxRegionIterator(const wxRegionIterator& iterator)
+    :   wxRegionIteratorGeneric(iterator)
+    {}
+    ~wxRegionIterator() {}

 
 

-    long     m_current;
-    long     m_numRects;
-    wxRegion m_region;
-    wxRect*  m_rects;
+    wxRegionIterator& operator=(const wxRegionIterator& iter)
+    {   return *(wxRegionIterator*)&(this->wxRegionIteratorGeneric::operator=(iter)); }

 };
 
 };
 

-#endif
-       // _WX_REGION_H_
+#endif //ndef _WX_COCOA_REGION_H__