X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c58338193e8e4219138b9de02d36c4fc4a96feb..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/msw/pen.h diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h index 95c50c06ab..ab4deee8b6 100644 --- a/include/wx/msw/pen.h +++ b/include/wx/msw/pen.h @@ -19,41 +19,47 @@ // Pen // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPen : public wxGDIObject +class WXDLLIMPEXP_CORE wxPen : public wxPenBase { public: wxPen() { } - wxPen(const wxColour& col, int width = 1, int style = wxSOLID); + wxPen(const wxColour& col, 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; bool operator!=(const wxPen& pen) const { return !(*this == pen); } - virtual bool Ok() const { return IsOk(); } - virtual bool IsOk() const { return (m_refData != NULL); } - // Override in order to recreate the pen void SetColour(const wxColour& col); void SetColour(unsigned char r, unsigned char g, unsigned char b); void SetWidth(int width); - void SetStyle(int style); + void SetStyle(wxPenStyle style); void SetStipple(const wxBitmap& stipple); void SetDashes(int nb_dashes, const wxDash *dash); - void SetJoin(int join); - void SetCap(int cap); + void SetJoin(wxPenJoin join); + void SetCap(wxPenCap cap); - wxColour& GetColour() const; + wxColour GetColour() const; int GetWidth() const; - int GetStyle() const; - int GetJoin() const; - int GetCap() const; + wxPenStyle GetStyle() const; + wxPenJoin GetJoin() const; + wxPenCap GetCap() const; int GetDashes(wxDash** ptr) const; wxDash* GetDash() const; int GetDashCount() const; wxBitmap* GetStipple() const; +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxPenStyle)style); } +#endif + // internal: wxGDIObject methods virtual bool RealizeResource(); virtual bool FreeResource(bool force = false); @@ -61,8 +67,8 @@ public: virtual bool IsFree() const; protected: - virtual wxObjectRefData* CreateRefData() const; - virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const; + virtual wxGDIRefData* CreateGDIRefData() const; + virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const; // same as FreeResource() + RealizeResource() bool Recreate();