X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a16d7370e3cdc7d583a6f14ab11b3a1d27b73df..3ed946f2835520aeae67c69582c068bf2e109008:/include/wx/palmos/region.h diff --git a/include/wx/palmos/region.h b/include/wx/palmos/region.h index 96950f07a8..ce0586c21b 100644 --- a/include/wx/palmos/region.h +++ b/include/wx/palmos/region.h @@ -21,6 +21,8 @@ public: wxRegion(const wxRect& rect); wxRegion(WXHRGN hRegion); // Hangs on to this region wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); + +#if wxUSE_IMAGE wxRegion( const wxBitmap& bmp) { Union(bmp); @@ -30,6 +32,7 @@ public: { Union(bmp, transColour, tolerance); } +#endif virtual ~wxRegion(); @@ -41,8 +44,8 @@ public: WXHRGN GetHRGN() const; protected: - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual bool DoIsEqual(const wxRegion& region) const; virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const; @@ -52,7 +55,7 @@ protected: virtual bool DoOffset(wxCoord x, wxCoord y); virtual bool DoCombine(const wxRegion& region, wxRegionOp op); - friend class WXDLLEXPORT wxRegionIterator; + friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator; DECLARE_DYNAMIC_CLASS(wxRegion) };