don't use wxDELETE unnecessarily

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

diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h
index f4e2235cc08a41c459b3dceb3e8d2e4fb926f859..a5c06bbac5ababe76b9dddf4e7789e6455a55270 100644 (file)
--- a/include/wx/os2/region.h
+++ b/include/wx/os2/region.h
@@ -15,7 +15,7 @@
 #include "wx/list.h"
 #include "wx/os2/private.h"
 
 #include "wx/list.h"
 #include "wx/os2/private.h"
 

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

 {
 public:
     wxRegion( wxCoord x
 {
 public:
     wxRegion( wxCoord x


@@ -28,7 +28,7 @@ public:
             );
     wxRegion(const wxRect& rRect);
     wxRegion(WXHRGN hRegion, WXHDC hPS); // Hangs on to this region
             );
     wxRegion(const wxRect& rRect);
     wxRegion(WXHRGN hRegion, WXHDC hPS); // 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 );

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


@@ -64,8 +64,8 @@ public:
     void   SetPS(HPS hPS);
 
 protected:
     void   SetPS(HPS hPS);
 
 protected:

-    virtual wxObjectRefData* CreateData(void) const;
-    virtual wxObjectRefData* CloneData(const wxObjectRefData* pData) const;
+    virtual wxGDIRefData* CreateGDIRefData(void) const;
+    virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* pData) 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;


@@ -75,14 +75,13 @@ 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);
 
 }; // end of CLASS wxRegion
 
     DECLARE_DYNAMIC_CLASS(wxRegion);
 
 }; // end of CLASS wxRegion
 

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

 {
 {

-DECLARE_DYNAMIC_CLASS(wxRegionIterator);

 public:
     wxRegionIterator();
     wxRegionIterator(const wxRegion& rRegion);
 public:
     wxRegionIterator();
     wxRegionIterator(const wxRegion& rRegion);


@@ -110,6 +109,8 @@ private:
     long                            m_lNumRects;
     wxRegion                        m_vRegion;
     wxRect*                         m_pRects;
     long                            m_lNumRects;
     wxRegion                        m_vRegion;
     wxRect*                         m_pRects;

+
+    DECLARE_DYNAMIC_CLASS(wxRegionIterator)

 }; // end of wxRegionIterator
 
 #endif // _WX_OS2_REGION_H_
 }; // end of wxRegionIterator
 
 #endif // _WX_OS2_REGION_H_