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

Fix root relationship

Browse Source
This commit is contained in:
Graham Dawes
2019-02-05 14:15:36 +00:00
parent 8efe01bd8e
commit 9f1f8636c5
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/qt/treectrl.cpp
View File

@@ -297,14 +297,6 @@ size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)
wxTreeItemId wxTreeCtrl::GetRootItem() const wxTreeItemId wxTreeCtrl::GetRootItem() const
{ {
QTreeWidgetItem *root = m_qtTreeWidget->invisibleRootItem(); QTreeWidgetItem *root = m_qtTreeWidget->invisibleRootItem();
if (HasFlag(wxTR_HIDE_ROOT))
{
return wxQtConvertTreeItem(root);
}
if (root->childCount() == 0)
return wxTreeItemId();
return wxQtConvertTreeItem(root->child(0)); return wxQtConvertTreeItem(root->child(0));
} }
@@ -509,15 +501,8 @@ wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
int image, int selImage, int image, int selImage,
wxTreeItemData *data) wxTreeItemData *data)
{ {
QTreeWidgetItem *item = m_qtTreeWidget->invisibleRootItem(); QTreeWidgetItem *root = m_qtTreeWidget->invisibleRootItem();
return DoInsertItem(wxQtConvertTreeItem(root), 0, text, image, selImage, data);
if ( HasFlag(wxTR_HIDE_ROOT) )
{
item->setText(0, wxQtConvertString(text));
return wxQtConvertTreeItem(item);
}
return DoInsertItem(wxQtConvertTreeItem(item), 0, text, image, selImage, data);
} }
void wxTreeCtrl::Delete(const wxTreeItemId& item) void wxTreeCtrl::Delete(const wxTreeItemId& item)