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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index e31925031e9df22dd9cecaff6e6f3a00f153d475..223ebf3c83cd28b3ce12bf60268c226084a0e8c1 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -365,6 +365,9 @@ void wxMenuItem::SetItemLabel(const wxString& txt)
 
     // 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
 
     // 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

+    if ( !m_parentMenu )
+        return;
+

     const UINT id = GetMSWId();
     HMENU hMenu = GetHMenuOf(m_parentMenu);
     if ( !hMenu || ::GetMenuState(hMenu, id, MF_BYCOMMAND) == (UINT)-1 )
     const UINT id = GetMSWId();
     HMENU hMenu = GetHMenuOf(m_parentMenu);
     if ( !hMenu || ::GetMenuState(hMenu, id, MF_BYCOMMAND) == (UINT)-1 )