extract (and expand and clean up and document) the header window implementation used inside the generic wxDataViewCtrl in a separate wxHeaderCtrl class which could be reused in (generic) wxListCtrl and, most importantly, wxGrid later
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -797,6 +797,11 @@ bool wxTreeCtrl::DoGetItem(wxTreeViewItem *tvItem) const
|
||||
wxCHECK_MSG( tvItem->hItem != TVI_ROOT, false,
|
||||
_T("can't retrieve virtual root item") );
|
||||
|
||||
return DoGetPossiblyRootItem(tvItem);
|
||||
}
|
||||
|
||||
bool wxTreeCtrl::DoGetPossiblyRootItem(wxTreeViewItem *tvItem) const
|
||||
{
|
||||
if ( !TreeView_GetItem(GetHwnd(), tvItem) )
|
||||
{
|
||||
wxLogLastError(wxT("TreeView_GetItem"));
|
||||
@@ -992,14 +997,7 @@ wxTreeItemParam *wxTreeCtrl::GetItemParam(const wxTreeItemId& item) const
|
||||
|
||||
wxTreeViewItem tvItem(item, TVIF_PARAM);
|
||||
|
||||
// hidden root may still have data.
|
||||
if ( IS_VIRTUAL_ROOT(item) )
|
||||
{
|
||||
return GET_VIRTUAL_ROOT()->GetParam();
|
||||
}
|
||||
|
||||
// visible node.
|
||||
if ( !DoGetItem(&tvItem) )
|
||||
if ( !DoGetPossiblyRootItem(&tvItem) )
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
@@ -1214,7 +1212,7 @@ bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
|
||||
wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
|
||||
|
||||
wxTreeViewItem tvItem(item, TVIF_CHILDREN);
|
||||
DoGetItem(&tvItem);
|
||||
DoGetPossiblyRootItem(&tvItem);
|
||||
|
||||
return tvItem.cChildren != 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user