Replace wxOVERRIDE and wxNOEXCEPT with override and noexcept
Don't use deprecated macros in wxWidgets itself.
This commit is contained in:
parent
be5095acdd
commit
88d526660f
1282 changed files with 11878 additions and 11878 deletions
|
|
@ -138,18 +138,18 @@ class wxMediaPlayerApp : public wxApp
|
|||
{
|
||||
public:
|
||||
#ifdef __WXMAC__
|
||||
virtual void MacOpenFiles(const wxArrayString & fileNames ) wxOVERRIDE;
|
||||
virtual void MacOpenFiles(const wxArrayString & fileNames ) override;
|
||||
#endif
|
||||
|
||||
#if wxUSE_CMDLINE_PARSER
|
||||
virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE;
|
||||
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE;
|
||||
virtual void OnInitCmdLine(wxCmdLineParser& parser) override;
|
||||
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override;
|
||||
|
||||
// Files specified on the command line, if any.
|
||||
wxVector<wxString> m_params;
|
||||
#endif // wxUSE_CMDLINE_PARSER
|
||||
|
||||
virtual bool OnInit() wxOVERRIDE;
|
||||
virtual bool OnInit() override;
|
||||
|
||||
protected:
|
||||
class wxMediaPlayerFrame* m_frame;
|
||||
|
|
@ -282,7 +282,7 @@ public:
|
|||
wxMediaPlayerTimer(wxMediaPlayerFrame* frame) {m_frame = frame;}
|
||||
|
||||
// Called each time the timer's timeout expires
|
||||
void Notify() wxOVERRIDE;
|
||||
void Notify() override;
|
||||
|
||||
wxMediaPlayerFrame* m_frame; // The wxMediaPlayerFrame
|
||||
};
|
||||
|
|
@ -348,7 +348,7 @@ public:
|
|||
wxPlayListDropTarget(wxMediaPlayerListCtrl& list) : m_list(list) {}
|
||||
~wxPlayListDropTarget(){}
|
||||
virtual bool OnDropFiles(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
|
||||
const wxArrayString& files) wxOVERRIDE
|
||||
const wxArrayString& files) override
|
||||
{
|
||||
for (size_t i = 0; i < files.GetCount(); ++i)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue