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

Allow to add extra accelerators to wxMenuItem

Browse Source 
These accelerators are not shown in wxMenuItem label, but still will
work.

Implement support for them in all major ports and XRC.

Co-Authored-By: Vadim Zeitlin <vadim@wxwidgets.org>
This commit is contained in:
Alexander Koshelev
2021-11-02 16:19:25 +03:00
committed by Vadim Zeitlin
parent e729791222
commit 0cd898975c
18 changed files with 375 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/gtk/menu.cpp
View File

@@ -704,6 +704,54 @@ void wxMenuItem::SetGtkLabel()
#endif // wxUSE_ACCEL
}
#if wxUSE_ACCEL
void wxMenuItem::GTKSetExtraAccels()
{
GtkAccelGroup* const accelGroup = GetRootParentMenu(m_parentMenu)->m_accel;
const size_t extraAccelsSize = m_extraAccels.size();
for (size_t i = 0; i < extraAccelsSize; ++i)
{
GtkAccel(m_extraAccels[i]).Add(m_menuItem, accelGroup, GTK_ACCEL_MASK);
}
}
void wxMenuItem::AddExtraAccel(const wxAcceleratorEntry& accel)
{
wxMenuItemBase::AddExtraAccel(accel);
// If the item is not yet part of the menu, all its extra accelerators will
// be registered with GTK in GTKSetExtraAccels() once it is added to the
// menu, but if it had already been added to it, we need to let GTK know
// about the new extra accelerator.
if (m_menuItem)
{
GtkAccelGroup* const accelGroup = GetRootParentMenu(m_parentMenu)->m_accel;
GtkAccel(accel).Add(m_menuItem, accelGroup, GTK_ACCEL_MASK);
}
}
void wxMenuItem::ClearExtraAccels()
{
// Tell GTK not to use the existing accelerators any longer if they're
// already in use.
if (m_menuItem)
{
GtkAccelGroup* const accelGroup = GetRootParentMenu(m_parentMenu)->m_accel;
const size_t extraAccelsSize = m_extraAccels.size();
for (size_t i = 0; i < extraAccelsSize; ++i)
{
GtkAccel(m_extraAccels[i]).Remove(m_menuItem, accelGroup);
}
}
wxMenuItemBase::ClearExtraAccels();
}
#endif // wxUSE_ACCEL
void wxMenuItem::SetBitmap(const wxBitmap& bitmap)
{
if (m_kind == wxITEM_NORMAL)
@@ -987,6 +1035,10 @@ void wxMenu::GtkAppend(wxMenuItem* mitem, int pos)
if ( mitem->IsSubMenu() )
UpdateSubMenuItemLabels(mitem);
#if wxUSE_ACCEL
mitem->GTKSetExtraAccels();
#endif
g_signal_connect (menuItem, "select",
G_CALLBACK(menuitem_select), mitem);
g_signal_connect (menuItem, "deselect",