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

undid change accidentally committed as part of r57093 but which didn't have anything to do with it and resulted in #10253

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-22 13:34:12 +00:00
parent 4b5e178a4c
commit ae322a4870
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/treectrl.h
View File

@@ -242,10 +242,8 @@ private:
// the common part of all ctors // the common part of all ctors
void Init(); void Init();
// helper functions: DoGetItem() doesn't work for hidden virtual root item // helper functions
// while DoGetPossiblyRootItem() does
bool DoGetItem(wxTreeViewItem *tvItem) const; bool DoGetItem(wxTreeViewItem *tvItem) const;
bool DoGetPossiblyRootItem(wxTreeViewItem *tvItem) const;
void DoSetItem(wxTreeViewItem *tvItem); void DoSetItem(wxTreeViewItem *tvItem);
void DoExpand(const wxTreeItemId& item, int flag); void DoExpand(const wxTreeItemId& item, int flag);

16
src/msw/treectrl.cpp
View File

@@ -797,11 +797,6 @@ bool wxTreeCtrl::DoGetItem(wxTreeViewItem *tvItem) const
wxCHECK_MSG( tvItem->hItem != TVI_ROOT, false, wxCHECK_MSG( tvItem->hItem != TVI_ROOT, false,
_T("can't retrieve virtual root item") ); _T("can't retrieve virtual root item") );
return DoGetPossiblyRootItem(tvItem);
}
bool wxTreeCtrl::DoGetPossiblyRootItem(wxTreeViewItem *tvItem) const
{
if ( !TreeView_GetItem(GetHwnd(), tvItem) ) if ( !TreeView_GetItem(GetHwnd(), tvItem) )
{ {
wxLogLastError(wxT("TreeView_GetItem")); wxLogLastError(wxT("TreeView_GetItem"));
@@ -997,7 +992,14 @@ wxTreeItemParam *wxTreeCtrl::GetItemParam(const wxTreeItemId& item) const
wxTreeViewItem tvItem(item, TVIF_PARAM); wxTreeViewItem tvItem(item, TVIF_PARAM);
if ( !DoGetPossiblyRootItem(&tvItem) ) // hidden root may still have data.
if ( IS_VIRTUAL_ROOT(item) )
{
return GET_VIRTUAL_ROOT()->GetParam();
}
// visible node.
if ( !DoGetItem(&tvItem) )
{ {
return NULL; return NULL;
} }
@@ -1212,7 +1214,7 @@ bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") ); wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
wxTreeViewItem tvItem(item, TVIF_CHILDREN); wxTreeViewItem tvItem(item, TVIF_CHILDREN);
DoGetPossiblyRootItem(&tvItem); DoGetItem(&tvItem);
return tvItem.cChildren != 0; return tvItem.cChildren != 0;
} }