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

Bug #1040683: Remove assert when deleting menu entry.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-12-10 16:20:13 +00:00
parent 7a8d94185f
commit d61f720033
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/generic/accel.cpp
View File

@@ -139,7 +139,11 @@ void wxAcceleratorTable::Remove(const wxAcceleratorEntry& entry)
{ {
const wxAcceleratorEntry *entryCur = node->GetData(); 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(); delete node->GetData();
M_ACCELDATA->m_accels.Erase(node); M_ACCELDATA->m_accels.Erase(node);