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

Merge branch 'qt_menuitem' of https://github.com/GeoTeric/wxWidgets

Browse Source 
Add wxOVERRIDE specifiers to wxMEnu{,Item,Bar} methods.

Closes https://github.com/wxWidgets/wxWidgets/pull/1146
This commit is contained in:
Vadim Zeitlin
2019-01-19 23:05:28 +01:00
parent d3ab6a9968 5044283b87
commit a0d2212bba
2 changed files with 18 additions and 19 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; virtual QMenu *GetHandle() const;
protected: protected:
virtual wxMenuItem *DoAppend(wxMenuItem *item); virtual wxMenuItem *DoAppend(wxMenuItem *item) wxOVERRIDE;
virtual wxMenuItem *DoInsert(size_t pos, wxMenuItem *item); virtual wxMenuItem *DoInsert(size_t pos, wxMenuItem *item) wxOVERRIDE;
virtual wxMenuItem *DoRemove(wxMenuItem *item); virtual wxMenuItem *DoRemove(wxMenuItem *item) wxOVERRIDE;
private: private:
QMenu *m_qtMenu; QMenu *m_qtMenu;
@@ -39,21 +39,21 @@ public:
wxMenuBar(long style); wxMenuBar(long style);
wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
virtual bool Append(wxMenu *menu, const wxString& title); virtual bool Append(wxMenu *menu, const wxString& title) wxOVERRIDE;
virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title); virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title) wxOVERRIDE;
virtual wxMenu *Remove(size_t pos); 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 bool IsEnabledTop(size_t pos) const wxOVERRIDE;
virtual void SetMenuLabel(size_t pos, const wxString& label); virtual void SetMenuLabel(size_t pos, const wxString& label) wxOVERRIDE;
virtual wxString GetMenuLabel(size_t pos) const; virtual wxString GetMenuLabel(size_t pos) const wxOVERRIDE;
QMenuBar *GetQMenuBar() const { return m_qtMenuBar; } QMenuBar *GetQMenuBar() const { return m_qtMenuBar; }
virtual QWidget *GetHandle() const; virtual QWidget *GetHandle() const wxOVERRIDE;
virtual void Attach(wxFrame *frame); virtual void Attach(wxFrame *frame) wxOVERRIDE;
virtual void Detach(); virtual void Detach() wxOVERRIDE;
private: private:
QMenuBar *m_qtMenuBar; QMenuBar *m_qtMenuBar;

13
include/wx/qt/menuitem.h
View File

@@ -13,7 +13,6 @@
class QAction; class QAction;
class WXDLLIMPEXP_FWD_CORE wxBitmap;
class WXDLLIMPEXP_FWD_CORE wxMenu; class WXDLLIMPEXP_FWD_CORE wxMenu;
class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase
@@ -26,14 +25,14 @@ public:
wxItemKind kind = wxITEM_NORMAL, wxItemKind kind = wxITEM_NORMAL,
wxMenu *subMenu = NULL); wxMenu *subMenu = NULL);
virtual void SetItemLabel(const wxString& str); virtual void SetItemLabel(const wxString& str) wxOVERRIDE;
virtual void SetCheckable(bool checkable); virtual void SetCheckable(bool checkable) wxOVERRIDE;
virtual void Enable(bool enable = true); virtual void Enable(bool enable = true) wxOVERRIDE;
virtual bool IsEnabled() const; virtual bool IsEnabled() const wxOVERRIDE;
virtual void Check(bool check = true); virtual void Check(bool check = true) wxOVERRIDE;
virtual bool IsChecked() const; virtual bool IsChecked() const wxOVERRIDE;
virtual void SetBitmap(const wxBitmap& bitmap); virtual void SetBitmap(const wxBitmap& bitmap);
virtual const wxBitmap& GetBitmap() const { return m_bitmap; }; virtual const wxBitmap& GetBitmap() const { return m_bitmap; };