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

fixes from the 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-10-30 16:38:56 +00:00
parent 4d1c1c3c70
commit 188781dbbd
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/msw/treectrl.cpp
View File

@@ -951,6 +951,12 @@ wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data) void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
{ {
// first, associate this piece of data with this item
if ( data )
{
data->SetId(item);
}
wxTreeViewItem tvItem(item, TVIF_PARAM); wxTreeViewItem tvItem(item, TVIF_PARAM);
if ( HasIndirectData(item) ) if ( HasIndirectData(item) )
@@ -2298,8 +2304,12 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
break; break;
case TVN_ENDLABELEDIT: case TVN_ENDLABELEDIT:
// return TRUE to set the label to the new string // return TRUE to set the label to the new string: note that we
// also must pretend that we did process the message or it is going
// to be passed to DefWindowProc() which will happily return FALSE
// cancelling the label change
*result = event.IsAllowed(); *result = event.IsAllowed();
processed = TRUE;
// ensure that we don't have the text ctrl which is going to be // ensure that we don't have the text ctrl which is going to be
// deleted any more // deleted any more