Corrected/added support for column headers with icon and text

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

diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h
index 97203acb3f772625c8c7169533e1e98c723fb0ae..b75113bbd945bda924defaa2da57fb76865ad393 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();


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


@@ -59,7 +59,7 @@ protected:
     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(); }