From 5044283b875c2e757362ce060334c939e212408f Mon Sep 17 00:00:00 2001 From: Liam Treacy Date: Fri, 18 Jan 2019 13:25:27 +0000 Subject: [PATCH] Adding wxOVERRIDE specifiers to wxMenu and wxMenuBar methods --- include/wx/qt/menu.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/wx/qt/menu.h b/include/wx/qt/menu.h index f6d52bb3e2..cd747f2461 100644 --- a/include/wx/qt/menu.h +++ b/include/wx/qt/menu.h @@ -20,9 +20,9 @@ public: virtual QMenu *GetHandle() const; protected: - virtual wxMenuItem *DoAppend(wxMenuItem *item); - virtual wxMenuItem *DoInsert(size_t pos, wxMenuItem *item); - virtual wxMenuItem *DoRemove(wxMenuItem *item); + virtual wxMenuItem *DoAppend(wxMenuItem *item) wxOVERRIDE; + virtual wxMenuItem *DoInsert(size_t pos, wxMenuItem *item) wxOVERRIDE; + virtual wxMenuItem *DoRemove(wxMenuItem *item) wxOVERRIDE; private: QMenu *m_qtMenu; @@ -39,21 +39,21 @@ public: wxMenuBar(long style); wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); - virtual bool Append(wxMenu *menu, const wxString& title); - virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title); - virtual wxMenu *Remove(size_t pos); + virtual bool Append(wxMenu *menu, const wxString& title) wxOVERRIDE; + virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title) wxOVERRIDE; + virtual wxMenu *Remove(size_t pos) wxOVERRIDE; - virtual void EnableTop(size_t pos, bool enable); + virtual void EnableTop(size_t pos, bool enable) wxOVERRIDE; virtual bool IsEnabledTop(size_t pos) const wxOVERRIDE; - virtual void SetMenuLabel(size_t pos, const wxString& label); - virtual wxString GetMenuLabel(size_t pos) const; + virtual void SetMenuLabel(size_t pos, const wxString& label) wxOVERRIDE; + virtual wxString GetMenuLabel(size_t pos) const wxOVERRIDE; QMenuBar *GetQMenuBar() const { return m_qtMenuBar; } - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; - virtual void Attach(wxFrame *frame); - virtual void Detach(); + virtual void Attach(wxFrame *frame) wxOVERRIDE; + virtual void Detach() wxOVERRIDE; private: QMenuBar *m_qtMenuBar;