X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..26dd7154d5b4ab79db3cf4a6dc07c6404e6e14d8:/include/wx/mgl/pen.h?ds=sidebyside diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h index a18d97efb2..6454bee1b2 100644 --- a/include/wx/mgl/pen.h +++ b/include/wx/mgl/pen.h @@ -20,18 +20,22 @@ // classes //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmap; -class WXDLLEXPORT wxPen; +class WXDLLIMPEXP_FWD_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxPen; //----------------------------------------------------------------------------- // wxPen //----------------------------------------------------------------------------- -class WXDLLEXPORT 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() {} bool operator == (const wxPen& pen) const; @@ -39,33 +43,34 @@ 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; - bool Ok() const { return IsOk(); } - bool IsOk() const; +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxPenStyle)style); } +#endif // implementation: void* GetPixPattern() const; 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; private: DECLARE_DYNAMIC_CLASS(wxPen)