Don't interpret '&' specially in wxTextWrapper.

[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 1cf5bbef0fde02818a632405beacf3f208714084..4701c91fac766eb753c4fe6fd2c3bd1aca50bbd4 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:
@@ -23,6 +23,7 @@ public:
     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 +33,7 @@ public:
     {
         Union(bmp, transColour, tolerance);
     }
+#endif
 
     virtual ~wxRegion();
 
@@ -40,7 +42,7 @@ public:
     virtual bool IsEmpty() const;
 
     // Internal
-    const WXHRGN GetWXHRGN() const ;
+    WXHRGN GetWXHRGN() const ;
 
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;