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

allow calling SetItemLabel() for menu items with NULL menu parent too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-31 23:16:55 +00:00
parent 4a3c54bfa5
commit 3350ab0cf2
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/msw/menuitem.cpp
View File

@@ -365,6 +365,9 @@ void wxMenuItem::SetItemLabel(const wxString& txt)
// the item can be not attached to any menu yet and SetItemLabel() is still // the item can be not attached to any menu yet and SetItemLabel() is still
// valid to call in this case and should do nothing else // valid to call in this case and should do nothing else
if ( !m_parentMenu )
return;
const UINT id = GetMSWId(); const UINT id = GetMSWId();
HMENU hMenu = GetHMenuOf(m_parentMenu); HMENU hMenu = GetHMenuOf(m_parentMenu);
if ( !hMenu || ::GetMenuState(hMenu, id, MF_BYCOMMAND) == (UINT)-1 ) if ( !hMenu || ::GetMenuState(hMenu, id, MF_BYCOMMAND) == (UINT)-1 )