X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e6858cdcb9278b36446466c346d984e7e306553..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/gtk/brush.h diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h index 977574e18f..848fdf8cc5 100644 --- a/include/wx/gtk/brush.h +++ b/include/wx/gtk/brush.h @@ -23,14 +23,17 @@ public: wxBrush() { } wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) ); +#endif wxBrush( const wxBitmap &stippleBitmap ); virtual ~wxBrush(); 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 ); @@ -38,6 +41,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;