X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/x11/pen.h?ds=inline diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h index e7d259bc9d..7e31ff6d1d 100644 --- a/include/wx/x11/pen.h +++ b/include/wx/x11/pen.h @@ -29,12 +29,16 @@ typedef char wxX11Dash; // wxPen //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxPen: public wxGDIObject +class WXDLLIMPEXP_CORE wxPen: public wxPenBase { public: wxPen() { } - wxPen( const wxColour &colour, int width = 1, int style = wxSOLID ); + wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); +#endif + wxPen( const wxBitmap &stipple, int width ); virtual ~wxPen(); @@ -43,23 +47,28 @@ public: void SetColour( const wxColour &colour ); void SetColour( unsigned char red, unsigned char green, unsigned char blue ); - void SetCap( int capStyle ); - void SetJoin( int joinStyle ); - void SetStyle( int style ); + void SetCap( wxPenCap capStyle ); + void SetJoin( wxPenJoin joinStyle ); + 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; - int GetCap() const; - int GetJoin() const; - int GetStyle() const; + wxColour GetColour() const; + wxPenCap GetCap() const; + wxPenJoin GetJoin() const; + wxPenStyle GetStyle() const; int GetWidth() const; int GetDashes(wxDash **ptr) const; int GetDashCount() const; 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;