X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7445ff8ee26e39fab1e35455e1bef954bdf636f..09294e12fb454fa5a6b66b1ef031fee9cb43dd11:/src/common/datavcmn.cpp diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 87d0a54f73..058d93c724 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -19,494 +19,659 @@ #include "wx/dataview.h" +#include "wx/spinctrl.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 -WXDLLIMPEXP_DATA_ADV(const wxChar) wxDataViewCtrlNameStr[] = wxT("dataviewCtrl"); +const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl"); -// --------------------------------------------------------- -// wxDataViewModel -// --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewModel, wxObject) +bool operator == (const wxDataViewItem &left, const wxDataViewItem &right) +{ + return (left.GetID() == right.GetID() ); +} + +#ifdef __WXDEBUG__ +void wxDataViewItem::Print(const wxString& text) const +{ + wxPrintf("item %s: %l\n", text, (long)m_id); +} +#endif // --------------------------------------------------------- -// wxDataViewListModel +// wxDataViewModelNotifier // --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel) +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxDataViewModelNotifiers) -wxDataViewListModel::wxDataViewListModel() +bool wxDataViewModelNotifier::ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items ) { - m_viewingColumns.DeleteContents( true ); - m_notifiers.DeleteContents( true ); + size_t count = items.GetCount(); + size_t i; + for (i = 0; i < count; i++) + if (!ItemAdded( parent, items[i] )) return false; + + return true; +} + +bool wxDataViewModelNotifier::ItemsDeleted( const wxDataViewItem &parent, const wxDataViewItemArray &items ) +{ + size_t count = items.GetCount(); + size_t i; + for (i = 0; i < count; i++) + if (!ItemDeleted( parent, items[i] )) return false; + + return true; +} + +bool wxDataViewModelNotifier::ItemsChanged( const wxDataViewItemArray &items ) +{ + size_t count = items.GetCount(); + size_t i; + for (i = 0; i < count; i++) + if (!ItemChanged( items[i] )) return false; + + return true; } -wxDataViewListModel::~wxDataViewListModel() +// --------------------------------------------------------- +// wxDataViewModel +// --------------------------------------------------------- + +wxDataViewModel::wxDataViewModel() { + m_notifiers.DeleteContents( true ); } -bool wxDataViewListModel::RowAppended() +bool wxDataViewModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) { bool ret = true; - wxList::compatibility_iterator node = m_notifiers.GetFirst(); - while (node) + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) { - wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData(); - if (!notifier->RowAppended()) + wxDataViewModelNotifier* notifier = *iter; + if (!notifier->ItemAdded( parent, item )) ret = false; - node = node->GetNext(); } return ret; } -bool wxDataViewListModel::RowPrepended() +bool wxDataViewModel::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) { bool ret = true; - wxList::compatibility_iterator node = m_notifiers.GetFirst(); - while (node) + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) { - wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData(); - if (!notifier->RowPrepended()) + wxDataViewModelNotifier* notifier = *iter; + if (!notifier->ItemDeleted( parent, item )) ret = false; - node = node->GetNext(); } return ret; } -bool wxDataViewListModel::RowInserted( size_t before ) +bool wxDataViewModel::ItemChanged( const wxDataViewItem &item ) { bool ret = true; - wxList::compatibility_iterator node = m_notifiers.GetFirst(); - while (node) + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) { - wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData(); - if (!notifier->RowInserted(before)) + wxDataViewModelNotifier* notifier = *iter; + if (!notifier->ItemChanged( item )) ret = false; - node = node->GetNext(); } return ret; } -bool wxDataViewListModel::RowDeleted( size_t row ) +bool wxDataViewModel::ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items ) { bool ret = true; - wxList::compatibility_iterator node = m_notifiers.GetFirst(); - while (node) + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) { - wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData(); - if (!notifier->RowDeleted( row )) + wxDataViewModelNotifier* notifier = *iter; + if (!notifier->ItemsAdded( parent, items )) ret = false; - node = node->GetNext(); } return ret; } -bool wxDataViewListModel::RowChanged( size_t row ) +bool wxDataViewModel::ItemsDeleted( const wxDataViewItem &parent, const wxDataViewItemArray &items ) { bool ret = true; - wxList::compatibility_iterator node = m_notifiers.GetFirst(); - while (node) + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) { - wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData(); - if (!notifier->RowChanged( row )) + wxDataViewModelNotifier* notifier = *iter; + if (!notifier->ItemsDeleted( parent, items )) ret = false; - node = node->GetNext(); } return ret; } -bool wxDataViewListModel::ValueChanged( size_t col, size_t row ) +bool wxDataViewModel::ItemsChanged( const wxDataViewItemArray &items ) { bool ret = true; - wxList::compatibility_iterator node = m_notifiers.GetFirst(); - while (node) + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) { - wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData(); - if (!notifier->ValueChanged( col, row )) + wxDataViewModelNotifier* notifier = *iter; + if (!notifier->ItemsChanged( items )) ret = false; - node = node->GetNext(); } return ret; } -bool wxDataViewListModel::RowsReordered( size_t *new_order ) +bool wxDataViewModel::ValueChanged( const wxDataViewItem &item, unsigned int col ) { bool ret = true; - wxList::compatibility_iterator node = m_notifiers.GetFirst(); - while (node) + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) { - wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData(); - if (!notifier->RowsReordered( new_order )) + wxDataViewModelNotifier* notifier = *iter; + if (!notifier->ValueChanged( item, col )) ret = false; - node = node->GetNext(); } return ret; } -bool wxDataViewListModel::Cleared() +bool wxDataViewModel::Cleared() { bool ret = true; - wxList::compatibility_iterator node = m_notifiers.GetFirst(); - while (node) + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) { - wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData(); + wxDataViewModelNotifier* notifier = *iter; if (!notifier->Cleared()) ret = false; - node = node->GetNext(); } return ret; } -void wxDataViewListModel::AddViewingColumn( wxDataViewColumn *view_column, size_t model_column ) -{ - m_viewingColumns.Append( new wxDataViewViewingColumn( view_column, model_column ) ); -} - -void wxDataViewListModel::RemoveViewingColumn( wxDataViewColumn *column ) +void wxDataViewModel::Resort() { - wxList::compatibility_iterator node = m_viewingColumns.GetFirst(); - while (node) + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) { - wxDataViewViewingColumn* tmp = (wxDataViewViewingColumn*) node->GetData(); - - if (tmp->m_viewColumn == column) - { - m_viewingColumns.DeleteObject( tmp ); - return; - } - - node = node->GetNext(); + wxDataViewModelNotifier* notifier = *iter; + notifier->Resort(); } } -void wxDataViewListModel::AddNotifier( wxDataViewListModelNotifier *notifier ) +void wxDataViewModel::AddNotifier( wxDataViewModelNotifier *notifier ) { - m_notifiers.Append( notifier ); + m_notifiers.push_back( notifier ); notifier->SetOwner( this ); } -void wxDataViewListModel::RemoveNotifier( wxDataViewListModelNotifier *notifier ) +void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier ) { m_notifiers.DeleteObject( notifier ); } -// --------------------------------------------------------- -// wxDataViewSortedListModelNotifier -// --------------------------------------------------------- - -class wxDataViewSortedListModelNotifier: public wxDataViewListModelNotifier +int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, + unsigned int column, bool ascending ) { -public: - wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model ) - { m_model = model; } + // sort branches before leaves + bool item1_is_container = IsContainer(item1); + bool item2_is_container = IsContainer(item2); - virtual bool RowAppended() { return true; } - virtual bool RowPrepended() { return true; } - virtual bool RowInserted( size_t WXUNUSED(before) ) { return true; } - virtual bool RowDeleted( size_t WXUNUSED(row) ) { return true; } - virtual bool RowChanged( size_t WXUNUSED(row) ) { return true; } - virtual bool ValueChanged( size_t col, size_t row ) - { return m_model->ChildValueChanged( col, row); } - virtual bool RowsReordered( size_t *WXUNUSED(new_order) ) { return true; } - virtual bool Cleared() { return true; } + if (item1_is_container && !item2_is_container) + return 1; + if (item2_is_container && !item1_is_container) + return -1; - wxDataViewSortedListModel *m_model; -}; + wxVariant value1,value2; + GetValue( value1, item1, column ); + GetValue( value2, item2, column ); -// --------------------------------------------------------- -// wxDataViewSortedListModel compare function -// --------------------------------------------------------- + if (!ascending) + { + wxVariant temp = value1; + value1 = value2; + value2 = temp; + } -int wxCALLBACK wxDataViewListModelSortedDefaultCompare - (size_t row1, size_t row2, size_t col, wxDataViewListModel* model ) -{ - wxVariant value1,value2; - model->GetValue( value1, col, row1 ); - model->GetValue( value2, col, row2 ); if (value1.GetType() == wxT("string")) { wxString str1 = value1.GetString(); wxString str2 = value2.GetString(); - return str1.Cmp( str2 ); - } + int res = str1.Cmp( str2 ); + if (res) return res; + } else if (value1.GetType() == wxT("long")) { long l1 = value1.GetLong(); long l2 = value2.GetLong(); - return l1-l2; - } + long res = l1-l2; + if (res) return res; + } else if (value1.GetType() == wxT("double")) { double d1 = value1.GetDouble(); double d2 = value2.GetDouble(); - if (d1 == d2) return 0; if (d1 < d2) return 1; - return -1; - } + if (d1 > d2) return -1; + } else if (value1.GetType() == wxT("datetime")) { wxDateTime dt1 = value1.GetDateTime(); wxDateTime dt2 = value2.GetDateTime(); - if (dt1.IsEqualTo(dt2)) return 0; if (dt1.IsEarlierThan(dt2)) return 1; - return -1; + if (dt2.IsEarlierThan(dt1)) return -11; } - return 0; -} + // items must be different + unsigned long litem1 = (unsigned long) item1.GetID(); + unsigned long litem2 = (unsigned long) item2.GetID(); -static wxDataViewListModelCompare s_CmpFunc; -static wxDataViewListModel *s_CmpModel; -static size_t s_CmpCol; + if (!ascending) + return litem2-litem2; -int LINKAGEMODE wxDataViewIntermediateCmp( size_t row1, size_t row2 ) -{ - return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel ); + return litem1-litem2; } // --------------------------------------------------------- -// wxDataViewSortedListModel +// wxDataViewIndexListModel // --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewSortedListModel, wxDataViewListModel) - -wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child ) : - m_array( wxDataViewIntermediateCmp ) +wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size ) { - m_child = child; - s_CmpCol = 0; - s_CmpModel = child; - s_CmpFunc = wxDataViewListModelSortedDefaultCompare; +#ifndef __WXMAC__ + m_useHash = false; +#else + m_useHash = true; +#endif + + if (m_useHash) + { + // IDs are ordered until an item gets deleted or inserted + m_ordered = true; + + // build initial index + unsigned int i; + for (i = 1; i < initial_size+1; i++) + m_hash.Add( (void*) i ); + m_lastIndex = initial_size + 1; + } + else + { + m_lastIndex = initial_size-1; + } +} - m_notifierOnChild = new wxDataViewSortedListModelNotifier( this ); - m_child->AddNotifier( m_notifierOnChild ); +wxDataViewIndexListModel::~wxDataViewIndexListModel() +{ +} - Resort(); +void wxDataViewIndexListModel::RowPrepended() +{ + if (m_useHash) + { + m_ordered = false; + + unsigned int id = m_lastIndex++; + m_hash.Insert( (void*) id, 0 ); + wxDataViewItem item( (void*) id ); + ItemAdded( wxDataViewItem(0), item ); + } + else + { + m_lastIndex++; + wxDataViewItem item( (void*) 0 ); + ItemAdded( wxDataViewItem(0), item ); + } } -wxDataViewSortedListModel::~wxDataViewSortedListModel() +void wxDataViewIndexListModel::RowInserted( unsigned int before ) { - m_child->RemoveNotifier( m_notifierOnChild ); + if (m_useHash) + { + m_ordered = false; + + unsigned int id = m_lastIndex++; + m_hash.Insert( (void*) id, before ); + wxDataViewItem item( (void*) id ); + ItemAdded( wxDataViewItem(0), item ); + } + else + { + m_lastIndex++; + wxDataViewItem item( (void*) before ); + ItemAdded( wxDataViewItem(0), item ); + } } -void wxDataViewSortedListModel::Resort() +void wxDataViewIndexListModel::RowAppended() { - m_array.Clear(); - size_t n = m_child->GetNumberOfRows(); - size_t i; - for (i = 0; i < n; i++) - m_array.Add( i ); + if (m_useHash) + { + unsigned int id = m_lastIndex++; + m_hash.Add( (void*) id ); + wxDataViewItem item( (void*) id ); + ItemAdded( wxDataViewItem(0), item ); + } + else + { + m_lastIndex++; + wxDataViewItem item( (void*) m_lastIndex ); + ItemAdded( wxDataViewItem(0), item ); + } } -#if 0 -static void Dump( wxDataViewListModel *model, size_t col ) +void wxDataViewIndexListModel::RowDeleted( unsigned int row ) { - size_t n = model->GetNumberOfRows(); - size_t i; - for (i = 0; i < n; i++) + if (m_useHash) + { + wxDataViewItem item( m_hash[row] ); + wxDataViewModel::ItemDeleted( wxDataViewItem(0), item ); + m_hash.RemoveAt( row ); + } + else { - wxVariant variant; - model->GetValue( variant, col, i ); - wxString tmp; - tmp = variant.GetString(); - wxPrintf( wxT("%d: %s\n"), (int) i, tmp.c_str() ); + wxDataViewItem item( (void*) row ); + wxDataViewModel::ItemDeleted( wxDataViewItem(0), item ); + m_lastIndex++; } } -#endif -bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row ) +void wxDataViewIndexListModel::RowChanged( unsigned int row ) { - size_t i; - size_t len = m_array.GetCount(); + wxDataViewModel::ItemChanged( GetItem(row) ); +} - // Remove and readd sorted. Find out at which - // position it was and where it ended. - size_t start_pos = 0,end_pos = 0; - for (i = 0; i < len; i++) - if (m_array[i] == row) - { - start_pos = i; - break; - } - m_array.RemoveAt( start_pos ); - m_array.Add( row ); +void wxDataViewIndexListModel::RowValueChanged( unsigned int row, unsigned int col ) +{ + wxDataViewModel::ValueChanged( GetItem(row), col ); +} - for (i = 0; i < len; i++) - if (m_array[i] == row) +unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) const +{ + if (m_useHash) + { + if (m_ordered) { - end_pos = i; - break; + unsigned int pos = wxPtrToUInt( item.GetID() ); + return pos-1; } + + // assert for not found + return (unsigned int) m_hash.Index( item.GetID() ); + } + else + { + return wxPtrToUInt( item.GetID() ); + } +} - if (end_pos == start_pos) - return wxDataViewListModel::ValueChanged( col, start_pos ); - - // Create an array where order[old] -> new_pos, so that - // if nothing changed order[0] -> 0 etc. - size_t *order = new size_t[ len ]; - // Fill up initial values. - for (i = 0; i < len; i++) - order[i] = i; - - if (start_pos < end_pos) +wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const +{ + if (m_useHash) { - for (i = start_pos; i < end_pos; i++) - order[i] = order[i+1]; - order[end_pos] = start_pos; + wxASSERT( row < m_hash.GetCount() ); + return wxDataViewItem( m_hash[row] ); } else { - for (i = end_pos; i > start_pos; i--) - order[i] = order[i-1]; - order[start_pos] = end_pos; + return wxDataViewItem( (void*) row ); } +} - wxDataViewListModel::RowsReordered( order ); +bool wxDataViewIndexListModel::HasDefaultCompare() const +{ + return !m_ordered; +} - delete [] order; +int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1, + const wxDataViewItem& item2, + unsigned int WXUNUSED(column), + bool ascending) +{ + if (m_ordered || !m_useHash) + { + unsigned int pos1 = wxPtrToUInt(item1.GetID()); + unsigned int pos2 = wxPtrToUInt(item2.GetID()); + + if (ascending) + return pos1 - pos2; + else + return pos2 - pos1; + } + + if (ascending) + return GetRow(item1) - GetRow(item2); - return true; + return GetRow(item2) - GetRow(item1); } -size_t wxDataViewSortedListModel::GetNumberOfRows() +void wxDataViewIndexListModel::GetValue( wxVariant &variant, + const wxDataViewItem &item, unsigned int col ) const { - return m_array.GetCount(); + GetValue( variant, GetRow(item), col ); } -size_t wxDataViewSortedListModel::GetNumberOfCols() +bool wxDataViewIndexListModel::SetValue( const wxVariant &variant, + const wxDataViewItem &item, unsigned int col ) { - return m_child->GetNumberOfCols(); + return SetValue( variant, GetRow(item), col ); } -wxString wxDataViewSortedListModel::GetColType( size_t col ) +bool wxDataViewIndexListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr ) { - return m_child->GetColType( col ); + return GetAttr( GetRow(item), col, attr ); } -void wxDataViewSortedListModel::GetValue( wxVariant &variant, size_t col, size_t row ) +wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const { - size_t child_row = m_array[row]; - m_child->GetValue( variant, col, child_row ); + return wxDataViewItem(0); } -bool wxDataViewSortedListModel::SetValue( wxVariant &variant, size_t col, size_t row ) +bool wxDataViewIndexListModel::IsContainer( const wxDataViewItem &item ) const { - size_t child_row = m_array[row]; - bool ret = m_child->SetValue( variant, col, child_row ); - - // Resort in ::ChildValueChanged() which gets reported back. + // only the invisible root item has children + if (!item.IsOk()) + return true; - return ret; + return false; } -bool wxDataViewSortedListModel::RowAppended() +unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const { - // you can only append - bool ret = m_child->RowAppended(); + if (!m_useHash) + return 0; // error + + if (item.IsOk()) + return 0; - // report RowInsrted + children = m_hash; - return ret; + return m_hash.GetCount(); } -bool wxDataViewSortedListModel::RowPrepended() -{ - // you can only append - bool ret = m_child->RowAppended(); +//----------------------------------------------------------------------------- +// wxDataViewIconText +//----------------------------------------------------------------------------- - // report RowInsrted +IMPLEMENT_DYNAMIC_CLASS(wxDataViewIconText,wxObject) - return ret; -} +IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV) -bool wxDataViewSortedListModel::RowInserted( size_t WXUNUSED(before) ) +bool operator == (const wxDataViewIconText &one, const wxDataViewIconText &two) { - // you can only append - bool ret = m_child->RowAppended(); + if (one.GetText() != two.GetText()) return false; + if (one.IsSameAs(two)) return false; + return true; +} + +// --------------------------------------------------------- +// wxDataViewRendererBase +// --------------------------------------------------------- - // report different RowInsrted +IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject) - return ret; +wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, + wxDataViewCellMode WXUNUSED(mode), + int WXUNUSED(align) ) +{ + m_variantType = varianttype; + m_editorCtrl = NULL; } -bool wxDataViewSortedListModel::RowDeleted( size_t row ) +const wxDataViewCtrl* wxDataViewRendererBase::GetView() const { - size_t child_row = m_array[row]; + return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner(); +} + +bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect ) +{ + m_item = item; // remember for later - bool ret = m_child->RowDeleted( child_row ); + unsigned int col = GetOwner()->GetModelColumn(); + wxVariant value; + GetOwner()->GetOwner()->GetModel()->GetValue( value, item, col ); - // Do nothing here as the change in the - // child model will be reported back. + m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value ); - return ret; + wxDataViewEditorCtrlEvtHandler *handler = + new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this ); + + m_editorCtrl->PushEventHandler( handler ); + +#if defined(__WXGTK20__) && !defined(wxUSE_GENERICDATAVIEWCTRL) + handler->SetFocusOnIdle(); +#else + m_editorCtrl->SetFocus(); +#endif + + // Now we should send Editing Started event + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, GetOwner()->GetOwner()->GetId() ); + event.SetDataViewColumn( GetOwner() ); + event.SetModel( GetOwner()->GetOwner()->GetModel() ); + event.SetItem( item ); + GetOwner()->GetOwner()->GetEventHandler()->ProcessEvent( event ); + + return true; } -bool wxDataViewSortedListModel::RowChanged( size_t row ) +void wxDataViewRendererBase::CancelEditing() { - size_t child_row = m_array[row]; - bool ret = m_child->RowChanged( child_row ); + wxPendingDelete.Append( m_editorCtrl ); - // Do nothing here as the change in the - // child model will be reported back. + GetOwner()->GetOwner()->GetMainWindow()->SetFocus(); - return ret; + // m_editorCtrl->PopEventHandler( true ); } -bool wxDataViewSortedListModel::ValueChanged( size_t col, size_t row ) +bool wxDataViewRendererBase::FinishEditing() { - size_t child_row = m_array[row]; - bool ret = m_child->ValueChanged( col, child_row ); + wxVariant value; + GetValueFromEditorCtrl( m_editorCtrl, value ); - // Do nothing here as the change in the - // child model will be reported back. + wxPendingDelete.Append( m_editorCtrl ); - return ret; + GetOwner()->GetOwner()->GetMainWindow()->SetFocus(); + + if (!Validate(value)) + return false; + + unsigned int col = GetOwner()->GetModelColumn(); + GetOwner()->GetOwner()->GetModel()->SetValue( value, m_item, col ); + GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col ); + + // m_editorCtrl->PopEventHandler( true ); + + // Now we should send Editing Done event + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, GetOwner()->GetOwner()->GetId() ); + event.SetDataViewColumn( GetOwner() ); + event.SetModel( GetOwner()->GetOwner()->GetModel() ); + event.SetItem( m_item ); + GetOwner()->GetOwner()->GetEventHandler()->ProcessEvent( event ); + + return true; } -bool wxDataViewSortedListModel::RowsReordered( size_t *WXUNUSED(new_order) ) +//----------------------------------------------------------------------------- +// wxDataViewEditorCtrlEvtHandler +//----------------------------------------------------------------------------- + +BEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler) + EVT_CHAR (wxDataViewEditorCtrlEvtHandler::OnChar) + EVT_KILL_FOCUS (wxDataViewEditorCtrlEvtHandler::OnKillFocus) + EVT_IDLE (wxDataViewEditorCtrlEvtHandler::OnIdle) +END_EVENT_TABLE() + +wxDataViewEditorCtrlEvtHandler::wxDataViewEditorCtrlEvtHandler( + wxControl *editorCtrl, + wxDataViewRenderer *owner ) { - // We sort them ourselves. + m_owner = owner; + m_editorCtrl = editorCtrl; - return false; + m_finished = false; } -bool wxDataViewSortedListModel::Cleared() +void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event ) { - bool ret = m_child->Cleared(); - - wxDataViewListModel::Cleared(); + if (m_focusOnIdle) + { + m_focusOnIdle = false; + if (wxWindow::FindFocus() != m_editorCtrl) + m_editorCtrl->SetFocus(); + } - return ret; + event.Skip(); } -// --------------------------------------------------------- -// wxDataViewCellBase -// --------------------------------------------------------- +void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event ) +{ + switch ( event.m_keyCode ) + { + case WXK_RETURN: + m_finished = true; + m_owner->FinishEditing(); + break; + + case WXK_ESCAPE: + m_finished = true; + m_owner->CancelEditing(); + break; -IMPLEMENT_ABSTRACT_CLASS(wxDataViewCellBase, wxObject) + default: + event.Skip(); + } +} -wxDataViewCellBase::wxDataViewCellBase( const wxString &varianttype, wxDataViewCellMode mode ) +void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event ) { - m_variantType = varianttype; - m_mode = mode; + if (!m_finished) + { + m_finished = true; + m_owner->FinishEditing(); + } + + event.Skip(); } // --------------------------------------------------------- @@ -515,40 +680,61 @@ wxDataViewCellBase::wxDataViewCellBase( const wxString &varianttype, wxDataViewC IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject) -wxDataViewColumnBase::wxDataViewColumnBase(const wxString& title, - wxDataViewCell *cell, - size_t model_column, - int WXUNUSED(fixed_width), - wxDataViewColumnSizing WXUNUSED(sizing), - int flags ) +wxDataViewColumnBase::wxDataViewColumnBase(const wxString& WXUNUSED(title), + wxDataViewRenderer *renderer, + unsigned int model_column, + int WXUNUSED(width), + wxAlignment WXUNUSED(align), + int WXUNUSED(flags)) { - m_cell = cell; + m_renderer = renderer; m_model_column = model_column; - m_flags = flags; - m_title = title; m_owner = NULL; - m_cell->SetOwner( (wxDataViewColumn*) this ); + m_renderer->SetOwner( (wxDataViewColumn*) this ); + + // NOTE: the wxDataViewColumn's ctor must store the width, align, flags + // parameters inside the native control! } -wxDataViewColumnBase::~wxDataViewColumnBase() +wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap, + wxDataViewRenderer *renderer, + unsigned int model_column, + int WXUNUSED(width), + wxAlignment WXUNUSED(align), + int WXUNUSED(flags) ) { - if (m_cell) - delete m_cell; + m_renderer = renderer; + m_model_column = model_column; + m_bitmap = bitmap; + m_owner = NULL; + m_renderer->SetOwner( (wxDataViewColumn*) this ); +} - if (GetOwner()) - { - GetOwner()->GetModel()->RemoveViewingColumn( (wxDataViewColumn*) this ); - } +wxDataViewColumnBase::~wxDataViewColumnBase() +{ + if (m_renderer) + delete m_renderer; } -void wxDataViewColumnBase::SetTitle( const wxString &title ) +int wxDataViewColumnBase::GetFlags() const { - m_title = title; + int ret = 0; + + if (IsSortable()) + ret |= wxDATAVIEW_COL_SORTABLE; + if (IsResizeable()) + ret |= wxDATAVIEW_COL_RESIZABLE; + if (IsHidden()) + ret |= wxDATAVIEW_COL_HIDDEN; + + return ret; } -wxString wxDataViewColumnBase::GetTitle() +void wxDataViewColumnBase::SetFlags(int flags) { - return m_title; + SetSortable((flags & wxDATAVIEW_COL_SORTABLE) != 0); + SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0); + SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0); } // --------------------------------------------------------- @@ -560,71 +746,967 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl) wxDataViewCtrlBase::wxDataViewCtrlBase() { m_model = NULL; - m_cols.DeleteContents( true ); + m_expander_column = 0; + m_indent = 8; } wxDataViewCtrlBase::~wxDataViewCtrlBase() { + if (m_model) + { + m_model->DecRef(); + m_model = NULL; + } } -bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model ) +bool wxDataViewCtrlBase::AssociateModel( wxDataViewModel *model ) { + if (m_model) + { + m_model->DecRef(); // discard old model, if any + } + + // add our own reference to the new model: m_model = model; + if (m_model) + { + m_model->IncRef(); + } return true; } -wxDataViewListModel* wxDataViewCtrlBase::GetModel() +wxDataViewModel* wxDataViewCtrlBase::GetModel() { return m_model; } -bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, size_t model_column ) +const wxDataViewModel* wxDataViewCtrlBase::GetModel() const { - return AppendColumn( new wxDataViewColumn( label, new wxDataViewTextCell(), model_column ) ); + return m_model; } -bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, size_t model_column ) +wxDataViewColumn * +wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, new wxDataViewToggleCell(), model_column, 30 ) ); + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, size_t model_column ) +wxDataViewColumn * +wxDataViewCtrlBase::AppendIconTextColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, new wxDataViewProgressCell(), model_column, 70 ) ); + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, size_t model_column ) +wxDataViewColumn * +wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, new wxDataViewDateCell(), model_column ) ); + + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col ) +wxDataViewColumn * +wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - m_cols.Append( (wxObject*) col ); - col->SetOwner( (wxDataViewCtrl*) this ); - m_model->AddViewingColumn( col, col->GetModelColumn() ); - return true; + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -size_t wxDataViewCtrlBase::GetNumberOfColumns() +wxDataViewColumn * +wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return m_cols.GetCount(); + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::DeleteColumn( size_t WXUNUSED(pos) ) +wxDataViewColumn * +wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return false; + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::ClearColumns() +wxDataViewColumn * +wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return false; + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -wxDataViewColumn* wxDataViewCtrlBase::GetColumn( size_t pos ) +wxDataViewColumn * +wxDataViewCtrlBase::AppendIconTextColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return (wxDataViewColumn*) m_cols[ pos ]; + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -#endif +wxDataViewColumn * +wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::PrependTextColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::PrependIconTextColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::PrependToggleColumn( 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, (int)align ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::PrependProgressColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::PrependDateColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::PrependBitmapColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::PrependTextColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::PrependIconTextColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::PrependToggleColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::PrependProgressColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::PrependDateColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::PrependBitmapColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) +{ + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; +} + +bool +wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col ) +{ + col->SetOwner( (wxDataViewCtrl*) this ); + return true; +} + +bool +wxDataViewCtrlBase::PrependColumn( wxDataViewColumn *col ) +{ + col->SetOwner( (wxDataViewCtrl*) this ); + return true; +} + +// --------------------------------------------------------- +// wxDataViewEvent +// --------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent) + +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED) + +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED) + +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED) + + +// ------------------------------------- +// wxDataViewSpinRenderer +// ------------------------------------- + +wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCellMode mode, int alignment ) : + wxDataViewCustomRenderer( "long", mode, alignment ) +{ + m_min = min; + m_max = max; +} + +wxControl* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) +{ + long l = value; + return new wxSpinCtrl( parent, wxID_ANY, wxEmptyString, + labelRect.GetTopLeft(), labelRect.GetSize(), wxSP_ARROW_KEYS, m_min, m_max, l ); +} + +bool wxDataViewSpinRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ) +{ + wxSpinCtrl *sc = (wxSpinCtrl*) editor; + long l = sc->GetValue(); + value = l; + return true; +} + +bool wxDataViewSpinRenderer::Render( wxRect rect, wxDC *dc, int state ) +{ + wxString str; + str.Printf( "%d", (int) m_data ); + RenderText( str, 0, rect, dc, state ); + return true; +} + +wxSize wxDataViewSpinRenderer::GetSize() const +{ + return wxSize(80,16); +} + +bool wxDataViewSpinRenderer::SetValue( const wxVariant &value ) +{ + m_data = value.GetLong(); + return true; +} + +bool wxDataViewSpinRenderer::GetValue( wxVariant &value ) const +{ + value = m_data; + return true; +} + +//----------------------------------------------------------------------------- +// wxDataViewTreeStore +//----------------------------------------------------------------------------- + +wxDataViewTreeStoreNode::wxDataViewTreeStoreNode( + wxDataViewTreeStoreNode *parent, + const wxString &text, const wxIcon &icon, wxClientData *data ) +{ + m_parent = parent; + m_text = text; + m_icon = icon; + m_data = data; +} + +wxDataViewTreeStoreNode::~wxDataViewTreeStoreNode() +{ + if (m_data) + delete m_data; +} + +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxDataViewTreeStoreNodeList) + +wxDataViewTreeStoreContainerNode::wxDataViewTreeStoreContainerNode( + wxDataViewTreeStoreNode *parent, const wxString &text, + const wxIcon &icon, const wxIcon &expanded, wxClientData *data ) : + wxDataViewTreeStoreNode( parent, text, icon, data ) +{ + m_iconExpanded = expanded; + m_isExpanded = false; + m_children.DeleteContents(true); +} + +wxDataViewTreeStoreContainerNode::~wxDataViewTreeStoreContainerNode() +{ +} + +//----------------------------------------------------------------------------- + +wxDataViewTreeStore::wxDataViewTreeStore() +{ + m_root = new wxDataViewTreeStoreContainerNode( NULL, wxEmptyString ); +} + +wxDataViewTreeStore::~wxDataViewTreeStore() +{ + delete m_root; +} + +wxDataViewItem wxDataViewTreeStore::AppendItem( const wxDataViewItem& parent, + const wxString &text, const wxIcon &icon, wxClientData *data ) +{ + wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); + if (!parent_node) return wxDataViewItem(0); + + wxDataViewTreeStoreNode *node = + new wxDataViewTreeStoreNode( parent_node, text, icon, data ); + parent_node->GetChildren().Append( node ); + + // notify control + ItemAdded( parent, node->GetItem() ); + + return node->GetItem(); +} + +wxDataViewItem wxDataViewTreeStore::PrependItem( const wxDataViewItem& parent, + const wxString &text, const wxIcon &icon, wxClientData *data ) +{ + wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); + if (!parent_node) return wxDataViewItem(0); + + wxDataViewTreeStoreNode *node = + 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)) +{ + return wxDataViewItem(0); +} + +wxDataViewItem wxDataViewTreeStore::PrependContainer( const wxDataViewItem& parent, + const wxString &text, const wxIcon &icon, const wxIcon &expanded, + wxClientData *data ) +{ + wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); + if (!parent_node) return wxDataViewItem(0); + + wxDataViewTreeStoreContainerNode *node = + new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data ); + parent_node->GetChildren().Insert( node ); + + // notify control + ItemAdded( parent, node->GetItem() ); + + return node->GetItem(); +} + +wxDataViewItem +wxDataViewTreeStore::AppendContainer(const wxDataViewItem& parent, + const wxString &text, + const wxIcon& icon, + const wxIcon& expanded, + wxClientData * data) +{ + wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); + if (!parent_node) return wxDataViewItem(0); + + wxDataViewTreeStoreContainerNode *node = + 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)) +{ + return wxDataViewItem(0); +} + +wxDataViewItem wxDataViewTreeStore::GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const +{ + wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); + if (!parent_node) return wxDataViewItem(0); + + wxDataViewTreeStoreNodeList::compatibility_iterator node = parent_node->GetChildren().Item( pos ); + if (node) + return node->GetData(); + + return wxDataViewItem(0); +} + +int wxDataViewTreeStore::GetChildCount( const wxDataViewItem& parent ) const +{ + wxDataViewTreeStoreNode *node = FindNode( parent ); + if (!node) return -1; + + if (!node->IsContainer()) + return 0; + + wxDataViewTreeStoreContainerNode *container_node = (wxDataViewTreeStoreContainerNode*) node; + return (int) container_node->GetChildren().GetCount(); +} + +void wxDataViewTreeStore::SetItemText( const wxDataViewItem& item, const wxString &text ) +{ + wxDataViewTreeStoreNode *node = FindNode( item ); + if (!node) return; + + node->SetText( text ); + + // notify control + ValueChanged( item, 0 ); +} + +wxString wxDataViewTreeStore::GetItemText( const wxDataViewItem& item ) const +{ + wxDataViewTreeStoreNode *node = FindNode( item ); + if (!node) return wxEmptyString; + + return node->GetText(); +} + +void wxDataViewTreeStore::SetItemIcon( const wxDataViewItem& item, const wxIcon &icon ) +{ + wxDataViewTreeStoreNode *node = FindNode( item ); + if (!node) return; + + node->SetIcon( icon ); + + // notify control + ValueChanged( item, 0 ); +} + +const wxIcon &wxDataViewTreeStore::GetItemIcon( const wxDataViewItem& item ) const +{ + wxDataViewTreeStoreNode *node = FindNode( item ); + if (!node) return wxNullIcon; + + return node->GetIcon(); +} + +void wxDataViewTreeStore::SetItemExpandedIcon( const wxDataViewItem& item, const wxIcon &icon ) +{ + wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); + if (!node) return; + + node->SetExpandedIcon( icon ); + + // notify control + ValueChanged( item, 0 ); +} + +const wxIcon &wxDataViewTreeStore::GetItemExpandedIcon( const wxDataViewItem& item ) const +{ + wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); + if (!node) return wxNullIcon; + + return node->GetExpandedIcon(); +} + +void wxDataViewTreeStore::SetItemData( const wxDataViewItem& item, wxClientData *data ) +{ + wxDataViewTreeStoreNode *node = FindNode( item ); + 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 +{ + wxDataViewTreeStoreNode *node = FindNode( item ); + if (!node) return NULL; + + return node->GetData(); +} + +void wxDataViewTreeStore::DeleteItem( const wxDataViewItem& item ) +{ + if (!item.IsOk()) return; + + wxDataViewItem parent_item = GetParent( item ); + + wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent_item ); + if (!parent_node) return; + + wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); + if (!node) return; + + parent_node->GetChildren().DeleteObject( node ); + + // notify control + ItemDeleted( parent_item, item ); +} + +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() +{ + // TODO +} + +void +wxDataViewTreeStore::GetValue(wxVariant &variant, + const wxDataViewItem &item, + unsigned int WXUNUSED(col)) const +{ + // if (col != 0) return; + + wxDataViewTreeStoreNode *node = FindNode( item ); + if (!node) return; + + wxIcon icon( node->GetIcon()); + if (node->IsContainer()) + { + wxDataViewTreeStoreContainerNode *container = (wxDataViewTreeStoreContainerNode*) node; + if (container->IsExpanded() && container->GetExpandedIcon().IsOk()) + icon = container->GetExpandedIcon(); + } + + wxDataViewIconText data( node->GetText(), icon ); + + variant << data; +} + +bool +wxDataViewTreeStore::SetValue(const wxVariant& variant, + const wxDataViewItem& item, + unsigned int WXUNUSED(col)) +{ + // if (col != 0) return false; + + wxDataViewTreeStoreNode *node = FindNode( item ); + if (!node) return false; + + wxDataViewIconText data; + + data << variant; + + node->SetText( data.GetText() ); + node->SetIcon( data.GetIcon() ); + + return true; +} + +wxDataViewItem wxDataViewTreeStore::GetParent( const wxDataViewItem &item ) const +{ + wxDataViewTreeStoreNode *node = FindNode( item ); + if (!node) return wxDataViewItem(0); + + wxDataViewTreeStoreNode *parent = node->GetParent(); + if (!parent) return wxDataViewItem(0); + + if (parent == m_root) + return wxDataViewItem(0); + + 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 +{ + wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); + if (!node) return 0; + + wxDataViewTreeStoreNodeList::iterator iter; + for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); iter++) + { + wxDataViewTreeStoreNode* child = *iter; + children.Add( child->GetItem() ); + } + + return node->GetChildren().GetCount(); +} + +int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, + unsigned int WXUNUSED(column), bool WXUNUSED(ascending) ) +{ + wxDataViewTreeStoreNode *node1 = FindNode( item1 ); + wxDataViewTreeStoreNode *node2 = FindNode( item2 ); + + if (!node1 || !node2) + return 0; + + wxDataViewTreeStoreContainerNode* parent1 = + (wxDataViewTreeStoreContainerNode*) node1->GetParent(); + wxDataViewTreeStoreContainerNode* parent2 = + (wxDataViewTreeStoreContainerNode*) node2->GetParent(); + + if (parent1 != parent2) + { + wxLogError( wxT("Comparing items with different parent.") ); + return 0; + } + + if (node1->IsContainer() && !!node2->IsContainer()) + return 1; + + if (node2->IsContainer() && !!node1->IsContainer()) + return -1; + + return parent1->GetChildren().IndexOf( node1 ) - parent1->GetChildren().IndexOf( node2 ); +} + +wxDataViewTreeStoreNode *wxDataViewTreeStore::FindNode( const wxDataViewItem &item ) const +{ + if (!item.IsOk()) + return m_root; + + return (wxDataViewTreeStoreNode*) item.GetID(); +} + +wxDataViewTreeStoreContainerNode *wxDataViewTreeStore::FindContainerNode( const wxDataViewItem &item ) const +{ + if (!item.IsOk()) + return (wxDataViewTreeStoreContainerNode*) m_root; + + wxDataViewTreeStoreNode* node = (wxDataViewTreeStoreNode*) item.GetID(); + + if (!node->IsContainer()) + return NULL; + + return (wxDataViewTreeStoreContainerNode*) node; +} + +//----------------------------------------------------------------------------- +// wxDataViewTreeCtrl +//----------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxDataViewTreeCtrl,wxDataViewCtrl) + +BEGIN_EVENT_TABLE(wxDataViewTreeCtrl,wxDataViewCtrl) + EVT_DATAVIEW_ITEM_EXPANDED(-1, wxDataViewTreeCtrl::OnExpanded) + EVT_DATAVIEW_ITEM_COLLAPSED(-1, wxDataViewTreeCtrl::OnCollapsed) + EVT_SIZE( wxDataViewTreeCtrl::OnSize ) +END_EVENT_TABLE() + +wxDataViewTreeCtrl::wxDataViewTreeCtrl() +{ + m_imageList = NULL; +} + +wxDataViewTreeCtrl::wxDataViewTreeCtrl( wxWindow *parent, wxWindowID id, + const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) +{ + m_imageList = NULL; + Create( parent, id, pos, size, style, validator ); + + wxDataViewTreeStore *store = new wxDataViewTreeStore; + AssociateModel( store ); + store->DecRef(); + + wxDataViewColumn *col = AppendIconTextColumn( "", 0, wxDATAVIEW_CELL_INERT, 40 ); + +#if !defined(__WXGTK20__) + wxSize cient_size = GetClientSize(); + col->SetWidth( size.x ); +#endif +} + +wxDataViewTreeCtrl::~wxDataViewTreeCtrl() +{ + if (m_imageList) + delete m_imageList; +} + +bool wxDataViewTreeCtrl::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 ); +} + +void wxDataViewTreeCtrl::SetImageList( wxImageList *imagelist ) +{ + if (m_imageList) + delete m_imageList; + + m_imageList = imagelist; +} + +wxDataViewItem wxDataViewTreeCtrl::AppendItem( const wxDataViewItem& parent, + const wxString &text, int iconIndex, wxClientData *data ) +{ + wxIcon icon = wxNullIcon; + if (m_imageList && (iconIndex != -1)) + icon = m_imageList->GetIcon( iconIndex ); + + return GetStore()->AppendItem( parent, text, icon, data ); +} + +wxDataViewItem wxDataViewTreeCtrl::PrependItem( const wxDataViewItem& parent, + const wxString &text, int iconIndex, wxClientData *data ) +{ + wxIcon icon = wxNullIcon; + if (m_imageList && (iconIndex != -1)) + icon = m_imageList->GetIcon( iconIndex ); + + return GetStore()->PrependItem( parent, text, icon, data ); +} + +wxDataViewItem wxDataViewTreeCtrl::InsertItem( const wxDataViewItem& parent, const wxDataViewItem& previous, + const wxString &text, int iconIndex, wxClientData *data ) +{ + wxIcon icon = wxNullIcon; + if (m_imageList && (iconIndex != -1)) + icon = m_imageList->GetIcon( iconIndex ); + + return GetStore()->InsertItem( parent, previous, text, icon, data ); +} + +wxDataViewItem wxDataViewTreeCtrl::PrependContainer( const wxDataViewItem& parent, + const wxString &text, int iconIndex, int expandedIndex, wxClientData *data ) +{ + wxIcon icon = wxNullIcon; + if (m_imageList && (iconIndex != -1)) + icon = m_imageList->GetIcon( iconIndex ); + + wxIcon expanded = wxNullIcon; + if (m_imageList && (expandedIndex != -1)) + expanded = m_imageList->GetIcon( expandedIndex ); + + return GetStore()->PrependContainer( parent, text, icon, expanded, data ); +} + +wxDataViewItem wxDataViewTreeCtrl::AppendContainer( const wxDataViewItem& parent, + const wxString &text, int iconIndex, int expandedIndex, wxClientData *data ) +{ + wxIcon icon = wxNullIcon; + if (m_imageList && (iconIndex != -1)) + icon = m_imageList->GetIcon( iconIndex ); + + wxIcon expanded = wxNullIcon; + if (m_imageList && (expandedIndex != -1)) + expanded = m_imageList->GetIcon( expandedIndex ); + + return GetStore()->AppendContainer( parent, text, icon, expanded, data ); +} + +wxDataViewItem wxDataViewTreeCtrl::InsertContainer( const wxDataViewItem& parent, const wxDataViewItem& previous, + const wxString &text, int iconIndex, int expandedIndex, wxClientData *data ) +{ + wxIcon icon = wxNullIcon; + if (m_imageList && (iconIndex != -1)) + icon = m_imageList->GetIcon( iconIndex ); + + wxIcon expanded = wxNullIcon; + if (m_imageList && (expandedIndex != -1)) + expanded = m_imageList->GetIcon( expandedIndex ); + + return GetStore()->InsertContainer( parent, previous, text, icon, expanded, data ); +} + +void wxDataViewTreeCtrl::OnExpanded( wxDataViewEvent &event ) +{ + if (m_imageList) return; + + wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() ); + if (!container) return; + + container->SetExpanded( true ); + GetStore()->ItemChanged( event.GetItem() ); +} + +void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event ) +{ + if (m_imageList) return; + + wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() ); + if (!container) return; + + container->SetExpanded( false ); + GetStore()->ItemChanged( event.GetItem() ); +} + +void wxDataViewTreeCtrl::OnSize( wxSizeEvent &WXUNUSED(event) ) +{ +#if !defined(__WXGTK20__) + wxSize size = GetClientSize(); + wxDataViewColumn *col = GetColumn( 0 ); + col->SetWidth( size.x ); +#endif +} + +#endif // wxUSE_DATAVIEWCTRL +