mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-09-23 06:33:59 +08:00
Replace wxOVERRIDE and wxNOEXCEPT with override and noexcept
Don't use deprecated macros in wxWidgets itself.
This commit is contained in:
@@ -65,7 +65,7 @@ public:
|
||||
MyApp();
|
||||
virtual ~MyApp(){}
|
||||
|
||||
virtual bool OnInit() wxOVERRIDE;
|
||||
virtual bool OnInit() override;
|
||||
|
||||
// critical section protects access to all of the fields below
|
||||
wxCriticalSection m_critsect;
|
||||
@@ -99,7 +99,7 @@ public:
|
||||
protected:
|
||||
virtual void DoLogRecord(wxLogLevel level,
|
||||
const wxString& msg,
|
||||
const wxLogRecordInfo& info) wxOVERRIDE;
|
||||
const wxLogRecordInfo& info) override;
|
||||
|
||||
private:
|
||||
// event handlers
|
||||
@@ -210,7 +210,7 @@ public:
|
||||
virtual ~MyThread();
|
||||
|
||||
// thread execution starts here
|
||||
virtual void *Entry() wxOVERRIDE;
|
||||
virtual void *Entry() override;
|
||||
|
||||
public:
|
||||
unsigned m_count;
|
||||
@@ -226,11 +226,11 @@ public:
|
||||
MyWorkerThread(MyFrame *frame);
|
||||
|
||||
// thread execution starts here
|
||||
virtual void *Entry() wxOVERRIDE;
|
||||
virtual void *Entry() override;
|
||||
|
||||
// called when the thread exits - whether it terminates normally or is
|
||||
// stopped with Delete() (but not when it is Kill()ed!)
|
||||
virtual void OnExit() wxOVERRIDE;
|
||||
virtual void OnExit() override;
|
||||
|
||||
public:
|
||||
MyFrame *m_frame;
|
||||
@@ -253,7 +253,7 @@ public:
|
||||
m_dlg = dlg;
|
||||
}
|
||||
|
||||
virtual ExitCode Entry() wxOVERRIDE;
|
||||
virtual ExitCode Entry() override;
|
||||
|
||||
private:
|
||||
MyImageDialog *m_dlg;
|
||||
|
||||
Reference in New Issue
Block a user