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

Implement and document wxDataViewTreeCtrl::IsContainer(), use it in the sample to not add items to non-containers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2009-11-13 14:14:44 +00:00
parent a53f722ff2
commit 8ddda15ba5
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/dataview.h
View File

@@ -1212,6 +1212,9 @@ public:
const wxDataViewTreeStore *GetStore() const const wxDataViewTreeStore *GetStore() const
{ return (const wxDataViewTreeStore*) GetModel(); } { return (const wxDataViewTreeStore*) GetModel(); }
bool IsContainer( const wxDataViewItem& item ) const
{ return GetStore()->IsContainer(item); }
void SetImageList( wxImageList *imagelist ); void SetImageList( wxImageList *imagelist );
wxImageList* GetImageList() { return m_imageList; } wxImageList* GetImageList() { return m_imageList; }

5
interface/wx/dataview.h
View File

@@ -2023,6 +2023,11 @@ public:
int icon = -1, int icon = -1,
wxClientData* data = NULL); wxClientData* data = NULL);
/**
Returns true if item is a container.
*/
bool IsContainer( const wxDataViewItem& item );
/** /**
Calls the same method from wxDataViewTreeStore but uses Calls the same method from wxDataViewTreeStore but uses
an index position in the image list instead of a wxIcon. an index position in the image list instead of a wxIcon.

2
samples/dataview/dataview.cpp
View File

@@ -1092,6 +1092,7 @@ void MyFrame::OnAddTreeItem(wxCommandEvent& WXUNUSED(event))
{ {
wxDataViewTreeCtrl* ctrl = (wxDataViewTreeCtrl*) m_ctrl[3]; wxDataViewTreeCtrl* ctrl = (wxDataViewTreeCtrl*) m_ctrl[3];
wxDataViewItem selected = ctrl->GetSelection(); wxDataViewItem selected = ctrl->GetSelection();
if (ctrl->IsContainer(selected))
ctrl->AppendItem( selected, "Item", 0 ); ctrl->AppendItem( selected, "Item", 0 );
} }
@@ -1099,6 +1100,7 @@ void MyFrame::OnAddTreeContainerItem(wxCommandEvent& WXUNUSED(event))
{ {
wxDataViewTreeCtrl* ctrl = (wxDataViewTreeCtrl*) m_ctrl[3]; wxDataViewTreeCtrl* ctrl = (wxDataViewTreeCtrl*) m_ctrl[3];
wxDataViewItem selected = ctrl->GetSelection(); wxDataViewItem selected = ctrl->GetSelection();
if (ctrl->IsContainer(selected))
ctrl->AppendContainer(selected, "Container", 0 ); ctrl->AppendContainer(selected, "Container", 0 );
} }

16
src/common/datavcmn.cpp
View File

@@ -1790,6 +1790,14 @@ wxDataViewTreeStore::InsertContainer(const wxDataViewItem& parent,
return node->GetItem(); return node->GetItem();
} }
bool wxDataViewTreeStore::IsContainer( const wxDataViewItem& item ) const
{
wxDataViewTreeStoreNode *node = FindNode( item );
if (!node) return false;
return node->IsContainer();
}
wxDataViewItem wxDataViewTreeStore::GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const wxDataViewItem wxDataViewTreeStore::GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const
{ {
wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
@@ -1963,14 +1971,6 @@ wxDataViewItem wxDataViewTreeStore::GetParent( const wxDataViewItem &item ) cons
return parent->GetItem(); return parent->GetItem();
} }
bool wxDataViewTreeStore::IsContainer( const wxDataViewItem &item ) const
{
wxDataViewTreeStoreNode *node = FindNode( item );
if (!node) return false;
return node->IsContainer();
}
unsigned int wxDataViewTreeStore::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const unsigned int wxDataViewTreeStore::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const
{ {
wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );