X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac3688c0d8a39d200f0556ad4b401d89b45ff04a..835165d576b66441987b78519e6ef1fe74ea795a:/include/wx/x11/brush.h?ds=sidebyside diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h index b2e6627651..23c142db7d 100644 --- a/include/wx/x11/brush.h +++ b/include/wx/x11/brush.h @@ -41,8 +41,8 @@ public: bool operator==(const wxBrush& brush) const; bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - virtual wxBrushStyle GetStyle() const; - wxColour &GetColour() const; + wxBrushStyle GetStyle() const; + wxColour GetColour() const; wxBitmap *GetStipple() const; void SetColour( const wxColour& col ); @@ -50,6 +50,11 @@ public: void SetStyle( wxBrushStyle style ); void SetStipple( const wxBitmap& stipple ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxBrushStyle)style); } +#endif + protected: virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;