From d61f7200331a1cd1a3b2353292e6801511ccbc5d Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Fri, 10 Dec 2004 16:20:13 +0000 Subject: [PATCH] Bug #1040683: Remove assert when deleting menu entry. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/accel.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp index 65f0fa94f2..3bc6df37be 100644 --- a/src/generic/accel.cpp +++ b/src/generic/accel.cpp @@ -139,7 +139,11 @@ void wxAcceleratorTable::Remove(const wxAcceleratorEntry& entry) { const wxAcceleratorEntry *entryCur = node->GetData(); - if ( *entryCur == entry ) + // given entry contains only the information of the accelerator key + // because it was set that way in wxGetAccelFromString() + // so do not perform full ( *entryCur == entry ) comparison + if ((entryCur->GetKeyCode() == entry.GetKeyCode()) && + (entryCur->GetFlags() == entry.GetFlags())) { delete node->GetData(); M_ACCELDATA->m_accels.Erase(node); -- 2.45.2