Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix SelectItem() for single selection case which was broken by recent changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-23 22:08:41 +00:00
parent 5becc84185
commit 7549148b56
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/msw/treectrl.cpp
View File

@@ -1671,15 +1671,26 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
wxTreeEvent event(wxEVT_COMMAND_TREE_SEL_CHANGING, this, item); wxTreeEvent event(wxEVT_COMMAND_TREE_SEL_CHANGING, this, item);
if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() ) if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
{ {
if ( !::SelectItem(GetHwnd(), HITEM(item), select) ) if ( HasFlag(wxTR_MULTIPLE) )
{ {
wxLogLastError(wxT("TreeView_SelectItem")); if ( !::SelectItem(GetHwnd(), HITEM(item), select) )
{
wxLogLastError(wxT("TreeView_SelectItem"));
return;
}
} }
else // ok else // single selection
{ {
event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED); // use TreeView_SelectItem() to deselect the previous selection
(void)GetEventHandler()->ProcessEvent(event); if ( !TreeView_SelectItem(GetHwnd(), HITEM(item)) )
{
wxLogLastError(wxT("TreeView_SelectItem"));
return;
}
} }
event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
(void)GetEventHandler()->ProcessEvent(event);
} }
//else: program vetoed the change //else: program vetoed the change
} }