X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1aca6611e695531e77e79e19e19da12d4c57dff0..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/os2/pen.h diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h index bf31b1ed3a..9ae321a020 100644 --- a/include/wx/os2/pen.h +++ b/include/wx/os2/pen.h @@ -4,7 +4,6 @@ // Author: David Webster // Modified by: // Created: 10/10/99 -// RCS-ID: $Id$ // Copyright: (c) David Webster // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -21,7 +20,7 @@ typedef long wxPMDash; // Pen // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPen : public wxPenBase +class WXDLLIMPEXP_CORE wxPen : public wxPenBase { public: wxPen() { } @@ -58,7 +57,7 @@ public: void SetCap(wxPenCap nCap); void SetPS(HPS hPS); - wxColour& GetColour(void) const; + wxColour GetColour(void) const; int GetWidth(void) const; wxPenStyle GetStyle(void) const; wxPenJoin GetJoin(void) const; @@ -69,6 +68,11 @@ public: int GetDashCount() const; wxBitmap* GetStipple(void) const; +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxPenStyle)style); } +#endif + // // Implementation //