wxMac should use /src/mac/carbon/spinctrl.cpp, applied some sizing

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

diff --git a/include/wx/motif/region.h b/include/wx/motif/region.h
index ffd3e993dbe810350dcc63d5c4182581897411d8..dff5fb83f3dda1c85b998c05078cc0b693217211 100644 (file)
--- a/include/wx/motif/region.h
+++ b/include/wx/motif/region.h
@@ -12,7 +12,7 @@
 #ifndef _WX_REGION_H_
 #define _WX_REGION_H_
 
 #ifndef _WX_REGION_H_
 #define _WX_REGION_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "region.h"
 #endif
 
 #pragma interface "region.h"
 #endif
 


@@ -28,91 +28,109 @@ WX_DECLARE_LIST(wxRect, wxRectList);
 
 
 enum wxRegionContain {
 
 
 enum wxRegionContain {

-       wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
+    wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2

 };
 
 // So far, for internal use only
 enum wxRegionOp {
 };
 
 // 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.
+    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 wxGDIObject {

-DECLARE_DYNAMIC_CLASS(wxRegion);
-       friend class WXDLLEXPORT wxRegionIterator;
+    DECLARE_DYNAMIC_CLASS(wxRegion)
+        friend class WXDLLEXPORT wxRegionIterator;

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

-       wxRegion();
-       ~wxRegion();
-
-       //# Copying
-       inline wxRegion(const wxRegion& r)
-               { Ref(r); }
-       inline wxRegion& operator = (const wxRegion& r)
-               { Ref(r); return (*this); }
-
-       //# Modify region
-       // Clear current region
-       void Clear();
-
-       // Union rectangle or region with this.
-       inline bool Union(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_OR); }
-       inline bool Union(const wxRect& rect) { return Combine(rect, wxRGN_OR); }
-       inline bool Union(const wxRegion& region) { return Combine(region, wxRGN_OR); }
-
-       // Intersect rectangle or region with this.
-       inline bool Intersect(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_AND); }
-       inline bool Intersect(const wxRect& rect)  { return Combine(rect, wxRGN_AND); }
-       inline bool Intersect(const wxRegion& region)  { return Combine(region, wxRGN_AND); }
-
-       // Subtract rectangle or region from this:
+    wxRegion();
+    wxRegion( const wxBitmap& bmp,
+              const wxColour& transColour = wxNullColour,
+              int   tolerance = 0)
+    {
+        Union(bmp, transColour, tolerance);
+    }
+    ~wxRegion();
+
+    //# Copying
+    inline wxRegion(const wxRegion& r)
+    { Ref(r); }
+    inline wxRegion& operator = (const wxRegion& r)
+    { Ref(r); return (*this); }
+
+    //# Modify region
+    // Clear current region
+    void Clear();
+
+    // Union rectangle or region with this.
+    inline bool Union(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_OR); }
+    inline bool Union(const wxRect& rect) { return Combine(rect, wxRGN_OR); }
+    inline bool Union(const wxRegion& region) { return Combine(region, wxRGN_OR); }
+
+    // Intersect rectangle or region with this.
+    inline bool Intersect(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_AND); }
+    inline bool Intersect(const wxRect& rect)  { return Combine(rect, wxRGN_AND); }
+    inline 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.
     // Combines the parts of 'this' that are not part of the second region.

-       inline bool Subtract(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_DIFF); }
-       inline bool Subtract(const wxRect& rect)  { return Combine(rect, wxRGN_DIFF); }
-       inline bool Subtract(const wxRegion& region)  { return Combine(region, wxRGN_DIFF); }
-
-       // XOR: the union of two combined regions except for any overlapping areas.
-       inline bool Xor(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_XOR); }
-       inline bool Xor(const wxRect& rect)  { return Combine(rect, wxRGN_XOR); }
-       inline 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(); }
-        bool Ok() const { return (m_refData != NULL) ; }
-
-       //# 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;
-
-// 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);
+    inline bool Subtract(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_DIFF); }
+    inline bool Subtract(const wxRect& rect)  { return Combine(rect, wxRGN_DIFF); }
+    inline bool Subtract(const wxRegion& region)  { return Combine(region, wxRGN_DIFF); }
+
+    // XOR: the union of two combined regions except for any overlapping areas.
+    inline bool Xor(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_XOR); }
+    inline bool Xor(const wxRect& rect)  { return Combine(rect, wxRGN_XOR); }
+    inline 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(); }
+    bool Ok() const { return (m_refData != NULL) ; }
+
+    //# 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.  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.
+    bool Union(const wxBitmap& bmp,
+               const wxColour& transColour = wxNullColour,
+               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);

 
     // Get the internal Region handle
     WXRegion GetXRegion() const;
 
 
     // Get the internal Region handle
     WXRegion GetXRegion() const;
 

-// 'Naughty' functions that allow wxWindows to use a list of rects
-// instead of the region, in certain circumstances (e.g. when
-// making a region out of the update rectangles).
-// These are used by wxPaintDC::wxPaintDC and wxRegionIterator::Reset.
+    // 'Naughty' functions that allow wxWindows to use a list of rects
+    // instead of the region, in certain circumstances (e.g. when
+    // making a region out of the update rectangles).
+    // These are used by wxPaintDC::wxPaintDC and wxRegionIterator::Reset.

     bool UsingRects() const;
     wxRect* GetRects();
     int GetRectCount() const;
     bool UsingRects() const;
     wxRect* GetRects();
     int GetRectCount() const;


@@ -121,35 +139,35 @@ public:
 };
 
 class WXDLLEXPORT wxRegionIterator : public wxObject {
 };
 
 class WXDLLEXPORT wxRegionIterator : public wxObject {

-DECLARE_DYNAMIC_CLASS(wxRegionIterator);
+    DECLARE_DYNAMIC_CLASS(wxRegionIterator)

 public:
 public:

-       wxRegionIterator();
-       wxRegionIterator(const wxRegion& region);
-       ~wxRegionIterator();
+    wxRegionIterator();
+    wxRegionIterator(const wxRegion& region);
+    ~wxRegionIterator();

 
 

-       void Reset() { m_current = 0; }
-       void Reset(const wxRegion& region);
+    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; }
+    operator bool () const { return m_current < m_numRects; }
+    bool HaveRects() const { return m_current < m_numRects; }

 
 

-       void operator ++ ();
-       void operator ++ (int);
+    void operator ++ ();
+    void operator ++ (int);

 
 

-       wxCoord GetX() const;
-       wxCoord GetY() const;
-       wxCoord GetW() const;
-       wxCoord GetWidth() const { return GetW(); }
-       wxCoord GetH() const;
-       wxCoord GetHeight() const { return GetH(); }
-        wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
+    wxCoord GetX() const;
+    wxCoord GetY() const;
+    wxCoord GetW() const;
+    wxCoord GetWidth() const { return GetW(); }
+    wxCoord GetH() const;
+    wxCoord GetHeight() const { return GetH(); }
+    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }

 
 private:
 
 private:

-       size_t   m_current;
-       size_t   m_numRects;
-       wxRegion m_region;
-        wxRect*  m_rects;
+    size_t      m_current;
+    size_t      m_numRects;
+    wxRegion m_region;
+    wxRect*  m_rects;

 };
 
 #endif
 };
 
 #endif

-       // _WX_REGION_H_
+// _WX_REGION_H_