When wxPGProperty is un-attached from wxPropertyGrid, keep its 'default' cell referen...

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

diff --git a/include/wx/palmos/region.h b/include/wx/palmos/region.h
index 8a7479bbe6966927b90c55e068fe1e79b62f6691..86459caf46fba021a0e2c4febf50177ea9565d41 100644 (file)
--- a/include/wx/palmos/region.h
+++ b/include/wx/palmos/region.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PALMOS_REGION_H_
 #define _WX_PALMOS_REGION_H_
 
 #ifndef _WX_PALMOS_REGION_H_
 #define _WX_PALMOS_REGION_H_
 

-class WXDLLEXPORT wxRegion : public wxRegionWithCombine
+class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine

 {
 public:
     wxRegion();
 {
 public:
     wxRegion();


@@ -20,7 +20,7 @@ public:
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
     wxRegion(WXHRGN hRegion); // Hangs on to this region
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
     wxRegion(WXHRGN hRegion); // Hangs on to this region

-    wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
+    wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );

 
 #if wxUSE_IMAGE
     wxRegion( const wxBitmap& bmp)
 
 #if wxUSE_IMAGE
     wxRegion( const wxBitmap& bmp)


@@ -44,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;


@@ -55,12 +55,12 @@ 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)
 };
 

-class WXDLLEXPORT wxRegionIterator : public wxObject
+class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject

 {
 public:
     wxRegionIterator() { Init(); }
 {
 public:
     wxRegionIterator() { Init(); }