X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac3688c0d8a39d200f0556ad4b401d89b45ff04a..c6ea1fdaf924be4ee49a19d12f76e4fcd257bb0a:/include/wx/x11/pen.h?ds=sidebyside diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h index df8b0b67cf..7e31ff6d1d 100644 --- a/include/wx/x11/pen.h +++ b/include/wx/x11/pen.h @@ -52,9 +52,9 @@ public: void SetStyle( wxPenStyle style ); void SetWidth( int width ); void SetDashes( int number_of_dashes, const wxDash *dash ); - void SetStipple( wxBitmap *stipple ); + void SetStipple( const wxBitmap& stipple ); - wxColour &GetColour() const; + wxColour GetColour() const; wxPenCap GetCap() const; wxPenJoin GetJoin() const; wxPenStyle GetStyle() const; @@ -64,6 +64,11 @@ public: wxDash* GetDash() const; wxBitmap* GetStipple() 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;