use wxOVERRIDE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -28,14 +28,14 @@ public:
|
||||
bool operator==(const wxBrush& brush) const;
|
||||
bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
|
||||
|
||||
wxBrushStyle GetStyle() const;
|
||||
wxColour GetColour() const;
|
||||
wxBitmap *GetStipple() const;
|
||||
wxBrushStyle GetStyle() const wxOVERRIDE;
|
||||
wxColour GetColour() const wxOVERRIDE;
|
||||
wxBitmap *GetStipple() const wxOVERRIDE;
|
||||
|
||||
void SetColour( const wxColour& col );
|
||||
void SetColour( unsigned char r, unsigned char g, unsigned char b );
|
||||
void SetStyle( wxBrushStyle style );
|
||||
void SetStipple( const wxBitmap& stipple );
|
||||
void SetColour( const wxColour& col ) wxOVERRIDE;
|
||||
void SetColour( unsigned char r, unsigned char g, unsigned char b ) wxOVERRIDE;
|
||||
void SetStyle( wxBrushStyle style ) wxOVERRIDE;
|
||||
void SetStipple( const wxBitmap& stipple ) wxOVERRIDE;
|
||||
|
||||
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
|
||||
wxBrush(const wxColour& col, int style);
|
||||
@@ -44,8 +44,8 @@ public:
|
||||
void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
|
||||
|
||||
protected:
|
||||
virtual wxGDIRefData *CreateGDIRefData() const;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
||||
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxBrush)
|
||||
};
|
||||
|
Reference in New Issue
Block a user