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

Adding wxOVERRIDE specifiers to wxMenu and wxMenuBar methods

Browse Source
This commit is contained in:
Liam Treacy
2019-01-18 13:25:27 +00:00
parent 139070b745
commit 5044283b87
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/qt/menu.h
View File

@@ -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;