optimise startup of wxDataViewIndexListModel

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 022ff17bd52425a8cced69dfdfcdfa54cd495d79..fbfc5dce449721769d94f3949a0a9dae98296b4a 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -255,7 +255,7 @@ public:
 
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
                          unsigned int column, bool ascending );
-    virtual bool HasDefaultCompare() const { return true; }
+    virtual bool HasDefaultCompare() const;
 
     // implement base methods
 
@@ -271,6 +271,7 @@ public:
 private:
     wxDataViewItemArray m_hash;
     unsigned int m_lastIndex;
+    bool m_ordered;
 };
 
 

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index b5f49859fcc5bf6950f6eaedf3c7e55b39f407d5..af4de712b26ffb91a81f43547ed6db886a0dc3ff 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -299,6 +299,8 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem
 
 wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size )
 {
+    m_ordered = true;
+
     // build initial index
     unsigned int i;
     for (i = 1; i < initial_size+1; i++)
@@ -316,6 +318,8 @@ void wxDataViewIndexListModel::RowPrepended()
     m_hash.Insert( (void*) id, 0 );
     wxDataViewItem item( (void*) id );
     ItemAdded( wxDataViewItem(0), item );
+    
+    m_ordered = false;
 }
 
 void wxDataViewIndexListModel::RowInserted( unsigned int before )
@@ -324,6 +328,8 @@ void wxDataViewIndexListModel::RowInserted( unsigned int before )
     m_hash.Insert( (void*) id, before );
     wxDataViewItem item( (void*) id );
     ItemAdded( wxDataViewItem(0), item );
+    
+    m_ordered = false;
 }
 
 void wxDataViewIndexListModel::RowAppended()
@@ -353,6 +359,12 @@ void wxDataViewIndexListModel::RowValueChanged( unsigned int row, unsigned int c
 
 unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) const
 {
+    if (m_ordered)
+    {
+        unsigned int pos = (unsigned int) item.GetID();
+        return pos-1;
+    }
+    
     // assert for not found
     return (unsigned int) m_hash.Index( item.GetID() );
 }
@@ -363,11 +375,27 @@ wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const
     return wxDataViewItem( m_hash[row] );
 }
 
+bool wxDataViewIndexListModel::HasDefaultCompare() const
+{ 
+    return !m_ordered;
+}
+
 int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1,
                                       const wxDataViewItem& item2,
                                       unsigned int WXUNUSED(column),
                                       bool ascending)
 {
+    if (m_ordered)
+    {
+        unsigned int pos1 = (unsigned int) item1.GetID();
+        unsigned int pos2 = (unsigned int) item2.GetID();
+        
+        if (ascending)
+            return pos1 - pos2;
+        else 
+            return pos2 - pos1;
+    }
+    
     if (ascending)
         return GetRow(item1) - GetRow(item2);