Really fix recently broken accelerators handling in menu items.
As wxAcceleratorEntry::Create() now expects the full menu item label, just pass GetItemLabel() to it in wxMenuItemBase::GetAccel() instead of half- parsing it ourselves there. Closes #12794. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -114,9 +114,7 @@ wxMenuItemBase::~wxMenuItemBase()
|
||||
|
||||
wxAcceleratorEntry *wxMenuItemBase::GetAccel() const
|
||||
{
|
||||
const wxString accel = GetItemLabel().AfterFirst(wxT('\t'));
|
||||
|
||||
return accel.empty() ? NULL : wxAcceleratorEntry::Create(accel);
|
||||
return wxAcceleratorEntry::Create(GetItemLabel());
|
||||
}
|
||||
|
||||
void wxMenuItemBase::SetAccel(wxAcceleratorEntry *accel)
|
||||
|
Reference in New Issue
Block a user