From ba2758a28ef65d077ef561350502b99569b6700f Mon Sep 17 00:00:00 2001 From: Tim Kosse Date: Thu, 3 Jul 2014 16:45:23 +0000 Subject: [PATCH] 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/branches/WX_3_0_BRANCH@76812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/treectrl/treetest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index 7ace8a0908..c7e23587f9 100644 --- a/samples/treectrl/treetest.cpp +++ b/samples/treectrl/treetest.cpp @@ -1597,7 +1597,7 @@ void MyTreeCtrl::OnItemMenu(wxTreeEvent& event) wxPoint screenpt = ClientToScreen(clientpt); 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); event.Skip(); @@ -1642,7 +1642,7 @@ void MyTreeCtrl::OnItemRClick(wxTreeEvent& event) 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(); }