X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/736fe67c66e0f5a552f3b45e13d288f5c650c46e..850df2d78866c3edcf848103b5dbc7e7fa1ee5fa:/src/common/datavcmn.cpp?ds=inline diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 5bf1a59021..09353943d8 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -19,9 +19,14 @@ #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 const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl"); @@ -32,13 +37,19 @@ 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 // --------------------------------------------------------- // wxDataViewModelNotifier // --------------------------------------------------------- #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxDataViewModelNotifiers); +WX_DEFINE_LIST(wxDataViewModelNotifiers) bool wxDataViewModelNotifier::ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items ) { @@ -46,7 +57,7 @@ bool wxDataViewModelNotifier::ItemsAdded( const wxDataViewItem &parent, const wx size_t i; for (i = 0; i < count; i++) if (!ItemAdded( parent, items[i] )) return false; - + return true; } @@ -56,7 +67,7 @@ bool wxDataViewModelNotifier::ItemsDeleted( const wxDataViewItem &parent, const size_t i; for (i = 0; i < count; i++) if (!ItemDeleted( parent, items[i] )) return false; - + return true; } @@ -66,7 +77,7 @@ bool wxDataViewModelNotifier::ItemsChanged( const wxDataViewItemArray &items ) size_t i; for (i = 0; i < count; i++) if (!ItemChanged( items[i] )) return false; - + return true; } @@ -288,11 +299,27 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size ) { - // build initial index - unsigned int i; - for (i = 1; i < initial_size+1; i++) - m_hash.Add( (void*) i ); - m_lastIndex = initial_size + 1; +#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; + } } wxDataViewIndexListModel::~wxDataViewIndexListModel() @@ -301,33 +328,73 @@ wxDataViewIndexListModel::~wxDataViewIndexListModel() void wxDataViewIndexListModel::RowPrepended() { - unsigned int id = m_lastIndex++; - m_hash.Insert( (void*) id, 0 ); - wxDataViewItem item( (void*) id ); - ItemAdded( wxDataViewItem(0), item ); + 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 ); + } } void wxDataViewIndexListModel::RowInserted( unsigned int before ) { - unsigned int id = m_lastIndex++; - m_hash.Insert( (void*) id, before ); - wxDataViewItem item( (void*) id ); - ItemAdded( wxDataViewItem(0), item ); + 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 wxDataViewIndexListModel::RowAppended() { - unsigned int id = m_lastIndex++; - m_hash.Add( (void*) id ); - wxDataViewItem item( (void*) id ); - ItemAdded( wxDataViewItem(0), item ); + 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 ); + } } void wxDataViewIndexListModel::RowDeleted( unsigned int row ) { - wxDataViewItem item( m_hash[row] ); - wxDataViewModel::ItemDeleted( wxDataViewItem(0), item ); - m_hash.RemoveAt( row ); + if (m_useHash) + { + wxDataViewItem item( m_hash[row] ); + wxDataViewModel::ItemDeleted( wxDataViewItem(0), item ); + m_hash.RemoveAt( row ); + } + else + { + wxDataViewItem item( (void*) row ); + wxDataViewModel::ItemDeleted( wxDataViewItem(0), item ); + m_lastIndex++; + } } void wxDataViewIndexListModel::RowChanged( unsigned int row ) @@ -342,14 +409,39 @@ void wxDataViewIndexListModel::RowValueChanged( unsigned int row, unsigned int c unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) const { - // assert for not found - return (unsigned int) m_hash.Index( item.GetID() ); + if (m_useHash) + { + if (m_ordered) + { + 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() ); + } } wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const { - wxASSERT( row < m_hash.GetCount() ); - return wxDataViewItem( m_hash[row] ); + if (m_useHash) + { + wxASSERT( row < m_hash.GetCount() ); + return wxDataViewItem( m_hash[row] ); + } + else + { + return wxDataViewItem( (void*) row ); + } +} + +bool wxDataViewIndexListModel::HasDefaultCompare() const +{ + return !m_ordered; } int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1, @@ -357,6 +449,17 @@ int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1, 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); @@ -375,6 +478,11 @@ bool wxDataViewIndexListModel::SetValue( const wxVariant &variant, return SetValue( variant, GetRow(item), col ); } +bool wxDataViewIndexListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr ) +{ + return GetAttr( GetRow(item), col, attr ); +} + wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const { return wxDataViewItem(0); @@ -391,6 +499,9 @@ bool wxDataViewIndexListModel::IsContainer( const wxDataViewItem &item ) const unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const { + if (!m_useHash) + return 0; // error + if (item.IsOk()) return 0; @@ -971,12 +1082,64 @@ 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, +wxDataViewTreeStoreNode::wxDataViewTreeStoreNode( + wxDataViewTreeStoreNode *parent, const wxString &text, const wxIcon &icon, wxClientData *data ) { m_parent = parent; @@ -990,12 +1153,12 @@ wxDataViewTreeStoreNode::~wxDataViewTreeStoreNode() if (m_data) delete m_data; } - + #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxDataViewTreeStoreNodeList); +WX_DEFINE_LIST(wxDataViewTreeStoreNodeList) -wxDataViewTreeStoreContainerNode::wxDataViewTreeStoreContainerNode( - wxDataViewTreeStoreNode *parent, const wxString &text, +wxDataViewTreeStoreContainerNode::wxDataViewTreeStoreContainerNode( + wxDataViewTreeStoreNode *parent, const wxString &text, const wxIcon &icon, const wxIcon &expanded, wxClientData *data ) : wxDataViewTreeStoreNode( parent, text, icon, data ) { @@ -1019,19 +1182,19 @@ wxDataViewTreeStore::~wxDataViewTreeStore() delete m_root; } -wxDataViewItem wxDataViewTreeStore::AppendItem( const wxDataViewItem& parent, +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 = + + wxDataViewTreeStoreNode *node = new wxDataViewTreeStoreNode( parent_node, text, icon, data ); parent_node->GetChildren().Append( node ); - + // notify control ItemAdded( parent, node->GetItem() ); - + return node->GetItem(); } @@ -1040,60 +1203,71 @@ wxDataViewItem wxDataViewTreeStore::PrependItem( const wxDataViewItem& parent, { wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); if (!parent_node) return wxDataViewItem(0); - - wxDataViewTreeStoreNode *node = + + 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& parent, const wxDataViewItem& previous, - const wxString &text, const wxIcon &icon, wxClientData *data ) +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, +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 = + + 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 ) +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 = + + 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& parent, const wxDataViewItem& previous, - const wxString &text, const wxIcon &icon, const wxIcon &expanded, - wxClientData *data ) +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); } @@ -1102,11 +1276,11 @@ wxDataViewItem wxDataViewTreeStore::GetNthChild( const wxDataViewItem& parent, u { 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); } @@ -1114,21 +1288,21 @@ 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(); + 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 ); } @@ -1137,7 +1311,7 @@ wxString wxDataViewTreeStore::GetItemText( const wxDataViewItem& item ) const { wxDataViewTreeStoreNode *node = FindNode( item ); if (!node) return wxEmptyString; - + return node->GetText(); } @@ -1145,9 +1319,9 @@ void wxDataViewTreeStore::SetItemIcon( const wxDataViewItem& item, const wxIcon { wxDataViewTreeStoreNode *node = FindNode( item ); if (!node) return; - + node->SetIcon( icon ); - + // notify control ValueChanged( item, 0 ); } @@ -1156,7 +1330,7 @@ const wxIcon &wxDataViewTreeStore::GetItemIcon( const wxDataViewItem& item ) con { wxDataViewTreeStoreNode *node = FindNode( item ); if (!node) return wxNullIcon; - + return node->GetIcon(); } @@ -1164,9 +1338,9 @@ void wxDataViewTreeStore::SetItemExpandedIcon( const wxDataViewItem& item, const { wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); if (!node) return; - + node->SetExpandedIcon( icon ); - + // notify control ValueChanged( item, 0 ); } @@ -1175,7 +1349,7 @@ const wxIcon &wxDataViewTreeStore::GetItemExpandedIcon( const wxDataViewItem& it { wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); if (!node) return wxNullIcon; - + return node->GetExpandedIcon(); } @@ -1183,9 +1357,9 @@ void wxDataViewTreeStore::SetItemData( const wxDataViewItem& item, wxClientData { wxDataViewTreeStoreNode *node = FindNode( item ); if (!node) return; - + node->SetData( data ); - + // notify control? only sensible when sorting on client data // ValueChanged( item, 0 ); } @@ -1194,7 +1368,7 @@ wxClientData *wxDataViewTreeStore::GetItemData( const wxDataViewItem& item ) con { wxDataViewTreeStoreNode *node = FindNode( item ); if (!node) return NULL; - + return node->GetData(); } @@ -1206,12 +1380,12 @@ void wxDataViewTreeStore::DeleteItem( const wxDataViewItem& 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 ); } @@ -1220,7 +1394,7 @@ void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item ) { wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); if (!node) return; - + wxDataViewItemArray array; wxDataViewTreeStoreNodeList::iterator iter; for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); iter++) @@ -1228,9 +1402,9 @@ void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item ) wxDataViewTreeStoreNode* child = *iter; array.Add( child->GetItem() ); } - + node->GetChildren().clear(); - + // notify control ItemsDeleted( item, array ); } @@ -1240,34 +1414,38 @@ void wxDataViewTreeStore::DeleteAllItems() // TODO } -void wxDataViewTreeStore::GetValue( wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) const +void +wxDataViewTreeStore::GetValue(wxVariant &variant, + const wxDataViewItem &item, + unsigned int WXUNUSED(col)) const { // if (col != 0) return; - + wxDataViewTreeStoreNode *node = FindNode( item ); if (!node) return; - + wxDataViewIconText data( node->GetText(), node->GetIcon() ); - + variant << data; } -bool wxDataViewTreeStore::SetValue( const wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) +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; } @@ -1275,13 +1453,13 @@ wxDataViewItem wxDataViewTreeStore::GetParent( const wxDataViewItem &item ) cons { 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(); } @@ -1289,7 +1467,7 @@ bool wxDataViewTreeStore::IsContainer( const wxDataViewItem &item ) const { wxDataViewTreeStoreNode *node = FindNode( item ); if (!node) return false; - + return node->IsContainer(); } @@ -1304,36 +1482,36 @@ unsigned int wxDataViewTreeStore::GetChildren( const wxDataViewItem &item, wxDat wxDataViewTreeStoreNode* child = *iter; children.Add( child->GetItem() ); } - + return node->GetChildren().GetCount(); } -int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, +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* parent1 = (wxDataViewTreeStoreContainerNode*) node1->GetParent(); - wxDataViewTreeStoreContainerNode* parent2 = + 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 ); } @@ -1341,7 +1519,7 @@ wxDataViewTreeStoreNode *wxDataViewTreeStore::FindNode( const wxDataViewItem &it { if (!item.IsOk()) return m_root; - + return (wxDataViewTreeStoreNode*) item.GetID(); } @@ -1351,12 +1529,12 @@ wxDataViewTreeStoreContainerNode *wxDataViewTreeStore::FindContainerNode( const return (wxDataViewTreeStoreContainerNode*) m_root; wxDataViewTreeStoreNode* node = (wxDataViewTreeStoreNode*) item.GetID(); - + if (!node->IsContainer()) return NULL; - + return (wxDataViewTreeStoreContainerNode*) node; } -#endif +#endif // wxUSE_DATAVIEWCTRL