From 6b7b43d1fef7e27700ca24d534cc25c0e066ea68 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Wed, 21 Nov 2018 12:58:23 +0000 Subject: [PATCH] Get WxQt menu titles passing GUI tests --- include/wx/qt/menu.h | 1 + src/qt/menu.cpp | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/include/wx/qt/menu.h b/include/wx/qt/menu.h index b8d5abca52..f6d52bb3e2 100644 --- a/include/wx/qt/menu.h +++ b/include/wx/qt/menu.h @@ -44,6 +44,7 @@ public: virtual wxMenu *Remove(size_t pos); virtual void EnableTop(size_t pos, bool enable); + virtual bool IsEnabledTop(size_t pos) const wxOVERRIDE; virtual void SetMenuLabel(size_t pos, const wxString& label); virtual wxString GetMenuLabel(size_t pos) const; diff --git a/src/qt/menu.cpp b/src/qt/menu.cpp index 61d27b7976..e0f7d8c5fc 100644 --- a/src/qt/menu.cpp +++ b/src/qt/menu.cpp @@ -184,6 +184,8 @@ wxMenuBar::wxMenuBar(size_t count, wxMenu *menus[], const wxString titles[], lon static QMenu *SetTitle( wxMenu *menu, const wxString &title ) { + menu->SetTitle(title); + QMenu *qtMenu = menu->GetHandle(); qtMenu->setTitle( wxQtConvertString( title )); @@ -243,6 +245,12 @@ void wxMenuBar::EnableTop(size_t pos, bool enable) qtAction->setEnabled( enable ); } +bool wxMenuBar::IsEnabledTop(size_t pos) const +{ + QAction *qtAction = GetActionAt( m_qtMenuBar, pos ); + return qtAction->isEnabled(); +} + void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label) {