X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c7789014106c9269b0f4ecc1a3071b14f351d3f..bca8c756a30d54ee4fade96a091d78ad8988fd23:/src/common/datavcmn.cpp diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 79f5b89c45..57c2aaecd0 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -18,20 +18,18 @@ #if wxUSE_DATAVIEWCTRL #include "wx/dataview.h" -#include "wx/spinctrl.h" -#include "wx/choice.h" - -#include "wx/weakref.h" -#include "wx/vector.h" #ifndef WX_PRECOMP #include "wx/dc.h" #include "wx/settings.h" #include "wx/log.h" - #include "wx/icon.h" #include "wx/crt.h" #endif +#include "wx/spinctrl.h" +#include "wx/choice.h" +#include "wx/imaglist.h" + const char wxDataViewCtrlNameStr[] = "dataviewCtrl"; @@ -40,13 +38,6 @@ bool operator == (const wxDataViewItem &left, const wxDataViewItem &right) return (left.GetID() == right.GetID() ); } -#ifdef __WXDEBUG__ -void wxDataViewItem::Print(const wxString& text) const -{ - wxPrintf(wxT("item %s: %lu\n"), text.GetData(), wxPtrToUInt(m_id)); -} -#endif - // --------------------------------------------------------- // wxDataViewModelNotifier // --------------------------------------------------------- @@ -235,7 +226,7 @@ void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier ) } int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, - unsigned int column, bool ascending ) + unsigned int column, bool ascending ) const { // sort branches before leaves bool item1_is_container = IsContainer(item1); @@ -434,7 +425,7 @@ bool wxDataViewIndexListModel::HasDefaultCompare() const int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1, const wxDataViewItem& item2, unsigned int WXUNUSED(column), - bool ascending) + bool ascending) const { if (m_ordered) { @@ -456,18 +447,18 @@ int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1, void wxDataViewIndexListModel::GetValue( wxVariant &variant, const wxDataViewItem &item, unsigned int col ) const { - GetValue( variant, GetRow(item), col ); + GetValueByRow( variant, GetRow(item), col ); } bool wxDataViewIndexListModel::SetValue( const wxVariant &variant, const wxDataViewItem &item, unsigned int col ) { - return SetValue( variant, GetRow(item), col ); + return SetValueByRow( variant, GetRow(item), col ); } bool wxDataViewIndexListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr ) { - return GetAttr( GetRow(item), col, attr ); + return GetAttrByRow( GetRow(item), col, attr ); } wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const @@ -589,7 +580,7 @@ bool wxDataViewVirtualListModel::HasDefaultCompare() const int wxDataViewVirtualListModel::Compare(const wxDataViewItem& item1, const wxDataViewItem& item2, unsigned int WXUNUSED(column), - bool ascending) + bool ascending) const { unsigned int pos1 = wxPtrToUInt(item1.GetID()); unsigned int pos2 = wxPtrToUInt(item2.GetID()); @@ -603,18 +594,18 @@ int wxDataViewVirtualListModel::Compare(const wxDataViewItem& item1, void wxDataViewVirtualListModel::GetValue( wxVariant &variant, const wxDataViewItem &item, unsigned int col ) const { - GetValue( variant, GetRow(item), col ); + GetValueByRow( variant, GetRow(item), col ); } bool wxDataViewVirtualListModel::SetValue( const wxVariant &variant, const wxDataViewItem &item, unsigned int col ) { - return SetValue( variant, GetRow(item), col ); + return SetValueByRow( variant, GetRow(item), col ); } bool wxDataViewVirtualListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr ) { - return GetAttr( GetRow(item), col, attr ); + return GetAttrByRow( GetRow(item), col, attr ); } wxDataViewItem wxDataViewVirtualListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const @@ -704,6 +695,10 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la m_editorCtrl->PushEventHandler( handler ); + // there might be no editor control for the given item + if (!m_editorCtrl) + return false; + #if defined(__WXGTK20__) && !defined(wxUSE_GENERICDATAVIEWCTRL) handler->SetFocusOnIdle(); #else @@ -899,11 +894,11 @@ const wxDataViewModel* wxDataViewCtrlBase::GetModel() const void wxDataViewCtrlBase::ExpandAncestors( const wxDataViewItem & item ) { if (!m_model) return; - + if (!item.IsOk()) return; wxVector parentChain; - + // at first we get all the parents of the selected item wxDataViewItem parent = m_model->GetParent(item); while (parent.IsOk()) @@ -911,7 +906,7 @@ void wxDataViewCtrlBase::ExpandAncestors( const wxDataViewItem & item ) parentChain.push_back(parent); parent = m_model->GetParent(parent); } - + // then we expand the parents, starting at the root while (!parentChain.empty()) { @@ -946,7 +941,6 @@ wxDataViewColumn * wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - wxDataViewColumn *ret = new wxDataViewColumn( label, new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, width, align, flags ); @@ -1213,24 +1207,28 @@ wxDataViewCtrlBase::InsertColumn( unsigned int WXUNUSED(pos), wxDataViewColumn * IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, wxDataViewEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED, wxDataViewEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, wxDataViewEvent ); // ------------------------------------- // wxDataViewSpinRenderer @@ -1354,6 +1352,244 @@ bool wxDataViewChoiceRenderer::GetValue( wxVariant &value ) const #endif +//----------------------------------------------------------------------------- +// wxDataViewListStore +//----------------------------------------------------------------------------- + +wxDataViewListStore::wxDataViewListStore() +{ +} + +wxDataViewListStore::~wxDataViewListStore() +{ + wxVector::iterator it; + for (it = m_data.begin(); it != m_data.end(); ++it) + { + wxDataViewListStoreLine* line = *it; + delete line; + } +} + +void wxDataViewListStore::PrependColumn( const wxString &varianttype ) +{ + m_cols.Insert( varianttype, 0 ); +} + +void wxDataViewListStore::InsertColumn( unsigned int pos, const wxString &varianttype ) +{ + m_cols.Insert( varianttype, pos ); +} + +void wxDataViewListStore::AppendColumn( const wxString &varianttype ) +{ + m_cols.Add( varianttype ); +} + +unsigned int wxDataViewListStore::GetColumnCount() const +{ + return m_cols.GetCount(); +} + +wxString wxDataViewListStore::GetColumnType( unsigned int pos ) const +{ + return m_cols[pos]; +} + +void wxDataViewListStore::AppendItem( const wxVector &values, wxClientData *data ) +{ + wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data ); + line->m_values = values; + m_data.push_back( line ); + + RowAppended(); +} + +void wxDataViewListStore::PrependItem( const wxVector &values, wxClientData *data ) +{ + wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data ); + line->m_values = values; + m_data.insert( m_data.begin(), line ); + + RowPrepended(); +} + +void wxDataViewListStore::InsertItem( unsigned int row, const wxVector &values, + wxClientData *data ) +{ + wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data ); + line->m_values = values; + m_data.insert( m_data.begin()+row, line ); + + RowInserted( row ); +} + +void wxDataViewListStore::DeleteItem( unsigned int row ) +{ + wxVector::iterator it = m_data.begin() + row; + m_data.erase( it ); + + RowDeleted( row ); +} + +void wxDataViewListStore::DeleteAllItems() +{ + wxVector::iterator it; + for (it = m_data.begin(); it != m_data.end(); ++it) + { + wxDataViewListStoreLine* line = *it; + delete line; + } + + m_data.clear(); + + Reset( 0 ); +} + +void wxDataViewListStore::GetValueByRow( wxVariant &value, unsigned int row, unsigned int col ) const +{ + wxDataViewListStoreLine *line = m_data[row]; + value = line->m_values[col]; +} + +bool wxDataViewListStore::SetValueByRow( const wxVariant &value, unsigned int row, unsigned int col ) +{ + wxDataViewListStoreLine *line = m_data[row]; + line->m_values[col] = value; + + return true; +} + +//----------------------------------------------------------------------------- +// wxDataViewListCtrl +//----------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxDataViewListCtrl,wxDataViewCtrl) + +BEGIN_EVENT_TABLE(wxDataViewListCtrl,wxDataViewCtrl) + EVT_SIZE( wxDataViewListCtrl::OnSize ) +END_EVENT_TABLE() + +wxDataViewListCtrl::wxDataViewListCtrl() +{ +} + +wxDataViewListCtrl::wxDataViewListCtrl( wxWindow *parent, wxWindowID id, + const wxPoint& pos, const wxSize& size, long style, + const wxValidator& validator ) +{ + Create( parent, id, pos, size, style, validator ); + + wxDataViewListStore *store = new wxDataViewListStore; + AssociateModel( store ); + store->DecRef(); +} + +wxDataViewListCtrl::~wxDataViewListCtrl() +{ +} + + +bool wxDataViewListCtrl::Create( wxWindow *parent, wxWindowID id, + const wxPoint& pos, const wxSize& size, long style, + const wxValidator& validator ) +{ + return wxDataViewCtrl::Create( parent, id, pos, size, style, validator ); +} + +bool wxDataViewListCtrl::AppendColumn( wxDataViewColumn *column, const wxString &varianttype ) +{ + GetStore()->AppendColumn( varianttype ); + return wxDataViewCtrl::AppendColumn( column ); +} + +bool wxDataViewListCtrl::PrependColumn( wxDataViewColumn *column, const wxString &varianttype ) +{ + GetStore()->PrependColumn( varianttype ); + return wxDataViewCtrl::PrependColumn( column ); +} + +bool wxDataViewListCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *column, const wxString &varianttype ) +{ + GetStore()->InsertColumn( pos, varianttype ); + return wxDataViewCtrl::InsertColumn( pos, column ); +} + +bool wxDataViewListCtrl::PrependColumn( wxDataViewColumn *col ) +{ + return PrependColumn( col, "string" ); +} + +bool wxDataViewListCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col ) +{ + return InsertColumn( pos, col, "string" ); +} + +bool wxDataViewListCtrl::AppendColumn( wxDataViewColumn *col ) +{ + return AppendColumn( col, "string" ); +} + +wxDataViewColumn *wxDataViewListCtrl::AppendTextColumn( const wxString &label, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + GetStore()->AppendColumn( wxT("string") ); + + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewTextRenderer( wxT("string"), mode ), + GetStore()->GetColumnCount()-1, width, align, flags ); + + wxDataViewCtrl::AppendColumn( ret ); + + return ret; +} + +wxDataViewColumn *wxDataViewListCtrl::AppendToggleColumn( const wxString &label, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + GetStore()->AppendColumn( wxT("bool") ); + + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewToggleRenderer( wxT("bool"), mode ), + GetStore()->GetColumnCount()-1, width, align, flags ); + + wxDataViewCtrl::AppendColumn( ret ); + + return ret; +} + +wxDataViewColumn *wxDataViewListCtrl::AppendProgressColumn( const wxString &label, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + GetStore()->AppendColumn( wxT("long") ); + + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), + GetStore()->GetColumnCount()-1, width, align, flags ); + + wxDataViewCtrl::AppendColumn( ret ); + + return ret; +} + +wxDataViewColumn *wxDataViewListCtrl::AppendIconTextColumn( const wxString &label, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + GetStore()->AppendColumn( wxT("wxDataViewIconText") ); + + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ), + GetStore()->GetColumnCount()-1, width, align, flags ); + + wxDataViewCtrl::AppendColumn( ret ); + + return ret; +} + +void wxDataViewListCtrl::OnSize( wxSizeEvent &event ) +{ + event.Skip( true ); +} + //----------------------------------------------------------------------------- // wxDataViewTreeStore //----------------------------------------------------------------------------- @@ -1413,9 +1649,6 @@ wxDataViewItem wxDataViewTreeStore::AppendItem( const wxDataViewItem& parent, new wxDataViewTreeStoreNode( parent_node, text, icon, data ); parent_node->GetChildren().Append( node ); - // notify control - ItemAdded( parent, node->GetItem() ); - return node->GetItem(); } @@ -1429,20 +1662,28 @@ wxDataViewItem wxDataViewTreeStore::PrependItem( const wxDataViewItem& parent, new wxDataViewTreeStoreNode( parent_node, text, icon, data ); parent_node->GetChildren().Insert( node ); - // notify control - ItemAdded( parent, node->GetItem() ); - return node->GetItem(); } wxDataViewItem -wxDataViewTreeStore::InsertItem(const wxDataViewItem& WXUNUSED(parent), - const wxDataViewItem& WXUNUSED(previous), - const wxString& WXUNUSED(text), - const wxIcon& WXUNUSED(icon), - wxClientData * WXUNUSED(data)) +wxDataViewTreeStore::InsertItem(const wxDataViewItem& parent, + const wxDataViewItem& previous, + const wxString& text, + const wxIcon& icon, + wxClientData *data) { - return wxDataViewItem(0); + wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); + if (!parent_node) return wxDataViewItem(0); + + wxDataViewTreeStoreNode *previous_node = FindNode( previous ); + int pos = parent_node->GetChildren().IndexOf( previous_node ); + if (pos == wxNOT_FOUND) return wxDataViewItem(0); + + wxDataViewTreeStoreNode *node = + new wxDataViewTreeStoreNode( parent_node, text, icon, data ); + parent_node->GetChildren().Insert( (size_t) pos, node ); + + return node->GetItem(); } wxDataViewItem wxDataViewTreeStore::PrependContainer( const wxDataViewItem& parent, @@ -1456,9 +1697,6 @@ wxDataViewItem wxDataViewTreeStore::PrependContainer( const wxDataViewItem& pare new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data ); parent_node->GetChildren().Insert( node ); - // notify control - ItemAdded( parent, node->GetItem() ); - return node->GetItem(); } @@ -1476,21 +1714,29 @@ wxDataViewTreeStore::AppendContainer(const wxDataViewItem& parent, new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data ); parent_node->GetChildren().Append( node ); - // notify control - ItemAdded( parent, node->GetItem() ); - return node->GetItem(); } wxDataViewItem -wxDataViewTreeStore::InsertContainer(const wxDataViewItem& WXUNUSED(parent), - const wxDataViewItem& WXUNUSED(previous), - const wxString& WXUNUSED(text), - const wxIcon& WXUNUSED(icon), - const wxIcon& WXUNUSED(expanded), - wxClientData * WXUNUSED(data)) +wxDataViewTreeStore::InsertContainer(const wxDataViewItem& parent, + const wxDataViewItem& previous, + const wxString& text, + const wxIcon& icon, + const wxIcon& expanded, + wxClientData * data) { - return wxDataViewItem(0); + wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); + if (!parent_node) return wxDataViewItem(0); + + wxDataViewTreeStoreNode *previous_node = FindNode( previous ); + int pos = parent_node->GetChildren().IndexOf( previous_node ); + if (pos == wxNOT_FOUND) return wxDataViewItem(0); + + wxDataViewTreeStoreContainerNode *node = + new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data ); + parent_node->GetChildren().Insert( (size_t) pos, node ); + + return node->GetItem(); } wxDataViewItem wxDataViewTreeStore::GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const @@ -1523,9 +1769,6 @@ void wxDataViewTreeStore::SetItemText( const wxDataViewItem& item, const wxStrin if (!node) return; node->SetText( text ); - - // notify control - ValueChanged( item, 0 ); } wxString wxDataViewTreeStore::GetItemText( const wxDataViewItem& item ) const @@ -1542,9 +1785,6 @@ void wxDataViewTreeStore::SetItemIcon( const wxDataViewItem& item, const wxIcon if (!node) return; node->SetIcon( icon ); - - // notify control - ValueChanged( item, 0 ); } const wxIcon &wxDataViewTreeStore::GetItemIcon( const wxDataViewItem& item ) const @@ -1561,9 +1801,6 @@ void wxDataViewTreeStore::SetItemExpandedIcon( const wxDataViewItem& item, const if (!node) return; node->SetExpandedIcon( icon ); - - // notify control - ValueChanged( item, 0 ); } const wxIcon &wxDataViewTreeStore::GetItemExpandedIcon( const wxDataViewItem& item ) const @@ -1580,9 +1817,6 @@ void wxDataViewTreeStore::SetItemData( const wxDataViewItem& item, wxClientData if (!node) return; node->SetData( data ); - - // notify control? only sensible when sorting on client data - // ValueChanged( item, 0 ); } wxClientData *wxDataViewTreeStore::GetItemData( const wxDataViewItem& item ) const @@ -1606,9 +1840,6 @@ void wxDataViewTreeStore::DeleteItem( const wxDataViewItem& item ) if (!node) return; parent_node->GetChildren().DeleteObject( node ); - - // notify control - ItemDeleted( parent_item, item ); } void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item ) @@ -1616,18 +1847,7 @@ void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item ) wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); if (!node) return; - wxDataViewItemArray array; - wxDataViewTreeStoreNodeList::iterator iter; - for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); iter++) - { - wxDataViewTreeStoreNode* child = *iter; - array.Add( child->GetItem() ); - } - node->GetChildren().clear(); - - // notify control - ItemsDeleted( item, array ); } void wxDataViewTreeStore::DeleteAllItems() @@ -1716,7 +1936,7 @@ unsigned int wxDataViewTreeStore::GetChildren( const wxDataViewItem &item, wxDat } int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, - unsigned int WXUNUSED(column), bool WXUNUSED(ascending) ) + unsigned int WXUNUSED(column), bool WXUNUSED(ascending) ) const { wxDataViewTreeStoreNode *node1 = FindNode( item1 ); wxDataViewTreeStoreNode *node2 = FindNode( item2 ); @@ -1822,7 +2042,11 @@ wxDataViewItem wxDataViewTreeCtrl::AppendItem( const wxDataViewItem& parent, if (m_imageList && (iconIndex != -1)) icon = m_imageList->GetIcon( iconIndex ); - return GetStore()->AppendItem( parent, text, icon, data ); + wxDataViewItem res = GetStore()->AppendItem( parent, text, icon, data ); + + GetStore()->ItemAdded( parent, res ); + + return res; } wxDataViewItem wxDataViewTreeCtrl::PrependItem( const wxDataViewItem& parent, @@ -1832,7 +2056,11 @@ wxDataViewItem wxDataViewTreeCtrl::PrependItem( const wxDataViewItem& parent, if (m_imageList && (iconIndex != -1)) icon = m_imageList->GetIcon( iconIndex ); - return GetStore()->PrependItem( parent, text, icon, data ); + wxDataViewItem res = GetStore()->PrependItem( parent, text, icon, data ); + + GetStore()->ItemAdded( parent, res ); + + return res; } wxDataViewItem wxDataViewTreeCtrl::InsertItem( const wxDataViewItem& parent, const wxDataViewItem& previous, @@ -1842,7 +2070,11 @@ wxDataViewItem wxDataViewTreeCtrl::InsertItem( const wxDataViewItem& parent, con if (m_imageList && (iconIndex != -1)) icon = m_imageList->GetIcon( iconIndex ); - return GetStore()->InsertItem( parent, previous, text, icon, data ); + wxDataViewItem res = GetStore()->InsertItem( parent, previous, text, icon, data ); + + GetStore()->ItemAdded( parent, res ); + + return res; } wxDataViewItem wxDataViewTreeCtrl::PrependContainer( const wxDataViewItem& parent, @@ -1856,7 +2088,11 @@ wxDataViewItem wxDataViewTreeCtrl::PrependContainer( const wxDataViewItem& paren if (m_imageList && (expandedIndex != -1)) expanded = m_imageList->GetIcon( expandedIndex ); - return GetStore()->PrependContainer( parent, text, icon, expanded, data ); + wxDataViewItem res = GetStore()->PrependContainer( parent, text, icon, expanded, data ); + + GetStore()->ItemAdded( parent, res ); + + return res; } wxDataViewItem wxDataViewTreeCtrl::AppendContainer( const wxDataViewItem& parent, @@ -1870,7 +2106,11 @@ wxDataViewItem wxDataViewTreeCtrl::AppendContainer( const wxDataViewItem& parent if (m_imageList && (expandedIndex != -1)) expanded = m_imageList->GetIcon( expandedIndex ); - return GetStore()->AppendContainer( parent, text, icon, expanded, data ); + wxDataViewItem res = GetStore()->AppendContainer( parent, text, icon, expanded, data ); + + GetStore()->ItemAdded( parent, res ); + + return res; } wxDataViewItem wxDataViewTreeCtrl::InsertContainer( const wxDataViewItem& parent, const wxDataViewItem& previous, @@ -1884,7 +2124,71 @@ wxDataViewItem wxDataViewTreeCtrl::InsertContainer( const wxDataViewItem& parent if (m_imageList && (expandedIndex != -1)) expanded = m_imageList->GetIcon( expandedIndex ); - return GetStore()->InsertContainer( parent, previous, text, icon, expanded, data ); + wxDataViewItem res = GetStore()->InsertContainer( parent, previous, text, icon, expanded, data ); + + GetStore()->ItemAdded( parent, res ); + + return res; +} + +void wxDataViewTreeCtrl::SetItemText( const wxDataViewItem& item, const wxString &text ) +{ + GetStore()->SetItemText(item,text); + + // notify control + GetStore()->ValueChanged( item, 0 ); +} + +void wxDataViewTreeCtrl::SetItemIcon( const wxDataViewItem& item, const wxIcon &icon ) +{ + GetStore()->SetItemIcon(item,icon); + + // notify control + GetStore()->ValueChanged( item, 0 ); +} + +void wxDataViewTreeCtrl::SetItemExpandedIcon( const wxDataViewItem& item, const wxIcon &icon ) +{ + GetStore()->SetItemExpandedIcon(item,icon); + + // notify control + GetStore()->ValueChanged( item, 0 ); +} + +void wxDataViewTreeCtrl::DeleteItem( const wxDataViewItem& item ) +{ + wxDataViewItem parent_item = GetStore()->GetParent( item ); + + GetStore()->DeleteItem(item); + + // notify control + GetStore()->ItemDeleted( parent_item, item ); +} + +void wxDataViewTreeCtrl::DeleteChildren( const wxDataViewItem& item ) +{ + wxDataViewTreeStoreContainerNode *node = GetStore()->FindContainerNode( item ); + if (!node) return; + + wxDataViewItemArray array; + wxDataViewTreeStoreNodeList::iterator iter; + for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); iter++) + { + wxDataViewTreeStoreNode* child = *iter; + array.Add( child->GetItem() ); + } + + GetStore()->DeleteChildren( item ); + + // notify control + GetStore()->ItemsDeleted( item, array ); +} + +void wxDataViewTreeCtrl::DeleteAllItems() +{ + GetStore()->DeleteAllItems(); + + GetStore()->Cleared(); } void wxDataViewTreeCtrl::OnExpanded( wxDataViewEvent &event ) @@ -1895,6 +2199,7 @@ void wxDataViewTreeCtrl::OnExpanded( wxDataViewEvent &event ) if (!container) return; container->SetExpanded( true ); + GetStore()->ItemChanged( event.GetItem() ); } @@ -1906,6 +2211,7 @@ void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event ) if (!container) return; container->SetExpanded( false ); + GetStore()->ItemChanged( event.GetItem() ); }