X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f2e56674255b092332752bb269fbd5ca74e7204..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/pen.h diff --git a/include/wx/pen.h b/include/wx/pen.h index b94486f364..36c2bd1f7a 100644 --- a/include/wx/pen.h +++ b/include/wx/pen.h @@ -62,7 +62,7 @@ enum wxPenCap }; -class WXDLLEXPORT wxPenBase : public wxGDIObject +class WXDLLIMPEXP_CORE wxPenBase : public wxGDIObject { public: virtual ~wxPenBase() { } @@ -77,7 +77,7 @@ public: virtual void SetJoin(wxPenJoin join) = 0; virtual void SetCap(wxPenCap cap) = 0; - virtual wxColour& GetColour() const = 0; + virtual wxColour GetColour() const = 0; virtual wxBitmap *GetStipple() const = 0; virtual wxPenStyle GetStyle() const = 0; virtual wxPenJoin GetJoin() const = 0; @@ -130,7 +130,7 @@ public: #endif }; -extern WXDLLEXPORT_DATA(wxPenList*) wxThePenList; +extern WXDLLIMPEXP_DATA_CORE(wxPenList*) wxThePenList; // provide comparison operators to allow code such as //