X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..e1ef506e13b7c8e96483b7fc0852dcb46688badd:/include/wx/gtk/pen.h?ds=sidebyside diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h index f4ccb5f9ab..4f1a3cf7ed 100644 --- a/include/wx/gtk/pen.h +++ b/include/wx/gtk/pen.h @@ -10,21 +10,22 @@ #ifndef _WX_GTK_PEN_H_ #define _WX_GTK_PEN_H_ -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" - typedef gint8 wxGTKDash; //----------------------------------------------------------------------------- // 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 + virtual ~wxPen(); bool operator==(const wxPen& pen) const; @@ -32,20 +33,27 @@ 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(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;