X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82cddbd97a4dfbd0dcf5c44c9336173d6dd386ef..4b42c189d51c1092ab31a0f4312956e54a648f19:/include/wx/gtk1/pen.h diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h index 7e85235346..97fea928a3 100644 --- a/include/wx/gtk1/pen.h +++ b/include/wx/gtk1/pen.h @@ -38,12 +38,10 @@ public: wxPen() { } wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID ); -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) ); +#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; bool operator!=(const wxPen& pen) const { return !(*this == pen); } @@ -54,8 +52,9 @@ public: 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; + wxColour GetColour() const; wxPenCap GetCap() const; wxPenJoin GetJoin() const; wxPenStyle GetStyle() const; @@ -63,6 +62,12 @@ public: 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 private: virtual wxGDIRefData *CreateGDIRefData() const;