AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Send events when deleting selected item in wxMSW wxTreeCtrl

Browse Source 
The changes of c749d9e638 broke sending of
wxEVT_TREE_SEL_CHANGING and wxEVT_TREE_SEL_CHANGED events for the controls
without wxTR_MULTIPLE style, restore sending them now.

Closes #16926.

Closes https://github.com/wxWidgets/wxWidgets/pull/285
This commit is contained in:
Cătălin Răceanu 2016-05-16 17:19:45 +03:00 committed by Vadim Zeitlin
parent 4d20de73bd
commit ae845a045e
1 changed files with 25 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/msw/treectrl.cpp
View File

@ -1608,54 +1608,40 @@ void wxTreeCtrl::Delete(const wxTreeItemId& item)
// tree ctrl will eventually crash after item deletion
TreeItemUnlocker unlock_all;
const bool selected = IsSelected(item);
// attempt to delete the item, and continue only if it succeeds
if ( !MSWDeleteItem(item) )
return;
// if the item was not selected we don't need to do anything about the selection
if ( !selected )
return;
if ( HasFlag(wxTR_MULTIPLE) )
{
bool selected = IsSelected(item);
wxTreeItemId next;
if ( selected )
{
next = TreeView_GetNextVisible(GetHwnd(), HITEM(item));
if ( !next.IsOk() )
{
next = TreeView_GetPrevVisible(GetHwnd(), HITEM(item));
}
}
if ( !MSWDeleteItem(item) )
return;
if ( !selected )
{
return;
}
if ( item == m_htSelStart )
m_htSelStart.Unset();
if ( item == m_htClickedItem )
m_htClickedItem.Unset();
if ( next.IsOk() )
{
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, next);
if ( IsTreeEventAllowed(changingEvent) )
{
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this, next);
(void)HandleTreeEvent(changedEvent);
}
else
{
DoUnselectItem(next);
ClearFocusedItem();
}
}
}
else
// if a selected item was deleted announce that selection changed, no matter what
const wxTreeItemId next = GetFocusedItem();
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, next);
// if "selection changing" event is allowed, send "selection changed" too
if ( IsTreeEventAllowed(changingEvent) )
{
MSWDeleteItem(item);
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this, next);
HandleTreeEvent(changedEvent);
}
else if ( next.IsOk() )
{
DoUnselectItem(next);
ClearFocusedItem();
}
}