use wxOVERRIDE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -27,24 +27,24 @@ public:
|
||||
bool operator==(const wxPen& pen) const;
|
||||
bool operator!=(const wxPen& pen) const { return !(*this == pen); }
|
||||
|
||||
void SetColour( const wxColour &colour );
|
||||
void SetColour( unsigned char red, unsigned char green, unsigned char blue );
|
||||
void SetCap( wxPenCap capStyle );
|
||||
void SetJoin( wxPenJoin joinStyle );
|
||||
void SetStyle( wxPenStyle style );
|
||||
void SetWidth( int width );
|
||||
void SetDashes( int number_of_dashes, const wxDash *dash );
|
||||
void SetStipple(const wxBitmap& stipple);
|
||||
void SetColour( const wxColour &colour ) wxOVERRIDE;
|
||||
void SetColour( unsigned char red, unsigned char green, unsigned char blue ) wxOVERRIDE;
|
||||
void SetCap( wxPenCap capStyle ) wxOVERRIDE;
|
||||
void SetJoin( wxPenJoin joinStyle ) wxOVERRIDE;
|
||||
void SetStyle( wxPenStyle style ) wxOVERRIDE;
|
||||
void SetWidth( int width ) wxOVERRIDE;
|
||||
void SetDashes( int number_of_dashes, const wxDash *dash ) wxOVERRIDE;
|
||||
void SetStipple(const wxBitmap& stipple) wxOVERRIDE;
|
||||
|
||||
wxColour GetColour() const;
|
||||
wxPenCap GetCap() const;
|
||||
wxPenJoin GetJoin() const;
|
||||
wxPenStyle GetStyle() const;
|
||||
int GetWidth() const;
|
||||
int GetDashes(wxDash **ptr) const;
|
||||
wxColour GetColour() const wxOVERRIDE;
|
||||
wxPenCap GetCap() const wxOVERRIDE;
|
||||
wxPenJoin GetJoin() const wxOVERRIDE;
|
||||
wxPenStyle GetStyle() const wxOVERRIDE;
|
||||
int GetWidth() const wxOVERRIDE;
|
||||
int GetDashes(wxDash **ptr) const wxOVERRIDE;
|
||||
int GetDashCount() const;
|
||||
wxDash* GetDash() const;
|
||||
wxBitmap *GetStipple() const;
|
||||
wxBitmap *GetStipple() const wxOVERRIDE;
|
||||
|
||||
|
||||
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
|
||||
@@ -54,8 +54,8 @@ public:
|
||||
void SetStyle(int style) { SetStyle((wxPenStyle)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(wxPen)
|
||||
};
|
||||
|
Reference in New Issue
Block a user