More use of wxOVERRIDE
This commit is contained in:
@@ -34,20 +34,20 @@ public:
|
||||
const wxString& name = wxStaticTextNameStr);
|
||||
|
||||
// accessors
|
||||
void SetLabel( const wxString &str ) ;
|
||||
bool SetFont( const wxFont &font );
|
||||
void SetLabel( const wxString &str ) wxOVERRIDE;
|
||||
bool SetFont( const wxFont &font ) wxOVERRIDE;
|
||||
|
||||
virtual bool AcceptsFocus() const { return false; }
|
||||
virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
|
||||
|
||||
protected :
|
||||
|
||||
virtual wxString DoGetLabel() const;
|
||||
virtual void DoSetLabel(const wxString& str);
|
||||
virtual wxString DoGetLabel() const wxOVERRIDE;
|
||||
virtual void DoSetLabel(const wxString& str) wxOVERRIDE;
|
||||
|
||||
virtual wxSize DoGetBestSize() const ;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
|
||||
#if wxUSE_MARKUP && wxOSX_USE_COCOA
|
||||
virtual bool DoSetLabelMarkup(const wxString& markup);
|
||||
virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE;
|
||||
#endif // wxUSE_MARKUP && wxOSX_USE_COCOA
|
||||
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText);
|
||||
|
Reference in New Issue
Block a user