Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxOVERRIDE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 00:02:23 +00:00
parent ddd7ce624a
commit 8b4ae731d3
460 changed files with 4103 additions and 4107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/gtk/colour.h
View File

@@ -33,10 +33,10 @@ public:
bool operator==(const wxColour& col) const;
bool operator!=(const wxColour& col) const { return !(*this == col); }
unsigned char Red() const;
unsigned char Green() const;
unsigned char Blue() const;
unsigned char Alpha() const;
unsigned char Red() const wxOVERRIDE;
unsigned char Green() const wxOVERRIDE;
unsigned char Blue() const wxOVERRIDE;
unsigned char Alpha() const wxOVERRIDE;
// Implementation part
#ifdef __WXGTK3__
@@ -49,9 +49,9 @@ public:
protected:
virtual void
InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a) wxOVERRIDE;
virtual bool FromString(const wxString& str);
virtual bool FromString(const wxString& str) wxOVERRIDE;
DECLARE_DYNAMIC_CLASS(wxColour)
};