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

Really fix recently broken accelerators handling in menu items.

Browse Source 
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:
Vadim Zeitlin
2010-12-22 13:57:21 +00:00
parent fd324b2954
commit 65776a1582
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/menucmn.cpp
View File

@@ -114,9 +114,7 @@ wxMenuItemBase::~wxMenuItemBase()
wxAcceleratorEntry *wxMenuItemBase::GetAccel() const wxAcceleratorEntry *wxMenuItemBase::GetAccel() const
{ {
const wxString accel = GetItemLabel().AfterFirst(wxT('\t')); return wxAcceleratorEntry::Create(GetItemLabel());
return accel.empty() ? NULL : wxAcceleratorEntry::Create(accel);
} }
void wxMenuItemBase::SetAccel(wxAcceleratorEntry *accel) void wxMenuItemBase::SetAccel(wxAcceleratorEntry *accel)