no changes, just remove #if'd out code

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

diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h
index d867083f3fd46bd7c46185dbc715da52da000195..b2ead3ca9c3e81b7a4a27f928291b8092ab94811 100644 (file)
--- a/include/wx/msw/region.h
+++ b/include/wx/msw/region.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MSW_REGION_H_
 #define _WX_MSW_REGION_H_
 
 #ifndef _WX_MSW_REGION_H_
 #define _WX_MSW_REGION_H_
 

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

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


@@ -20,7 +20,8 @@ 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)
     {
         Union(bmp);
     wxRegion( const wxBitmap& bmp)
     {
         Union(bmp);


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

+#endif // wxUSE_IMAGE

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


@@ -41,8 +43,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,12 +54,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(); }