Items appended via the menu have no item data. Don't crash if right-clicking these items.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Tim Kosse
2014-07-03 16:47:25 +00:00
parent 056631ed8a
commit def3b2c90f

View File

@@ -1601,7 +1601,7 @@ void MyTreeCtrl::OnItemMenu(wxTreeEvent& event)
wxPoint screenpt = ClientToScreen(clientpt); wxPoint screenpt = ClientToScreen(clientpt);
wxLogMessage(wxT("OnItemMenu for item \"%s\" at screen coords (%i, %i)"), wxLogMessage(wxT("OnItemMenu for item \"%s\" at screen coords (%i, %i)"),
item->GetDesc(), screenpt.x, screenpt.y); item ? item->GetDesc() : wxS("unknown"), screenpt.x, screenpt.y);
ShowMenu(itemId, clientpt); ShowMenu(itemId, clientpt);
event.Skip(); event.Skip();
@@ -1646,7 +1646,7 @@ void MyTreeCtrl::OnItemRClick(wxTreeEvent& event)
MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId); MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId);
wxLogMessage(wxT("Item \"%s\" right clicked"), item->GetDesc()); wxLogMessage(wxT("Item \"%s\" right clicked"), item ? item->GetDesc() : wxS("unknown"));
event.Skip(); event.Skip();
} }