Add more wxOVERRIDE
This commit is contained in:
committed by
Vadim Zeitlin
parent
455a45f5a8
commit
7c1ab06ea5
@@ -186,11 +186,11 @@ public:
|
||||
TestApp();
|
||||
|
||||
// standard overrides
|
||||
virtual bool OnInit();
|
||||
virtual int OnExit();
|
||||
virtual bool OnInit() wxOVERRIDE;
|
||||
virtual int OnExit() wxOVERRIDE;
|
||||
|
||||
#ifdef __WIN32__
|
||||
virtual wxAppTraits *CreateTraits()
|
||||
virtual wxAppTraits *CreateTraits() wxOVERRIDE
|
||||
{
|
||||
// Define a new class just to customize CanUseStderr() behaviour.
|
||||
class TestAppTraits : public TestAppTraitsBase
|
||||
@@ -200,11 +200,11 @@ public:
|
||||
// in this case we really don't want to show any message boxes, as
|
||||
// wxMessageOutputBest, used e.g. from the default implementation
|
||||
// of wxApp::OnUnhandledException(), would do by default.
|
||||
virtual bool CanUseStderr() { return true; }
|
||||
virtual bool CanUseStderr() wxOVERRIDE { return true; }
|
||||
|
||||
// Overriding CanUseStderr() is not enough, we also need to
|
||||
// override this one to avoid returning false from it.
|
||||
virtual bool WriteToStderr(const wxString& text)
|
||||
virtual bool WriteToStderr(const wxString& text) wxOVERRIDE
|
||||
{
|
||||
wxFputs(text, stderr);
|
||||
fflush(stderr);
|
||||
@@ -221,7 +221,7 @@ public:
|
||||
|
||||
// Also override this method to avoid showing any dialogs from here -- and
|
||||
// show some details about the exception along the way.
|
||||
virtual bool OnExceptionInMainLoop()
|
||||
virtual bool OnExceptionInMainLoop() wxOVERRIDE
|
||||
{
|
||||
wxFprintf(stderr, "Unhandled exception in the main loop: %s\n",
|
||||
Catch::translateActiveException());
|
||||
@@ -230,8 +230,8 @@ public:
|
||||
}
|
||||
|
||||
// used by events propagation test
|
||||
virtual int FilterEvent(wxEvent& event);
|
||||
virtual bool ProcessEvent(wxEvent& event);
|
||||
virtual int FilterEvent(wxEvent& event) wxOVERRIDE;
|
||||
virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE;
|
||||
|
||||
void SetFilterEventFunc(FilterEventFunc f) { m_filterEventFunc = f; }
|
||||
void SetProcessEventFunc(ProcessEventFunc f) { m_processEventFunc = f; }
|
||||
@@ -269,7 +269,7 @@ public:
|
||||
event.Skip();
|
||||
}
|
||||
|
||||
virtual int OnRun()
|
||||
virtual int OnRun() wxOVERRIDE
|
||||
{
|
||||
if ( TestAppBase::OnRun() != 0 )
|
||||
m_exitcode = EXIT_FAILURE;
|
||||
@@ -277,7 +277,7 @@ public:
|
||||
return m_exitcode;
|
||||
}
|
||||
#else // !wxUSE_GUI
|
||||
virtual int OnRun()
|
||||
virtual int OnRun() wxOVERRIDE
|
||||
{
|
||||
return RunTests();
|
||||
}
|
||||
|
Reference in New Issue
Block a user