X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94a007ece4bcd6231d31bcb91516463b7f981a0e..931d6a47c32a5b4c283243cb553ce71ee2b535d5:/include/wx/osx/carbon/region.h

diff --git a/include/wx/osx/carbon/region.h b/include/wx/osx/carbon/region.h
index 1cf5bbef0f..f9c3fe3dd3 100644
--- a/include/wx/osx/carbon/region.h
+++ b/include/wx/osx/carbon/region.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        region.h
+// Name:        wx/osx/carbon/region.h
 // Purpose:     wxRegion class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,12 +16,13 @@
 class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine
 {
 public:
+    wxRegion() { }
     wxRegion(long x, long y, long w, long h);
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
     wxRegion( WXHRGN hRegion );
     wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
-    wxRegion();
+#if wxUSE_IMAGE
     wxRegion(const wxBitmap& bmp)
     {
         Union(bmp);
@@ -32,6 +32,7 @@ public:
     {
         Union(bmp, transColour, tolerance);
     }
+#endif
 
     virtual ~wxRegion();
 
@@ -40,7 +41,7 @@ public:
     virtual bool IsEmpty() const;
 
     // Internal
-    const WXHRGN GetWXHRGN() const ;
+    WXHRGN GetWXHRGN() const ;
 
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
@@ -53,6 +54,7 @@ protected:
 
     virtual bool DoOffset(wxCoord x, wxCoord y);
     virtual bool DoCombine(const wxRegion& region, wxRegionOp op);
+    virtual bool DoUnionWithRect(const wxRect& rect);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxRegion)
@@ -84,7 +86,7 @@ public:
     long GetWidth() const { return GetW(); }
     long GetH() const;
     long GetHeight() const { return GetH(); }
-    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
+    wxRect GetRect() const { return wxRect((int)GetX(), (int)GetY(), (int)GetWidth(), (int)GetHeight()); }
 
 private:
     void SetRects(long numRects, wxRect *rects);