X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..2724d84bbefd440b4e63997eb45ec9636bcd955d:/include/wx/x11/pen.h diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h index 17c2288831..7e31ff6d1d 100644 --- a/include/wx/x11/pen.h +++ b/include/wx/x11/pen.h @@ -19,9 +19,9 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxPen; -class WXDLLIMPEXP_CORE wxColour; -class WXDLLIMPEXP_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxPen; +class WXDLLIMPEXP_FWD_CORE wxColour; +class WXDLLIMPEXP_FWD_CORE wxBitmap; typedef char wxX11Dash; @@ -29,46 +29,51 @@ 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 wxBitmap &stipple, int width ); - ~wxPen(); + 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 - bool Ok() const { return m_refData != NULL; } + wxPen( const wxBitmap &stipple, int width ); + virtual ~wxPen(); bool operator == ( const wxPen& pen ) const; bool operator != (const wxPen& pen) const { return !(*this == pen); } 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: - // ref counting code - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; DECLARE_DYNAMIC_CLASS(wxPen) }; -#endif -// _WX_PEN_H_ +#endif // _WX_PEN_H_