Better fix

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

diff --git a/include/wx/palmos/region.h b/include/wx/palmos/region.h
index 96950f07a8d0e74d2a18d3d65bd724b9a8383bdb..ce0586c21b285efb141c46f5145c6970401cb8f0 100644 (file)
--- 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 );
     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);
     wxRegion( const wxBitmap& bmp)
     {
         Union(bmp);


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

+#endif

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


@@ -41,8 +44,8 @@ public:
     WXHRGN GetHRGN() const;
 
 protected:
     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;
 
     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);
 
     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)
 };
 
     DECLARE_DYNAMIC_CLASS(wxRegion)
 };