enum wxWebViewBackend has been removed.

[wxWidgets.git] / include / wx / osx / carbon / region.h

diff --git a/include/wx/osx/carbon/region.h b/include/wx/osx/carbon/region.h
index 480109a8ee644169f061fa849c79ad28ab764449..eec9be0037ec614fba75c3b56fb41dfbb0f8de98 100644 (file)
--- a/include/wx/osx/carbon/region.h
+++ b/include/wx/osx/carbon/region.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        region.h
+// Name:        wx/osx/carbon/region.h

 // Purpose:     wxRegion class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxRegion class
 // Author:      Stefan Csomor
 // Modified by:


@@ -17,12 +17,13 @@
 class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine
 {
 public:
 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(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, int fillStyle = wxODDEVEN_RULE );
-    wxRegion();
+    wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
+#if wxUSE_IMAGE

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


@@ -32,6 +33,7 @@ public:
     {
         Union(bmp, transColour, tolerance);
     }
     {
         Union(bmp, transColour, tolerance);
     }

+#endif

 
     virtual ~wxRegion();
 
 
     virtual ~wxRegion();
 


@@ -40,7 +42,7 @@ public:
     virtual bool IsEmpty() const;
 
     // Internal
     virtual bool IsEmpty() const;
 
     // Internal

-    const WXHRGN GetWXHRGN() const ;
+    WXHRGN GetWXHRGN() const ;

 
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
 
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;


@@ -53,6 +55,7 @@ protected:
 
     virtual bool DoOffset(wxCoord x, wxCoord y);
     virtual bool DoCombine(const wxRegion& region, wxRegionOp op);
 
     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)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxRegion)