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

Add wxOVERRIDE to GTK/Qt wxGUIAppTraits classes in wxMSW too

Browse Source 
wxOVERRIDE was already used for the native MSW version, but not the
other ones, which prevented this header from compiling cleanly with
-Wsuggest-override and so broke allheaders test in these ports.

Closes https://github.com/wxWidgets/wxWidgets/pull/2396
This commit is contained in:
Tim Stahlhut
2021-06-15 04:09:55 -04:00
committed by Vadim Zeitlin
parent 482eb2fa87
commit efc6a811f5
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
include/wx/msw/apptrait.h
View File

@@ -64,29 +64,30 @@ public:
class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
{ {
public: public:
virtual wxEventLoopBase *CreateEventLoop(); virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE;
virtual void *BeforeChildWaitLoop() { return NULL; } virtual void *BeforeChildWaitLoop() wxOVERRIDE { return NULL; }
virtual void AfterChildWaitLoop(void *WXUNUSED(data)) { } virtual void AfterChildWaitLoop(void *WXUNUSED(data)) wxOVERRIDE { }
#if wxUSE_TIMER #if wxUSE_TIMER
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE;
#endif #endif
#if wxUSE_THREADS && defined(__WXGTK20__) #if wxUSE_THREADS && defined(__WXGTK20__)
virtual void MutexGuiEnter(); virtual void MutexGuiEnter() wxOVERRIDE;
virtual void MutexGuiLeave(); virtual void MutexGuiLeave() wxOVERRIDE;
#endif #endif
#if wxUSE_THREADS #if wxUSE_THREADS
virtual bool DoMessageFromThreadWait() { return true; } virtual bool DoMessageFromThreadWait() wxOVERRIDE { return true; }
virtual WXDWORD WaitForThread(WXHANDLE hThread, int WXUNUSED(flags)) virtual WXDWORD WaitForThread(WXHANDLE hThread, int WXUNUSED(flags)) wxOVERRIDE
{ return DoSimpleWaitForThread(hThread); } { return DoSimpleWaitForThread(hThread); }
#endif // wxUSE_THREADS #endif // wxUSE_THREADS
virtual wxPortId GetToolkitVersion(int *majVer = NULL, virtual wxPortId GetToolkitVersion(int *majVer = NULL,
int *minVer = NULL, int *minVer = NULL,
int *microVer = NULL) const; int *microVer = NULL) const wxOVERRIDE;
virtual bool CanUseStderr() { return false; } virtual bool CanUseStderr() wxOVERRIDE { return false; }
virtual bool WriteToStderr(const wxString& WXUNUSED(text)) { return false; } virtual bool WriteToStderr(const wxString& WXUNUSED(text)) wxOVERRIDE
{ return false; }
virtual WXHWND GetMainHWND() const wxOVERRIDE { return NULL; } virtual WXHWND GetMainHWND() const wxOVERRIDE { return NULL; }
}; };
@@ -95,24 +96,24 @@ public:
class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
{ {
public: public:
virtual wxEventLoopBase *CreateEventLoop(); virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE;
virtual void *BeforeChildWaitLoop() { return NULL; } virtual void *BeforeChildWaitLoop() wxOVERRIDE { return NULL; }
virtual void AfterChildWaitLoop(void*) { } virtual void AfterChildWaitLoop(void*) wxOVERRIDE { }
#if wxUSE_TIMER #if wxUSE_TIMER
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE;
#endif #endif
#if wxUSE_THREADS #if wxUSE_THREADS
virtual bool DoMessageFromThreadWait() { return true; } virtual bool DoMessageFromThreadWait() wxOVERRIDE { return true; }
virtual WXDWORD WaitForThread(WXHANDLE hThread, int WXUNUSED(flags)) virtual WXDWORD WaitForThread(WXHANDLE hThread, int WXUNUSED(flags)) wxOVERRIDE
{ return DoSimpleWaitForThread(hThread); } { return DoSimpleWaitForThread(hThread); }
#endif // wxUSE_THREADS #endif // wxUSE_THREADS
virtual wxPortId GetToolkitVersion(int *majVer = NULL, virtual wxPortId GetToolkitVersion(int *majVer = NULL,
int *minVer = NULL, int *minVer = NULL,
int *microVer = NULL) const; int *microVer = NULL) const wxOVERRIDE;
virtual bool CanUseStderr() { return false; } virtual bool CanUseStderr() wxOVERRIDE { return false; }
virtual bool WriteToStderr(const wxString&) { return false; } virtual bool WriteToStderr(const wxString&) wxOVERRIDE { return false; }
virtual WXHWND GetMainHWND() const wxOVERRIDE { return NULL; } virtual WXHWND GetMainHWND() const wxOVERRIDE { return NULL; }
}; };