vetoing item collapse works again

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

diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index 65f6406654aa38e2b7d571fd07639667a5426b48..21f04410553a5c68acb4e52316fc2326a81a079d 100644 (file)
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -950,7 +950,7 @@ void wxTreeCtrl::Collapse(const wxTreeItemId& itemId)
   wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, GetId() );
   event.m_item = item;
   event.SetEventObject( this );
   wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, GetId() );
   event.m_item = item;
   event.SetEventObject( this );

-  if ( ProcessEvent( event ) && event.m_code )
+  if ( ProcessEvent( event ) && !event.IsAllowed() )

   {
     // cancelled by program
     return;
   {
     // cancelled by program
     return;