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

Fix recently introduced assert when using owner drawn items in wxMSW.

Browse Source 
Relax the check added in r76202, the item might not be added to its parent
menu yet even if the menu is not NULL.

See #13878.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-04-01 12:46:52 +00:00
parent cb9a769aad
commit 0930541da9
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/msw/menuitem.cpp
View File

@@ -768,13 +768,16 @@ void wxMenuItem::DoSetBitmap(const wxBitmap& bmp, bool bChecked)
// (all other menu items have to be also set to owner-drawn mode).
if ( m_parentMenu )
{
wxMenu *menu = m_parentMenu;
size_t pos;
wxMenuItem *item = menu->FindChildItem(GetMSWId(), &pos);
wxCHECK_RET( item == this, wxS("Non unique menu item ID?") );
wxMenuItem *item = m_parentMenu->FindChildItem(GetMSWId(), &pos);
if ( item )
{
wxCHECK_RET( item == this, wxS("Non unique menu item ID?") );
menu->Remove(this);
menu->Insert(pos, this);
m_parentMenu->Remove(this);
m_parentMenu->Insert(pos, this);
}
//else: the item hasn't been inserted into the parent menu yet
}
return;
}