use wxOVERRIDE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -71,7 +71,7 @@ public:
|
||||
int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; }
|
||||
|
||||
// set label with mnemonics
|
||||
virtual void SetLabel(const wxString& label)
|
||||
virtual void SetLabel(const wxString& label) wxOVERRIDE
|
||||
{
|
||||
m_labelOrig = label;
|
||||
|
||||
@@ -82,7 +82,7 @@ public:
|
||||
|
||||
// return the original string, as it was passed to SetLabel()
|
||||
// (i.e. with wx-style mnemonics)
|
||||
virtual wxString GetLabel() const { return m_labelOrig; }
|
||||
virtual wxString GetLabel() const wxOVERRIDE { return m_labelOrig; }
|
||||
|
||||
// set label text (mnemonics will be escaped)
|
||||
virtual void SetLabelText(const wxString& text)
|
||||
@@ -119,7 +119,7 @@ public:
|
||||
// controls by default inherit the colours of their parents, if a
|
||||
// particular control class doesn't want to do it, it can override
|
||||
// ShouldInheritColours() to return false
|
||||
virtual bool ShouldInheritColours() const { return true; }
|
||||
virtual bool ShouldInheritColours() const wxOVERRIDE { return true; }
|
||||
|
||||
|
||||
// WARNING: this doesn't work for all controls nor all platforms!
|
||||
@@ -128,10 +128,10 @@ public:
|
||||
// if the button was clicked)
|
||||
virtual void Command(wxCommandEvent &event);
|
||||
|
||||
virtual bool SetFont(const wxFont& font);
|
||||
virtual bool SetFont(const wxFont& font) wxOVERRIDE;
|
||||
|
||||
// wxControl-specific processing after processing the update event
|
||||
virtual void DoUpdateWindowUI(wxUpdateUIEvent& event);
|
||||
virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE;
|
||||
|
||||
wxSize GetSizeFromTextSize(int xlen, int ylen = -1) const
|
||||
{ return DoGetSizeFromTextSize(xlen, ylen); }
|
||||
@@ -176,7 +176,7 @@ public:
|
||||
|
||||
protected:
|
||||
// choose the default border for this window
|
||||
virtual wxBorder GetDefaultBorder() const;
|
||||
virtual wxBorder GetDefaultBorder() const wxOVERRIDE;
|
||||
|
||||
// creates the control (calls wxWindowBase::CreateBase inside) and adds it
|
||||
// to the list of parents children
|
||||
|
Reference in New Issue
Block a user