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

Get WxQt menu titles passing GUI tests

Browse Source
This commit is contained in:
Richard Smith
2018-11-21 12:58:23 +00:00
parent ae1fa08188
commit 6b7b43d1fe
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,6 +44,7 @@ public:
virtual wxMenu *Remove(size_t pos); virtual wxMenu *Remove(size_t pos);
virtual void EnableTop(size_t pos, bool enable); 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 void SetMenuLabel(size_t pos, const wxString& label);
virtual wxString GetMenuLabel(size_t pos) const; virtual wxString GetMenuLabel(size_t pos) const;

8
src/qt/menu.cpp
View File

@@ -184,6 +184,8 @@ wxMenuBar::wxMenuBar(size_t count, wxMenu *menus[], const wxString titles[], lon
static QMenu *SetTitle( wxMenu *menu, const wxString &title ) static QMenu *SetTitle( wxMenu *menu, const wxString &title )
{ {
menu->SetTitle(title);
QMenu *qtMenu = menu->GetHandle(); QMenu *qtMenu = menu->GetHandle();
qtMenu->setTitle( wxQtConvertString( title )); qtMenu->setTitle( wxQtConvertString( title ));
@@ -243,6 +245,12 @@ void wxMenuBar::EnableTop(size_t pos, bool enable)
qtAction->setEnabled( 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) void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)
{ {