X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c7cf729fe461197f8e2022594cb5c050a6197c52..827fb0e455814783e74a0a211b408e788a386246:/src/common/datavcmn.cpp diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 9d2b2020a5..c5540283fc 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -20,702 +20,640 @@ #include "wx/dataview.h" #ifndef WX_PRECOMP + #include "wx/dc.h" + #include "wx/settings.h" #include "wx/log.h" + #include "wx/crt.h" #endif -const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl"); +#include "wx/spinctrl.h" +#include "wx/choice.h" +#include "wx/imaglist.h" +const char wxDataViewCtrlNameStr[] = "dataviewCtrl"; + +namespace +{ + +// Custom handler pushed on top of the edit control used by wxDataViewCtrl to +// forward some events to the main control itself. +class wxDataViewEditorCtrlEvtHandler: public wxEvtHandler +{ +public: + wxDataViewEditorCtrlEvtHandler(wxWindow *editor, wxDataViewRenderer *owner) + { + m_editorCtrl = editor; + m_owner = owner; + + m_finished = false; + } + + void AcceptChangesAndFinish(); + void SetFocusOnIdle( bool focus = true ) { m_focusOnIdle = focus; } + +protected: + void OnChar( wxKeyEvent &event ); + void OnTextEnter( wxCommandEvent &event ); + void OnKillFocus( wxFocusEvent &event ); + void OnIdle( wxIdleEvent &event ); + +private: + wxDataViewRenderer *m_owner; + wxWindow *m_editorCtrl; + bool m_finished; + bool m_focusOnIdle; + +private: + DECLARE_EVENT_TABLE() +}; + +} // anonymous namespace // --------------------------------------------------------- -// wxDataViewListModel +// wxDataViewItemAttr // --------------------------------------------------------- -wxDataViewListModel::wxDataViewListModel() +wxFont wxDataViewItemAttr::GetEffectiveFont(const wxFont& font) const { - m_notifiers.DeleteContents( true ); + if ( !HasFont() ) + return font; + + wxFont f(font); + if ( GetBold() ) + f.MakeBold(); + if ( GetItalic() ) + f.MakeItalic(); + return f; +} + + +// --------------------------------------------------------- +// wxDataViewModelNotifier +// --------------------------------------------------------- + +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxDataViewModelNotifiers) + +bool wxDataViewModelNotifier::ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items ) +{ + 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( unsigned int 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( unsigned int 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( unsigned int 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( unsigned int col, unsigned int 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( unsigned int *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::AddNotifier( wxDataViewListModelNotifier *notifier ) +bool wxDataViewModel::BeforeReset() { - m_notifiers.Append( notifier ); - notifier->SetOwner( this ); -} + bool ret = true; -void wxDataViewListModel::RemoveNotifier( wxDataViewListModelNotifier *notifier ) -{ - m_notifiers.DeleteObject( notifier ); -} + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) + { + wxDataViewModelNotifier* notifier = *iter; + if (!notifier->BeforeReset()) + ret = false; + } -// --------------------------------------------------------- -// wxDataViewSortedListModelNotifier -// --------------------------------------------------------- + return ret; +} -class wxDataViewSortedListModelNotifier: public wxDataViewListModelNotifier +bool wxDataViewModel::AfterReset() { -public: - wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model ) - { m_model = model; } - - virtual bool RowAppended() - { return m_model->ChildRowAppended(); } + bool ret = true; - virtual bool RowPrepended() - { return m_model->ChildRowPrepended(); } + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) + { + wxDataViewModelNotifier* notifier = *iter; + if (!notifier->AfterReset()) + ret = false; + } - virtual bool RowInserted( unsigned int before ) - { return m_model->ChildRowInserted( before ); } + return ret; +} - virtual bool RowDeleted( unsigned int row ) - { return m_model->ChildRowDeleted( row ); } +void wxDataViewModel::Resort() +{ + wxDataViewModelNotifiers::iterator iter; + for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) + { + wxDataViewModelNotifier* notifier = *iter; + notifier->Resort(); + } +} - virtual bool RowChanged( unsigned int row ) - { return m_model->ChildRowChanged( row ); } +void wxDataViewModel::AddNotifier( wxDataViewModelNotifier *notifier ) +{ + m_notifiers.push_back( notifier ); + notifier->SetOwner( this ); +} - virtual bool ValueChanged( unsigned int col, unsigned int row ) - { return m_model->ChildValueChanged( col, row); } +void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier ) +{ + m_notifiers.DeleteObject( notifier ); +} - virtual bool RowsReordered( unsigned int *new_order ) - { return m_model->ChildRowsReordered( new_order ); } +int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, + unsigned int column, bool ascending ) const +{ + // sort branches before leaves + bool item1_is_container = IsContainer(item1); + bool item2_is_container = IsContainer(item2); - virtual bool Cleared() - { return m_model->ChildCleared(); } + 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 - (unsigned int row1, unsigned int row2, unsigned int 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; } - if (value1.GetType() == wxT("long")) + 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; } - if (value1.GetType() == wxT("double")) + 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; + if (d1 > d2) + return -1; } - if (value1.GetType() == wxT("datetime")) + 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 (dt1.IsEarlierThan(dt2)) + return 1; + if (dt2.IsEarlierThan(dt1)) + return -1; } - return 0; -} + // items must be different + wxUIntPtr id1 = wxPtrToUInt(item1.GetID()), + id2 = wxPtrToUInt(item2.GetID()); -int wxCALLBACK wxDataViewListModelSortedDefaultCompareDescending - (unsigned int row1, unsigned int row2, unsigned int col, wxDataViewListModel* model ) -{ - return wxDataViewListModelSortedDefaultCompare( row2, row1, col, model ); + return ascending ? id1 - id2 : id2 - id1; } -static wxDataViewListModelCompare s_CmpFunc; -static wxDataViewListModel *s_CmpModel; -static unsigned int s_CmpCol; +// --------------------------------------------------------- +// wxDataViewIndexListModel +// --------------------------------------------------------- -int LINKAGEMODE wxDataViewIntermediateCmp( unsigned int row1, unsigned int row2 ) +static int my_sort( int *v1, int *v2 ) { - return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel ); + return *v2-*v1; } -// --------------------------------------------------------- -// wxDataViewSortedListModel -// --------------------------------------------------------- -wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child ) : - m_array( wxDataViewIntermediateCmp ) +wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size ) { - m_child = child; - - m_ascending = true; + // IDs are ordered until an item gets deleted or inserted + m_ordered = true; - m_notifierOnChild = new wxDataViewSortedListModelNotifier( this ); - m_child->AddNotifier( m_notifierOnChild ); - - m_child->IncRef(); - - Resort(); + // build initial index + unsigned int i; + for (i = 1; i < initial_size+1; i++) + m_hash.Add( wxDataViewItem(wxUIntToPtr(i)) ); + m_nextFreeID = initial_size + 1; } -wxDataViewSortedListModel::~wxDataViewSortedListModel() +void wxDataViewIndexListModel::Reset( unsigned int new_size ) { - DetachChild(); -} + /* wxDataViewModel:: */ BeforeReset(); -void wxDataViewSortedListModel::DetachChild() -{ - if (m_child) - { - m_child->RemoveNotifier( m_notifierOnChild ); - m_child->DecRef(); - } - - m_child = NULL; -} + m_hash.Clear(); -// FIXME -void wxDataViewSortedListModel::InitStatics() -{ - s_CmpCol = 0; - s_CmpModel = m_child; - if (m_ascending) - s_CmpFunc = wxDataViewListModelSortedDefaultCompare; - else - s_CmpFunc = wxDataViewListModelSortedDefaultCompareDescending; -} + // IDs are ordered until an item gets deleted or inserted + m_ordered = true; -void wxDataViewSortedListModel::Resort() -{ - InitStatics(); - - if (!m_child) return; - - unsigned int n = m_child->GetRowCount(); - + // build initial index unsigned int i; - if (n != m_array.GetCount()) - { - // probably sorted for the first time -> no reordered - // -- just create index and leave - m_array.Clear(); - for (i = 0; i < n; i++) - m_array.Add( i ); - return; - } - - unsigned int *old_array = new unsigned int[ n ]; - - for (i = 0; i < n; i++) - old_array[i] = m_array[ i ]; - - m_array.Clear(); - for (i = 0; i < n; i++) - m_array.Add( i ); - - unsigned int *order = new unsigned int[ n ]; - - for (i = 0; i < n; i++) - { - unsigned int new_value = m_array[i]; - - unsigned int old_pos; - for (old_pos = 0; old_pos < n; old_pos++) - if (old_array[old_pos] == new_value) - break; - order[i] = old_pos; - } - - delete [] old_array; - - wxDataViewListModel::RowsReordered( order ); + for (i = 1; i < new_size+1; i++) + m_hash.Add( wxDataViewItem(wxUIntToPtr(i)) ); - delete [] order; -} + m_nextFreeID = new_size + 1; -#if 0 -static void Dump( wxDataViewListModel *model, unsigned int col ) -{ - unsigned int n = model->GetRowCount(); - unsigned int i; - for (i = 0; i < n; i++) - { - wxVariant variant; - model->GetValue( variant, col, i ); - wxString tmp; - tmp = variant.GetString(); - wxPrintf( wxT("%d: %s\n"), (int) i, tmp.c_str() ); - } + /* wxDataViewModel:: */ AfterReset(); } -#endif -bool wxDataViewSortedListModel::ChildRowAppended() +void wxDataViewIndexListModel::RowPrepended() { - // no need to fix up array + m_ordered = false; - unsigned int len = m_array.GetCount(); + unsigned int id = m_nextFreeID; + m_nextFreeID++; - unsigned int pos = m_array.Add( len ); + wxDataViewItem item( wxUIntToPtr(id) ); + m_hash.Insert( item, 0 ); + ItemAdded( wxDataViewItem(0), item ); - if (pos == 0) - return wxDataViewListModel::RowPrepended(); - - if (pos == len) - return wxDataViewListModel::RowAppended(); - - return wxDataViewListModel::RowInserted( pos ); } -bool wxDataViewSortedListModel::ChildRowPrepended() +void wxDataViewIndexListModel::RowInserted( unsigned int before ) { - // fix up array - unsigned int i; - unsigned int len = m_array.GetCount(); - for (i = 0; i < len; i++) - { - unsigned int value = m_array[i]; - m_array[i] = value+1; - } - - unsigned int pos = m_array.Add( 0 ); + m_ordered = false; - if (pos == 0) - return wxDataViewListModel::RowPrepended(); + unsigned int id = m_nextFreeID; + m_nextFreeID++; - if (pos == len) - return wxDataViewListModel::RowAppended(); - - return wxDataViewListModel::RowInserted( pos ); + wxDataViewItem item( wxUIntToPtr(id) ); + m_hash.Insert( item, before ); + ItemAdded( wxDataViewItem(0), item ); } -bool wxDataViewSortedListModel::ChildRowInserted( unsigned int before ) +void wxDataViewIndexListModel::RowAppended() { - // fix up array - unsigned int i; - unsigned int len = m_array.GetCount(); - for (i = 0; i < len; i++) - { - unsigned int value = m_array[i]; - if (value >= before) - m_array[i] = value+1; - } + unsigned int id = m_nextFreeID; + m_nextFreeID++; - unsigned int pos = m_array.Add( before ); - - if (pos == 0) - return wxDataViewListModel::RowPrepended(); + wxDataViewItem item( wxUIntToPtr(id) ); + m_hash.Add( item ); + ItemAdded( wxDataViewItem(0), item ); +} - if (pos == len) - return wxDataViewListModel::RowAppended(); +void wxDataViewIndexListModel::RowDeleted( unsigned int row ) +{ + m_ordered = false; - return wxDataViewListModel::RowInserted( pos ); + wxDataViewItem item( m_hash[row] ); + /* wxDataViewModel:: */ ItemDeleted( wxDataViewItem(0), item ); + m_hash.RemoveAt( row ); } -bool wxDataViewSortedListModel::ChildRowDeleted( unsigned int row ) +void wxDataViewIndexListModel::RowsDeleted( const wxArrayInt &rows ) { + wxArrayInt sorted = rows; + sorted.Sort( my_sort ); + + m_ordered = false; + + wxDataViewItemArray array; unsigned int i; - unsigned int len = m_array.GetCount(); - int pos = -1; - for (i = 0; i < len; i++) + for (i = 0; i < rows.GetCount(); i++) { - unsigned int value = m_array[i]; - if (value == row) - { - // delete later - pos = (int) i; - } - else - { - // Fix up array - if (value > row) - m_array[i] = value-1; - } + wxDataViewItem item( m_hash[rows[i]] ); + array.Add( item ); } + /* wxDataViewModel:: */ ItemsDeleted( wxDataViewItem(0), array ); - if (pos == -1) - return false; // we should probably assert - - // remove - m_array.RemoveAt( (unsigned int) pos ); + for (i = 0; i < sorted.GetCount(); i++) + m_hash.RemoveAt( sorted[i] ); +} - return wxDataViewListModel::RowDeleted( (unsigned int) pos); +void wxDataViewIndexListModel::RowChanged( unsigned int row ) +{ + /* wxDataViewModel:: */ ItemChanged( GetItem(row) ); } -bool wxDataViewSortedListModel::ChildRowChanged( unsigned int row ) +void wxDataViewIndexListModel::RowValueChanged( unsigned int row, unsigned int col ) { - unsigned int i; - unsigned int len = m_array.GetCount(); + /* wxDataViewModel:: */ ValueChanged( GetItem(row), col ); +} - // Remove and readd sorted. Find out at which - // position it was and where it ended. - unsigned int 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 ); +unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) const +{ + if (m_ordered) + return wxPtrToUInt(item.GetID())-1; - for (i = 0; i < len; i++) - if (m_array[i] == row) - { - end_pos = i; - break; - } + // assert for not found + return (unsigned int) m_hash.Index( item ); +} - if (end_pos == start_pos) - return wxDataViewListModel::RowChanged( start_pos ); +wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const +{ + wxASSERT( row < m_hash.GetCount() ); + return wxDataViewItem( m_hash[row] ); +} - // Create an array where order[old] -> new_pos, so that - // if nothing changed order[0] -> 0 etc. - unsigned int *order = new unsigned int[ len ]; - // Fill up initial values. - for (i = 0; i < len; i++) - order[i] = i; +bool wxDataViewIndexListModel::HasDefaultCompare() const +{ + return !m_ordered; +} - if (start_pos < end_pos) - { - for (i = start_pos; i < end_pos; i++) - order[i] = order[i+1]; - order[end_pos] = start_pos; - } - else +int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1, + const wxDataViewItem& item2, + unsigned int WXUNUSED(column), + bool ascending) const +{ + if (m_ordered) { - for (i = end_pos; i > start_pos; i--) - order[i] = order[i-1]; - order[start_pos] = end_pos; - } + unsigned int pos1 = wxPtrToUInt(item1.GetID()); // -1 not needed here + unsigned int pos2 = wxPtrToUInt(item2.GetID()); // -1 not needed here - wxDataViewListModel::RowsReordered( order ); + if (ascending) + return pos1 - pos2; + else + return pos2 - pos1; + } - delete [] order; + if (ascending) + return GetRow(item1) - GetRow(item2); - return true; + return GetRow(item2) - GetRow(item1); } -bool wxDataViewSortedListModel::ChildValueChanged( unsigned int col, unsigned int row ) +unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const { - unsigned int i; - unsigned int len = m_array.GetCount(); - - // Remove and readd sorted. Find out at which - // position it was and where it ended. - unsigned int 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 ); - - for (i = 0; i < len; i++) - if (m_array[i] == row) - { - end_pos = i; - break; - } - - 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. - unsigned int *order = new unsigned int[ len ]; - // Fill up initial values. - for (i = 0; i < len; i++) - order[i] = i; + if (item.IsOk()) + return 0; - if (start_pos < end_pos) - { - for (i = start_pos; i < end_pos; i++) - order[i] = order[i+1]; - order[end_pos] = start_pos; - } - else - { - for (i = end_pos; i > start_pos; i--) - order[i] = order[i-1]; - order[start_pos] = end_pos; - } + children = m_hash; - wxDataViewListModel::RowsReordered( order ); + return m_hash.GetCount(); +} - delete [] order; +// --------------------------------------------------------- +// wxDataViewVirtualListModel +// --------------------------------------------------------- - return true; -} +#ifndef __WXMAC__ -bool wxDataViewSortedListModel::ChildRowsReordered( unsigned int *WXUNUSED(new_order) ) +wxDataViewVirtualListModel::wxDataViewVirtualListModel( unsigned int initial_size ) { - // Nothing needs to be done. If the sort criteria - // of this list don't change, the order of the - // items of the child list isn't relevant. - return true; + m_size = initial_size; } -bool wxDataViewSortedListModel::ChildCleared() +void wxDataViewVirtualListModel::Reset( unsigned int new_size ) { - return wxDataViewListModel::Cleared(); + /* wxDataViewModel:: */ BeforeReset(); + + m_size = new_size; + + /* wxDataViewModel:: */ AfterReset(); } -unsigned int wxDataViewSortedListModel::GetRowCount() const +void wxDataViewVirtualListModel::RowPrepended() { - if (!m_child) return 0; - - return m_child->GetRowCount(); + m_size++; + wxDataViewItem item( wxUIntToPtr(1) ); + ItemAdded( wxDataViewItem(0), item ); } -unsigned int wxDataViewSortedListModel::GetColumnCount() const +void wxDataViewVirtualListModel::RowInserted( unsigned int before ) { - if (!m_child) return 0; - - return m_child->GetColumnCount(); + m_size++; + wxDataViewItem item( wxUIntToPtr(before+1) ); + ItemAdded( wxDataViewItem(0), item ); } -wxString wxDataViewSortedListModel::GetColumnType( unsigned int col ) const +void wxDataViewVirtualListModel::RowAppended() { - return m_child->GetColumnType( col ); + m_size++; + wxDataViewItem item( wxUIntToPtr(m_size) ); + ItemAdded( wxDataViewItem(0), item ); } -#include "wx/crt.h" - -void wxDataViewSortedListModel::GetValue( wxVariant &variant, unsigned int col, unsigned int row ) const +void wxDataViewVirtualListModel::RowDeleted( unsigned int row ) { - unsigned int child_row = m_array[row]; - m_child->GetValue( variant, col, child_row ); + m_size--; + wxDataViewItem item( wxUIntToPtr(row+1) ); + /* wxDataViewModel:: */ ItemDeleted( wxDataViewItem(0), item ); } -bool wxDataViewSortedListModel::SetValue( const wxVariant &variant, unsigned int col, unsigned int row ) +void wxDataViewVirtualListModel::RowsDeleted( const wxArrayInt &rows ) { - unsigned int child_row = m_array[row]; - bool ret = m_child->SetValue( variant, col, child_row ); + m_size -= rows.GetCount(); - // Do nothing here as the change in the - // child model will be reported back. + wxArrayInt sorted = rows; + sorted.Sort( my_sort ); - return ret; + wxDataViewItemArray array; + unsigned int i; + for (i = 0; i < sorted.GetCount(); i++) + { + wxDataViewItem item( wxUIntToPtr(sorted[i]+1) ); + array.Add( item ); + } + /* wxDataViewModel:: */ ItemsDeleted( wxDataViewItem(0), array ); } -bool wxDataViewSortedListModel::RowAppended() +void wxDataViewVirtualListModel::RowChanged( unsigned int row ) { - // you can only append - bool ret = m_child->RowAppended(); - - // Do nothing here as the change in the - // child model will be reported back. - - return ret; + /* wxDataViewModel:: */ ItemChanged( GetItem(row) ); } -bool wxDataViewSortedListModel::RowPrepended() +void wxDataViewVirtualListModel::RowValueChanged( unsigned int row, unsigned int col ) { - // you can only append - bool ret = m_child->RowAppended(); - - // Do nothing here as the change in the - // child model will be reported back. - - return ret; + /* wxDataViewModel:: */ ValueChanged( GetItem(row), col ); } -bool wxDataViewSortedListModel::RowInserted( unsigned int WXUNUSED(before) ) +unsigned int wxDataViewVirtualListModel::GetRow( const wxDataViewItem &item ) const { - // you can only append - bool ret = m_child->RowAppended(); - - // Do nothing here as the change in the - // child model will be reported back. - - return ret; + return wxPtrToUInt( item.GetID() ) -1; } -bool wxDataViewSortedListModel::RowDeleted( unsigned int row ) +wxDataViewItem wxDataViewVirtualListModel::GetItem( unsigned int row ) const { - unsigned int child_row = m_array[row]; - - bool ret = m_child->RowDeleted( child_row ); - - // Do nothing here as the change in the - // child model will be reported back. - - return ret; + return wxDataViewItem( wxUIntToPtr(row+1) ); } -bool wxDataViewSortedListModel::RowChanged( unsigned int row ) +bool wxDataViewVirtualListModel::HasDefaultCompare() const { - unsigned int child_row = m_array[row]; - bool ret = m_child->RowChanged( child_row ); - - // Do nothing here as the change in the - // child model will be reported back. - - return ret; + return true; } -bool wxDataViewSortedListModel::ValueChanged( unsigned int col, unsigned int row ) +int wxDataViewVirtualListModel::Compare(const wxDataViewItem& item1, + const wxDataViewItem& item2, + unsigned int WXUNUSED(column), + bool ascending) const { - unsigned int child_row = m_array[row]; - bool ret = m_child->ValueChanged( col, child_row ); - - // Do nothing here as the change in the - // child model will be reported back. + unsigned int pos1 = wxPtrToUInt(item1.GetID()); // -1 not needed here + unsigned int pos2 = wxPtrToUInt(item2.GetID()); // -1 not needed here - return ret; + if (ascending) + return pos1 - pos2; + else + return pos2 - pos1; } -bool wxDataViewSortedListModel::RowsReordered( unsigned int *WXUNUSED(new_order) ) +unsigned int wxDataViewVirtualListModel::GetChildren( const wxDataViewItem &WXUNUSED(item), wxDataViewItemArray &WXUNUSED(children) ) const { - // We sort them ourselves. - - return false; + return 0; // should we report an error ? } -bool wxDataViewSortedListModel::Cleared() -{ - bool ret = m_child->Cleared(); +#endif // __WXMAC__ - // Do nothing here as the change in the - // child model will be reported back. +//----------------------------------------------------------------------------- +// wxDataViewIconText +//----------------------------------------------------------------------------- - return ret; -} +IMPLEMENT_DYNAMIC_CLASS(wxDataViewIconText,wxObject) + +IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV) // --------------------------------------------------------- // wxDataViewRendererBase @@ -723,93 +661,282 @@ bool wxDataViewSortedListModel::Cleared() IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject) -wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, +wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, wxDataViewCellMode WXUNUSED(mode), int WXUNUSED(align) ) { m_variantType = varianttype; - m_editorCtrl = NULL; - m_row = (unsigned int) -1; + m_owner = NULL; +} + +wxDataViewRendererBase::~wxDataViewRendererBase() +{ } const wxDataViewCtrl* wxDataViewRendererBase::GetView() const { - return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner(); + return const_cast(this)->GetOwner()->GetOwner(); } -bool wxDataViewRendererBase::StartEditing( unsigned int row, wxRect labelRect ) +bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect ) { - m_row = row; // remember for later - + wxDataViewCtrl* dv_ctrl = GetOwner()->GetOwner(); + + // Before doing anything we send an event asking if editing of this item is really wanted. + wxDataViewEvent start_event( wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING, dv_ctrl->GetId() ); + start_event.SetDataViewColumn( GetOwner() ); + start_event.SetModel( dv_ctrl->GetModel() ); + start_event.SetItem( item ); + start_event.SetEventObject( dv_ctrl ); + dv_ctrl->GetEventHandler()->ProcessEvent( start_event ); + if( !start_event.IsAllowed() ) + return false; + + m_item = item; // remember for later + unsigned int col = GetOwner()->GetModelColumn(); wxVariant value; - GetOwner()->GetOwner()->GetModel()->GetValue( value, col, row ); - - m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value ); - - wxDataViewEditorCtrlEvtHandler *handler = + dv_ctrl->GetModel()->GetValue( value, item, col ); + + m_editorCtrl = CreateEditorCtrl( dv_ctrl->GetMainWindow(), labelRect, value ); + + // there might be no editor control for the given item + if(!m_editorCtrl) + return false; + + 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, dv_ctrl->GetId() ); + event.SetDataViewColumn( GetOwner() ); + event.SetModel( dv_ctrl->GetModel() ); + event.SetItem( item ); + event.SetEventObject( dv_ctrl ); + dv_ctrl->GetEventHandler()->ProcessEvent( event ); + return true; } +void wxDataViewRendererBase::DestroyEditControl() +{ + // Remove our event handler first to prevent it from (recursively) calling + // us again as it would do via a call to FinishEditing() when the editor + // loses focus when we hide it below. + wxEvtHandler * const handler = m_editorCtrl->PopEventHandler(); + + // Hide the control immediately but don't delete it yet as there could be + // some pending messages for it. + m_editorCtrl->Hide(); + + wxPendingDelete.Append(handler); + wxPendingDelete.Append(m_editorCtrl); +} + void wxDataViewRendererBase::CancelEditing() { - wxPendingDelete.Append( m_editorCtrl ); - - GetOwner()->GetOwner()->GetMainWindow()->SetFocus(); - - // m_editorCtrl->PopEventHandler( true ); + if (!m_editorCtrl) + return; + + DestroyEditControl(); } bool wxDataViewRendererBase::FinishEditing() { + if (!m_editorCtrl) + return true; + wxVariant value; GetValueFromEditorCtrl( m_editorCtrl, value ); - wxPendingDelete.Append( m_editorCtrl ); - - GetOwner()->GetOwner()->GetMainWindow()->SetFocus(); - - if (!Validate(value)) - return false; - - unsigned int col = GetOwner()->GetModelColumn(); - GetOwner()->GetOwner()->GetModel()->SetValue( value, col, m_row ); - GetOwner()->GetOwner()->GetModel()->ValueChanged( col, m_row ); - - // m_editorCtrl->PopEventHandler( true ); - - return true; -} + wxDataViewCtrl* dv_ctrl = GetOwner()->GetOwner(); -//----------------------------------------------------------------------------- -// wxDataViewEditorCtrlEvtHandler -//----------------------------------------------------------------------------- + dv_ctrl->GetMainWindow()->SetFocus(); -BEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler) - EVT_CHAR (wxDataViewEditorCtrlEvtHandler::OnChar) - EVT_KILL_FOCUS (wxDataViewEditorCtrlEvtHandler::OnKillFocus) - EVT_IDLE (wxDataViewEditorCtrlEvtHandler::OnIdle) -END_EVENT_TABLE() + DestroyEditControl(); -wxDataViewEditorCtrlEvtHandler::wxDataViewEditorCtrlEvtHandler( - wxControl *editorCtrl, - wxDataViewRenderer *owner ) -{ - m_owner = owner; - m_editorCtrl = editorCtrl; + bool isValid = Validate(value); + unsigned int col = GetOwner()->GetModelColumn(); - m_finished = false; -} + // Now we should send Editing Done event + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, dv_ctrl->GetId() ); + event.SetDataViewColumn( GetOwner() ); + event.SetModel( dv_ctrl->GetModel() ); + event.SetItem( m_item ); + event.SetValue( value ); + event.SetColumn( col ); + event.SetEditCanceled( !isValid ); + event.SetEventObject( dv_ctrl ); + dv_ctrl->GetEventHandler()->ProcessEvent( event ); + + if ( isValid && event.IsAllowed() ) + { + dv_ctrl->GetModel()->ChangeValue(value, m_item, col); + return true; + } + + return false; +} + +void wxDataViewRendererBase::PrepareForItem(const wxDataViewModel *model, + const wxDataViewItem& item, + unsigned column) +{ + wxVariant value; + model->GetValue(value, item, column); + SetValue(value); + + wxDataViewItemAttr attr; + model->GetAttr(item, column, attr); + SetAttr(attr); + + SetEnabled(model->IsEnabled(item, column)); +} + + +// ---------------------------------------------------------------------------- +// wxDataViewCustomRendererBase +// ---------------------------------------------------------------------------- + +void +wxDataViewCustomRendererBase::WXCallRender(wxRect rectCell, wxDC *dc, int state) +{ + wxCHECK_RET( dc, "no DC to draw on in custom renderer?" ); + + // adjust the rectangle ourselves to account for the alignment + wxRect rectItem = rectCell; + const int align = GetAlignment(); + if ( align != wxDVR_DEFAULT_ALIGNMENT ) + { + const wxSize size = GetSize(); + + // take alignment into account only if there is enough space, otherwise + // show as much contents as possible + // + // notice that many existing renderers (e.g. wxDataViewSpinRenderer) + // return hard-coded size which can be more than they need and if we + // trusted their GetSize() we'd draw the text out of cell bounds + // entirely + + if ( size.x >= 0 && size.x < rectCell.width ) + { + if ( align & wxALIGN_CENTER_HORIZONTAL ) + rectItem.x += (rectCell.width - size.x)/2; + else if ( align & wxALIGN_RIGHT ) + rectItem.x += rectCell.width - size.x; + // else: wxALIGN_LEFT is the default + + rectItem.width = size.x; + } + + if ( size.y >= 0 && size.y < rectCell.height ) + { + if ( align & wxALIGN_CENTER_VERTICAL ) + rectItem.y += (rectCell.height - size.y)/2; + else if ( align & wxALIGN_BOTTOM ) + rectItem.y += rectCell.height - size.y; + // else: wxALIGN_TOP is the default + + rectItem.height = size.y; + } + } + + + // set up the DC attributes + + // override custom foreground with the standard one for the selected items + // because we currently don't allow changing the selection background and + // custom colours may be unreadable on it + wxColour col; + if ( state & wxDATAVIEW_CELL_SELECTED ) + col = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); + else if ( m_attr.HasColour() ) + col = m_attr.GetColour(); + else // use default foreground + col = GetOwner()->GetOwner()->GetForegroundColour(); + + wxDCTextColourChanger changeFg(*dc, col); + + wxDCFontChanger changeFont(*dc); + if ( m_attr.HasFont() ) + changeFont.Set(m_attr.GetEffectiveFont(dc->GetFont())); + + Render(rectItem, dc, state); +} + +wxSize wxDataViewCustomRendererBase::GetTextExtent(const wxString& str) const +{ + const wxDataViewCtrl *view = GetView(); + + if ( m_attr.HasFont() ) + { + wxFont font(m_attr.GetEffectiveFont(view->GetFont())); + wxSize size; + view->GetTextExtent(str, &size.x, &size.y, NULL, NULL, &font); + return size; + } + else + { + return view->GetTextExtent(str); + } +} + +void +wxDataViewCustomRendererBase::RenderText(const wxString& text, + int xoffset, + wxRect rect, + wxDC *dc, + int WXUNUSED(state)) +{ + wxRect rectText = rect; + rectText.x += xoffset; + rectText.width -= xoffset; + + // check if we want to ellipsize the text if it doesn't fit + wxString ellipsizedText; + if ( GetEllipsizeMode() != wxELLIPSIZE_NONE ) + { + ellipsizedText = wxControl::Ellipsize + ( + text, + *dc, + GetEllipsizeMode(), + rectText.width, + wxELLIPSIZE_FLAGS_NONE + ); + } + + // get the alignment to use + int align = GetAlignment(); + if ( align == wxDVR_DEFAULT_ALIGNMENT ) + { + // if we don't have an explicit alignment ourselves, use that of the + // column in horizontal direction and default vertical alignment + align = GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL; + } + + dc->DrawLabel(ellipsizedText.empty() ? text : ellipsizedText, + rectText, align); +} + +//----------------------------------------------------------------------------- +// wxDataViewEditorCtrlEvtHandler +//----------------------------------------------------------------------------- + +BEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler) + EVT_CHAR (wxDataViewEditorCtrlEvtHandler::OnChar) + EVT_KILL_FOCUS (wxDataViewEditorCtrlEvtHandler::OnKillFocus) + EVT_IDLE (wxDataViewEditorCtrlEvtHandler::OnIdle) + EVT_TEXT_ENTER (-1, wxDataViewEditorCtrlEvtHandler::OnTextEnter) +END_EVENT_TABLE() void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event ) { @@ -819,10 +946,16 @@ void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event ) if (wxWindow::FindFocus() != m_editorCtrl) m_editorCtrl->SetFocus(); } - + event.Skip(); } +void wxDataViewEditorCtrlEvtHandler::OnTextEnter( wxCommandEvent &WXUNUSED(event) ) +{ + m_finished = true; + m_owner->FinishEditing(); +} + void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event ) { switch ( event.m_keyCode ) @@ -833,10 +966,11 @@ void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event ) break; case WXK_ESCAPE: + { m_finished = true; m_owner->CancelEditing(); break; - + } default: event.Skip(); } @@ -857,104 +991,20 @@ void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event ) // wxDataViewColumnBase // --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject) - -wxDataViewColumnBase::wxDataViewColumnBase(const wxString& WXUNUSED(title), - wxDataViewRenderer *renderer, - unsigned int model_column, - int WXUNUSED(width), - wxAlignment WXUNUSED(align), - int WXUNUSED(flags)) -{ - m_renderer = renderer; - m_model_column = model_column; - m_owner = NULL; - m_renderer->SetOwner( (wxDataViewColumn*) this ); - - // NOTE: the wxDataViewColumn's ctor must store the width, align, flags - // parameters inside the native control! -} - -wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap, - wxDataViewRenderer *renderer, - unsigned int model_column, - int WXUNUSED(width), - wxAlignment WXUNUSED(align), - int WXUNUSED(flags) ) +void wxDataViewColumnBase::Init(wxDataViewRenderer *renderer, + unsigned int model_column) { m_renderer = renderer; m_model_column = model_column; - m_bitmap = bitmap; m_owner = NULL; m_renderer->SetOwner( (wxDataViewColumn*) this ); } wxDataViewColumnBase::~wxDataViewColumnBase() { - if (m_renderer) - delete m_renderer; -} - -int wxDataViewColumnBase::GetFlags() const -{ - int ret = 0; - - if (IsSortable()) - ret |= wxDATAVIEW_COL_SORTABLE; - if (IsResizeable()) - ret |= wxDATAVIEW_COL_RESIZABLE; - if (IsHidden()) - ret |= wxDATAVIEW_COL_HIDDEN; - - return ret; -} - -void wxDataViewColumnBase::SetFlags(int flags) -{ - SetSortable((flags & wxDATAVIEW_COL_SORTABLE) != 0); - SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0); - SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0); + delete m_renderer; } -// --------------------------------------------------------- -// wxDataViewEventListModelNotifier -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewEventListModelNotifier: public wxDataViewListModelNotifier -{ -public: - wxDataViewEventListModelNotifier( wxDataViewCtrl *ctrl ) { m_ctrl = ctrl; } - - bool SendEvent( wxEventType event_type, unsigned int row = 0, unsigned int col = 0 ) - { - wxDataViewEvent event( event_type, m_ctrl->GetId() ); - event.SetEventObject( m_ctrl ); - event.SetModel( m_ctrl->GetModel() ); - event.SetRow( row ); - event.SetColumn( col ); - m_ctrl->GetEventHandler()->ProcessEvent( event ); - return true; - } - - virtual bool RowAppended() { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_APPENDED ); } - virtual bool RowPrepended() { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_PREPENDED ); } - virtual bool RowInserted( unsigned int before ) - { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_INSERTED, before ); } - virtual bool RowDeleted( unsigned int row ) - { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_DELETED, row ); } - virtual bool RowChanged( unsigned int row ) - { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_CHANGED, row ); } - virtual bool ValueChanged( unsigned int col, unsigned int row ) - { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED, row, col ); } - virtual bool RowsReordered( unsigned int *new_order ) - { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROWS_REORDERED ); } - virtual bool Cleared() { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED ); } - -private: - wxDataViewCtrl *m_ctrl; -}; - - // --------------------------------------------------------- // wxDataViewCtrlBase // --------------------------------------------------------- @@ -964,36 +1014,23 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl) wxDataViewCtrlBase::wxDataViewCtrlBase() { m_model = NULL; - m_cols.DeleteContents( true ); - m_eventNotifier = NULL; + m_expander_column = 0; + m_indent = 8; } wxDataViewCtrlBase::~wxDataViewCtrlBase() { - // IMPORTANT: before calling DecRef() on our model (since it may - // result in a free() call), erase all columns (since - // they hold a pointer to our model) - m_cols.Clear(); - if (m_model) { - if (m_eventNotifier) - m_model->RemoveNotifier( m_eventNotifier ); - m_eventNotifier = NULL; - m_model->DecRef(); m_model = NULL; } } -bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model ) +bool wxDataViewCtrlBase::AssociateModel( wxDataViewModel *model ) { if (m_model) { - if (m_eventNotifier) - m_model->RemoveNotifier( m_eventNotifier ); - m_eventNotifier = NULL; - m_model->DecRef(); // discard old model, if any } @@ -1001,124 +1038,346 @@ bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model ) m_model = model; if (m_model) { - m_model->IncRef(); - m_eventNotifier = new wxDataViewEventListModelNotifier( (wxDataViewCtrl*) this ); - m_model->AddNotifier( m_eventNotifier ); + m_model->IncRef(); } return true; } -wxDataViewListModel* wxDataViewCtrlBase::GetModel() +wxDataViewModel* wxDataViewCtrlBase::GetModel() +{ + return m_model; +} + +const wxDataViewModel* wxDataViewCtrlBase::GetModel() const { return m_model; } -bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column, +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()) + { + parentChain.push_back(parent); + parent = m_model->GetParent(parent); + } + + // then we expand the parents, starting at the root + while (!parentChain.empty()) + { + Expand(parentChain.back()); + parentChain.pop_back(); + } +} + +wxDataViewItem wxDataViewCtrlBase::GetCurrentItem() const +{ + return HasFlag(wxDV_MULTIPLE) ? DoGetCurrentItem() + : GetSelection(); +} + +void wxDataViewCtrlBase::SetCurrentItem(const wxDataViewItem& item) +{ + wxCHECK_RET( item.IsOk(), "Can't make current an invalid item." ); + + if ( HasFlag(wxDV_MULTIPLE) ) + DoSetCurrentItem(item); + else + Select(item); +} + +wxDataViewColumn * +wxDataViewCtrlBase::AppendTextColumn( 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 ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; +} + +wxDataViewColumn * +wxDataViewCtrlBase::AppendIconTextColumn( const wxString &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, - new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), - model_column, width, align, flags ) ); + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int 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 wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), - model_column, width, align, flags ) ); + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewToggleRenderer( wxT("bool"), mode ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column, +wxDataViewColumn * +wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, - new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), - model_column, width, align, flags ) ); + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column, +wxDataViewColumn * +wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, - new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), - model_column, width, align, flags ) ); + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewDateRenderer( wxT("datetime"), mode ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column, +wxDataViewColumn * +wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, - new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), - model_column, width, align, flags ) ); + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column, +wxDataViewColumn * +wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, - new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), - model_column, width, align, flags ) ); + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewTextRenderer( wxT("string"), mode ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column, +wxDataViewColumn * +wxDataViewCtrlBase::AppendIconTextColumn( const wxBitmap &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, - new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), - model_column, width, align, flags ) ); + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column, +wxDataViewColumn * +wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, - new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), - model_column, width, align, flags ) ); + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewToggleRenderer( wxT("bool"), mode ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column, +wxDataViewColumn * +wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, - new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), - model_column, width, align, flags ) ); + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column, +wxDataViewColumn * +wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return AppendColumn( new wxDataViewColumn( label, - new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), - model_column, width, align, flags ) ); + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewDateRenderer( wxT("datetime"), mode ), + model_column, width, align, flags ); + AppendColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col ) +wxDataViewColumn * +wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - m_cols.Append( (wxObject*) col ); - col->SetOwner( (wxDataViewCtrl*) this ); - return true; + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), + 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 ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; } -unsigned int wxDataViewCtrlBase::GetColumnCount() const +wxDataViewColumn * +wxDataViewCtrlBase::PrependIconTextColumn( 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 wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::DeleteColumn( unsigned int WXUNUSED(pos) ) +wxDataViewColumn * +wxDataViewCtrlBase::PrependToggleColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return false; + + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewToggleRenderer( wxT("bool"), mode ), + model_column, width, align, flags ); + PrependColumn( ret ); + return ret; } -bool wxDataViewCtrlBase::ClearColumns() +wxDataViewColumn * +wxDataViewCtrlBase::PrependProgressColumn( const wxString &label, unsigned int model_column, + wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - return false; + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), + 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 ), + 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 ), + 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 ), + 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 ), + 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 ), + 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 ), + 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 ), + 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 ), + 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; } -wxDataViewColumn* wxDataViewCtrlBase::GetColumn( unsigned int pos ) +bool +wxDataViewCtrlBase::InsertColumn( unsigned int WXUNUSED(pos), wxDataViewColumn *col ) { - return (wxDataViewColumn*) m_cols[ pos ]; + col->SetOwner( (wxDataViewCtrl*) this ); + return true; } // --------------------------------------------------------- @@ -1127,18 +1386,1096 @@ wxDataViewColumn* wxDataViewCtrlBase::GetColumn( unsigned int pos ) IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ROW_SELECTED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ROW_ACTIVATED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK) +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_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_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_CACHE_HINT, 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 ); + -DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_APPENDED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_PREPENDED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_INSERTED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_DELETED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROWS_REORDERED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED) +// ------------------------------------- +// wxDataViewSpinRenderer +// ------------------------------------- + +wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCellMode mode, int alignment ) : + wxDataViewCustomRenderer(wxT("long"), mode, alignment ) +{ + m_min = min; + m_max = max; +} + +wxWindow* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) +{ + long l = value; + wxSize size = labelRect.GetSize(); +#ifdef __WXMAC__ + size = wxSize( wxMax(70,labelRect.width ), -1 ); +#endif + wxString str; + str.Printf( wxT("%d"), (int) l ); + wxSpinCtrl *sc = new wxSpinCtrl( parent, wxID_ANY, str, + labelRect.GetTopLeft(), size, wxSP_ARROW_KEYS|wxTE_PROCESS_ENTER, m_min, m_max, l ); +#ifdef __WXMAC__ + size = sc->GetSize(); + wxPoint pt = sc->GetPosition(); + sc->SetSize( pt.x - 4, pt.y - 4, size.x, size.y ); #endif + + return sc; +} + +bool wxDataViewSpinRenderer::GetValueFromEditorCtrl( wxWindow* 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(wxT("%d"), (int) m_data ); + RenderText( str, 0, rect, dc, state ); + return true; +} + +wxSize wxDataViewSpinRenderer::GetSize() const +{ + wxSize sz = GetTextExtent(wxString::Format("%d", (int)m_data)); + + // Allow some space for the spin buttons, which is approximately the size + // of a scrollbar (and getting pixel-exact value would be complicated). + // Also add some whitespace between the text and the button: + sz.x += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); + sz.x += GetTextExtent("M").x; + + return sz; +} + +bool wxDataViewSpinRenderer::SetValue( const wxVariant &value ) +{ + m_data = value.GetLong(); + return true; +} + +bool wxDataViewSpinRenderer::GetValue( wxVariant &value ) const +{ + value = m_data; + return true; +} + +// ------------------------------------- +// wxDataViewChoiceRenderer +// ------------------------------------- + +#if defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXOSX_CARBON__) + +wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString& choices, wxDataViewCellMode mode, int alignment ) : + wxDataViewCustomRenderer(wxT("string"), mode, alignment ) +{ + m_choices = choices; +} + +wxWindow* wxDataViewChoiceRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) +{ + wxChoice* c = new wxChoice + ( + parent, + wxID_ANY, + labelRect.GetTopLeft(), + wxSize(labelRect.GetWidth(), -1), + m_choices + ); + c->Move(labelRect.GetRight() - c->GetRect().width, wxDefaultCoord); + c->SetStringSelection( value.GetString() ); + return c; +} + +bool wxDataViewChoiceRenderer::GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) +{ + wxChoice *c = (wxChoice*) editor; + wxString s = c->GetStringSelection(); + value = s; + return true; +} + +bool wxDataViewChoiceRenderer::Render( wxRect rect, wxDC *dc, int state ) +{ + RenderText( m_data, 0, rect, dc, state ); + return true; +} + +wxSize wxDataViewChoiceRenderer::GetSize() const +{ + wxSize sz; + + for ( wxArrayString::const_iterator i = m_choices.begin(); i != m_choices.end(); ++i ) + sz.IncTo(GetTextExtent(*i)); + + // Allow some space for the right-side button, which is approximately the + // size of a scrollbar (and getting pixel-exact value would be complicated). + // Also add some whitespace between the text and the button: + sz.x += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); + sz.x += GetTextExtent("M").x; + + return sz; +} + +bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value ) +{ + m_data = value.GetString(); + return true; +} + +bool wxDataViewChoiceRenderer::GetValue( wxVariant &value ) const +{ + value = m_data; + return true; +} + +// ---------------------------------------------------------------------------- +// wxDataViewChoiceByIndexRenderer +// ---------------------------------------------------------------------------- + +wxDataViewChoiceByIndexRenderer::wxDataViewChoiceByIndexRenderer( const wxArrayString &choices, + wxDataViewCellMode mode, int alignment ) : + wxDataViewChoiceRenderer( choices, mode, alignment ) +{ +} + +wxWindow* wxDataViewChoiceByIndexRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) +{ + wxVariant string_value = GetChoice( value.GetLong() ); + + return wxDataViewChoiceRenderer::CreateEditorCtrl( parent, labelRect, string_value ); +} + +bool wxDataViewChoiceByIndexRenderer::GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) +{ + wxVariant string_value; + if (!wxDataViewChoiceRenderer::GetValueFromEditorCtrl( editor, string_value )) + return false; + + value = (long) GetChoices().Index( string_value.GetString() ); + return true; +} + +bool wxDataViewChoiceByIndexRenderer::SetValue( const wxVariant &value ) +{ + wxVariant string_value = GetChoice( value.GetLong() ); + return wxDataViewChoiceRenderer::SetValue( string_value ); +} + +bool wxDataViewChoiceByIndexRenderer::GetValue( wxVariant &value ) const +{ + wxVariant string_value; + if (!wxDataViewChoiceRenderer::GetValue( string_value )) + return false; + + value = (long) GetChoices().Index( string_value.GetString() ); + return true; +} + +#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; + delete *it; + 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 ); +} + +wxDataViewListCtrl::~wxDataViewListCtrl() +{ +} + + +bool wxDataViewListCtrl::Create( wxWindow *parent, wxWindowID id, + const wxPoint& pos, const wxSize& size, long style, + const wxValidator& validator ) +{ + if ( !wxDataViewCtrl::Create( parent, id, pos, size, style, validator ) ) + return false; + + wxDataViewListStore *store = new wxDataViewListStore; + AssociateModel( store ); + store->DecRef(); + + return true; +} + +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 +//----------------------------------------------------------------------------- + +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 ); + + 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 ); + + return node->GetItem(); +} + +wxDataViewItem +wxDataViewTreeStore::InsertItem(const wxDataViewItem& parent, + const wxDataViewItem& previous, + const wxString& text, + const wxIcon& icon, + wxClientData *data) +{ + 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, + 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 ); + + 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 ); + + return node->GetItem(); +} + +wxDataViewItem +wxDataViewTreeStore::InsertContainer(const wxDataViewItem& parent, + const wxDataViewItem& previous, + const wxString& text, + const wxIcon& icon, + const wxIcon& expanded, + wxClientData * data) +{ + 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(); +} + +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 +{ + wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); + if (!parent_node) return wxDataViewItem(0); + + wxDataViewTreeStoreNodeList::compatibility_iterator node = parent_node->GetChildren().Item( pos ); + if (node) + return wxDataViewItem(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 ); +} + +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 ); +} + +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 ); +} + +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 ); +} + +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 ); +} + +void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item ) +{ + wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); + if (!node) return; + + node->GetChildren().clear(); +} + +void wxDataViewTreeStore::DeleteAllItems() +{ + DeleteChildren(wxDataViewItem(m_root)); +} + +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(); +} + +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) ) const +{ + 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 ) - parent2->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() +{ + delete m_imageList; +} + +bool wxDataViewTreeCtrl::Create( wxWindow *parent, wxWindowID id, + const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) +{ + if ( !wxDataViewCtrl::Create( parent, id, pos, size, style, validator ) ) + return false; + + // create the standard model and a column in the tree + wxDataViewTreeStore *store = new wxDataViewTreeStore; + AssociateModel( store ); + store->DecRef(); + + AppendIconTextColumn + ( + wxString(), // no label (header is not shown anyhow) + 0, // the only model column + wxDATAVIEW_CELL_EDITABLE, + -1, // default width + wxALIGN_NOT, // and alignment + 0 // not resizable + ); + + return true; +} + +void wxDataViewTreeCtrl::SetImageList( wxImageList *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 ); + + wxDataViewItem res = GetStore()->AppendItem( parent, text, icon, data ); + + GetStore()->ItemAdded( parent, res ); + + return res; +} + +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 ); + + wxDataViewItem res = GetStore()->PrependItem( parent, text, icon, data ); + + GetStore()->ItemAdded( parent, res ); + + return res; +} + +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 ); + + wxDataViewItem res = GetStore()->InsertItem( parent, previous, text, icon, data ); + + GetStore()->ItemAdded( parent, res ); + + return res; +} + +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 ); + + wxDataViewItem res = GetStore()->PrependContainer( parent, text, icon, expanded, data ); + + GetStore()->ItemAdded( parent, res ); + + return res; +} + +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 ); + + wxDataViewItem res = GetStore()->AppendContainer( parent, text, icon, expanded, data ); + + GetStore()->ItemAdded( parent, res ); + + return res; +} + +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 ); + + 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 ) +{ + 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 &event ) +{ +#if defined(wxUSE_GENERICDATAVIEWCTRL) + // automatically resize our only column to take the entire control width + if ( GetColumnCount() ) + { + wxSize size = GetClientSize(); + GetColumn(0)->SetWidth(size.x); + } +#endif + event.Skip( true ); +} + +#endif // wxUSE_DATAVIEWCTRL +