X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82cddbd97a4dfbd0dcf5c44c9336173d6dd386ef..ddc7f0c97571b231f231b5abaa9f4e4eaf1e46a9:/include/wx/palmos/pen.h?ds=sidebyside diff --git a/include/wx/palmos/pen.h b/include/wx/palmos/pen.h index b6d99455bc..4dd60758b9 100644 --- a/include/wx/palmos/pen.h +++ b/include/wx/palmos/pen.h @@ -21,7 +21,7 @@ typedef WXDWORD wxMSWDash; class WXDLLIMPEXP_FWD_CORE wxPen; // VZ: this class should be made private -class WXDLLEXPORT wxPenRefData : public wxGDIRefData +class WXDLLIMPEXP_CORE wxPenRefData : public wxGDIRefData { public: wxPenRefData(); @@ -71,13 +71,13 @@ private: // 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); @@ -125,6 +125,11 @@ public: WXHANDLE GetResourceHandle() const; bool IsFree() const; +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxPenStyle)style); } +#endif + protected: virtual wxGDIRefData* CreateGDIRefData() const; virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;