Added wxUSE_NUMBERDLG to setup.h; added some files to VC++ project files;

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

diff --git a/include/wx/mac/region.h b/include/wx/mac/region.h
index 04d143c2e92ac6a747d91e0638fa598dcc2fba5b..aa7d718d739948e04bda7ef56644d087a212e4a5 100644 (file)
--- a/include/wx/mac/region.h
+++ b/include/wx/mac/region.h
@@ -43,6 +43,7 @@ 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();
        ~wxRegion();
 
@@ -79,7 +80,7 @@ public:
 
        //# Information on region
        // Outer bounds of region
-       void GetBox(long& x, long& y, long&w, long &h) const;
+       void GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const;
        wxRect GetBox() const ;
 
        // Is region empty?
@@ -100,6 +101,7 @@ public:
        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 ;
 };
 
 class WXDLLEXPORT wxRegionIterator : public wxObject {
@@ -125,7 +127,6 @@ public:
        long GetH() const;
        long GetHeight() const { return GetH(); }
     wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
-
 private:
        long     m_current;
        long     m_numRects;