Clear columns on destruction

[wxWidgets.git] / include / wx / mac / carbon / pen.h

diff --git a/include/wx/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h
index 9c3c3655471ee8e290405b42d850f8aa7441bbb6..3807aa523ea6781d59f947e01ba863110e962f24 100644 (file)
--- a/include/wx/mac/carbon/pen.h
+++ b/include/wx/mac/carbon/pen.h
@@ -17,13 +17,13 @@
 #include "wx/bitmap.h"
 
 // Pen
-class WXDLLEXPORT wxPen : public wxPenBase
+class WXDLLIMPEXP_CORE wxPen : public wxPenBase
 {
 public:
     wxPen();
     wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) );
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
 #endif
 
     wxPen(const wxBitmap& stipple, int width);
@@ -43,7 +43,7 @@ public:
     void SetJoin(wxPenJoin join)  ;
     void SetCap(wxPenCap cap)  ;
 
-    wxColour& GetColour() const ;
+    wxColour GetColour() const ;
     int GetWidth() const;
     wxPenStyle GetStyle() const;
     wxPenJoin GetJoin() const;