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

more use of wxOVERRIDE

Browse Source
This commit is contained in:
Paul Cornett
2015-09-06 17:20:42 -07:00
parent 4177593aef
commit 27a8d28029
131 changed files with 1059 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/generic/stattextg.h
View File

@@ -48,19 +48,19 @@ public:
// overridden base class virtual methods
virtual void SetLabel(const wxString& label);
virtual bool SetFont(const wxFont &font);
virtual void SetLabel(const wxString& label) wxOVERRIDE;
virtual bool SetFont(const wxFont &font) wxOVERRIDE;
protected:
virtual wxSize DoGetBestClientSize() const;
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
virtual wxString DoGetLabel() const { return m_label; }
virtual void DoSetLabel(const wxString& label);
virtual wxString DoGetLabel() const wxOVERRIDE { return m_label; }
virtual void DoSetLabel(const wxString& label) wxOVERRIDE;
void DoSetSize(int x, int y, int width, int height, int sizeFlags);
void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE;
#if wxUSE_MARKUP
virtual bool DoSetLabelMarkup(const wxString& markup);
virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE;
#endif // wxUSE_MARKUP
private: