Make wxDataViewModel::Compare() const

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 9ae9ba9d7775f9c83e382d011f900255bc7b5154..757910d01f92c151e9a71f8eee8e01b56a4c18e0 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -213,7 +213,7 @@ public:
 
     // default compare function
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
-                         unsigned int column, bool ascending );
+                         unsigned int column, bool ascending ) const;
     virtual bool HasDefaultCompare() const { return false; }
 
     // internal
@@ -262,7 +262,7 @@ public:
     // compare based on index
 
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
-                         unsigned int column, bool ascending );
+                         unsigned int column, bool ascending ) const;
     virtual bool HasDefaultCompare() const;
 
     // implement base methods
@@ -327,7 +327,7 @@ public:
     // compare based on index
 
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
-                         unsigned int column, bool ascending );
+                         unsigned int column, bool ascending ) const;
     virtual bool HasDefaultCompare() const;
 
     // implement base methods
@@ -1229,7 +1229,7 @@ public:
     virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const;
 
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
-                         unsigned int column, bool ascending );
+                         unsigned int column, bool ascending ) const;
 
     virtual bool HasDefaultCompare() const
         { return true; }

diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index 6fa9f2442cf1a2ef6cf17d4469490af99bbe13c9..79db099c1fb399defcf11fb453cf1183c263e63f 100644 (file)
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -107,7 +107,7 @@ public:
     virtual int Compare(const wxDataViewItem& item1,
                         const wxDataViewItem& item2,
                         unsigned int column,
-                        bool ascending);
+                        bool ascending) const;
 
     /**
         Override this to indicate that the item has special font attributes.

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 62ef66cef5e0c01c0960f7f3e83668d8e23d981c..4c3e52e99a6a9f8e47ea6760c1558660392ff9f7 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -233,7 +233,7 @@ void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier )
 }
 
 int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
-                              unsigned int column, bool ascending )
+                              unsigned int column, bool ascending ) const
 {
     // sort branches before leaves
     bool item1_is_container = IsContainer(item1);
@@ -432,7 +432,7 @@ bool wxDataViewIndexListModel::HasDefaultCompare() const
 int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1,
                                       const wxDataViewItem& item2,
                                       unsigned int WXUNUSED(column),
-                                      bool ascending)
+                                      bool ascending) const
 {
     if (m_ordered)
     {
@@ -587,7 +587,7 @@ bool wxDataViewVirtualListModel::HasDefaultCompare() const
 int wxDataViewVirtualListModel::Compare(const wxDataViewItem& item1,
                                       const wxDataViewItem& item2,
                                       unsigned int WXUNUSED(column),
-                                      bool ascending)
+                                      bool ascending) const
 {
     unsigned int pos1 = wxPtrToUInt(item1.GetID());
     unsigned int pos2 = wxPtrToUInt(item2.GetID());
@@ -1943,7 +1943,7 @@ unsigned int wxDataViewTreeStore::GetChildren( const wxDataViewItem &item, wxDat
 }
 
 int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
-                         unsigned int WXUNUSED(column), bool WXUNUSED(ascending) )
+                         unsigned int WXUNUSED(column), bool WXUNUSED(ascending) ) const
 {
     wxDataViewTreeStoreNode *node1 = FindNode( item1 );
     wxDataViewTreeStoreNode *node2 = FindNode( item2 );