diff --git a/docs/latex/wx/treectrl.tex b/docs/latex/wx/treectrl.tex index 03ab6d4e94..35b6fc2a76 100644 --- a/docs/latex/wx/treectrl.tex +++ b/docs/latex/wx/treectrl.tex @@ -381,6 +381,12 @@ Returns the normal image list. Returns the current tree control indentation. +\membersection{wxTreeCtrl::GetItemBackgroundColour}\label{wxtreectrlgetitembackgroundcolour} + +\constfunc{wxColour}{GetItemBackgroundColour}{\param{const wxTreeItemId\&}{ item}} + +Returns the background colour of the item. + \membersection{wxTreeCtrl::GetItemData}\label{wxtreectrlgetitemdata} \constfunc{wxTreeItemData*}{GetItemData}{\param{const wxTreeItemId\&}{ item}} @@ -408,6 +414,12 @@ tree->GetItemData( item )->GetData(); ).} \end{twocollist}} } +\membersection{wxTreeCtrl::GetItemFont}\label{wxtreectrlgetitemfont} + +\constfunc{wxFont}{GetItemFont}{\param{const wxTreeItemId\&}{ item}} + +Returns the font of the item label. + \membersection{wxTreeCtrl::GetItemImage}\label{wxtreectrlgetitemimage} \constfunc{int}{GetItemImage}{\param{const wxTreeItemId\& }{item}, @@ -432,6 +444,12 @@ item is expanded and the normal image is shown when it is collapsed) Returns the item label. +\membersection{wxTreeCtrl::GetItemTextColour}\label{wxtreectrlgetitemtextcolour} + +\constfunc{wxColour}{GetItemTextColour}{\param{const wxTreeItemId\&}{ item}} + +Returns the colour of the item label. + \membersection{wxTreeCtrl::GetLastChild}\label{wxtreectrlgetlastchild} \constfunc{wxTreeItemId}{GetLastChild}{\param{const wxTreeItemId\&}{ item}} diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h index 8d88362e3a..8cf87709b1 100644 --- a/include/wx/generic/treectlg.h +++ b/include/wx/generic/treectlg.h @@ -117,6 +117,15 @@ public: // get the data associated with the item wxTreeItemData *GetItemData(const wxTreeItemId& item) const; + // get the item's text colour + wxColour GetItemTextColour(const wxTreeItemId& item) const; + + // get the item's background colour + wxColour GetItemBackgroundColour(const wxTreeItemId& item) const; + + // get the item's font + wxFont GetItemFont(const wxTreeItemId& item) const; + // modifiers // --------- diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h index 55918f1451..68062889b5 100644 --- a/include/wx/msw/treectrl.h +++ b/include/wx/msw/treectrl.h @@ -141,6 +141,15 @@ public: // get the data associated with the item wxTreeItemData *GetItemData(const wxTreeItemId& item) const; + // get the item's text colour + wxColour GetItemTextColour(const wxTreeItemId& item) const; + + // get the item's background colour + wxColour GetItemBackgroundColour(const wxTreeItemId& item) const; + + // get the item's font + wxFont GetItemFont(const wxTreeItemId& item) const; + // modifiers // --------- diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index 20659f17dd..10b2517c13 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -921,6 +921,30 @@ wxTreeItemData *wxGenericTreeCtrl::GetItemData(const wxTreeItemId& item) const return ((wxGenericTreeItem*) item.m_pItem)->GetData(); } +wxColour wxGenericTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const +{ + wxCHECK_MSG( item.IsOk(), wxNullColour, wxT("invalid tree item") ); + + wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; + return pItem->Attr().GetTextColour(); +} + +wxColour wxGenericTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const +{ + wxCHECK_MSG( item.IsOk(), wxNullColour, wxT("invalid tree item") ); + + wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; + return pItem->Attr().GetBackgroundColour(); +} + +wxFont wxGenericTreeCtrl::GetItemFont(const wxTreeItemId& item) const +{ + wxCHECK_MSG( item.IsOk(), wxNullFont, wxT("invalid tree item") ); + + wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; + return pItem->Attr().GetFont(); +} + void wxGenericTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text) { wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index efad5e8001..75813b5bfb 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -1181,6 +1181,42 @@ void wxTreeCtrl::RefreshItem(const wxTreeItemId& item) } } +wxColour wxTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const +{ + long id = (long)(WXHTREEITEM)item; + wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id); + if ( !attr ) + { + return wxNullColour; + } + + return attr->GetTextColour(); +} + +wxColour wxTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const +{ + long id = (long)(WXHTREEITEM)item; + wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id); + if ( !attr ) + { + return wxNullColour; + } + + return attr->GetBackgroundColour(); +} + +wxFont wxTreeCtrl::GetItemFont(const wxTreeItemId& item) const +{ + long id = (long)(WXHTREEITEM)item; + wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id); + if ( !attr ) + { + return wxNullFont; + } + + return attr->GetFont(); +} + void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item, const wxColour& col) {