From 238ecc7c521f90de01d008e096c06892d9e8a03e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 3 Dec 2010 12:39:48 +0000 Subject: [PATCH] Don't try to extract accelerators from menu items which don't have any. We don't need to call wxAcceleratorEntry::Create() in wxMenuItem::GetAccel() if the menu item doesn't have any accelerator at all, i.e. if there is no TAB in its label. Calling wxAcceleratorEntry::Create() is useless and won't work correctly any more when Create() is updated to allow passing it strings without TAB in them in the next commit. See #12745. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/menucmn.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp index 4c7abae78d..75ab6ef07c 100644 --- a/src/common/menucmn.cpp +++ b/src/common/menucmn.cpp @@ -114,7 +114,9 @@ wxMenuItemBase::~wxMenuItemBase() wxAcceleratorEntry *wxMenuItemBase::GetAccel() const { - return wxAcceleratorEntry::Create(GetItemLabel()); + const wxString accel = GetItemLabel().AfterFirst(wxT('\t')); + + return accel.empty() ? NULL : wxAcceleratorEntry::Create(accel); } void wxMenuItemBase::SetAccel(wxAcceleratorEntry *accel) -- 2.45.2