Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make wxDataViewModel::Compare() const

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2009-03-10 13:37:26 +00:00
parent 87bf626584
commit 862de7b3d9
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/dataview.h
View File

@@ -213,7 +213,7 @@ public:
// default compare function // default compare function
virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, 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; } virtual bool HasDefaultCompare() const { return false; }
// internal // internal
@@ -262,7 +262,7 @@ public:
// compare based on index // compare based on index
virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
unsigned int column, bool ascending ); unsigned int column, bool ascending ) const;
virtual bool HasDefaultCompare() const; virtual bool HasDefaultCompare() const;
// implement base methods // implement base methods
@@ -327,7 +327,7 @@ public:
// compare based on index // compare based on index
virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
unsigned int column, bool ascending ); unsigned int column, bool ascending ) const;
virtual bool HasDefaultCompare() const; virtual bool HasDefaultCompare() const;
// implement base methods // implement base methods
@@ -1229,7 +1229,7 @@ public:
virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const; virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const;
virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
unsigned int column, bool ascending ); unsigned int column, bool ascending ) const;
virtual bool HasDefaultCompare() const virtual bool HasDefaultCompare() const
{ return true; } { return true; }

2
interface/wx/dataview.h
View File

@@ -107,7 +107,7 @@ public:
virtual int Compare(const wxDataViewItem& item1, virtual int Compare(const wxDataViewItem& item1,
const wxDataViewItem& item2, const wxDataViewItem& item2,
unsigned int column, unsigned int column,
bool ascending); bool ascending) const;
/** /**
Override this to indicate that the item has special font attributes. Override this to indicate that the item has special font attributes.

8
src/common/datavcmn.cpp
View File

@@ -233,7 +233,7 @@ void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier )
} }
int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
unsigned int column, bool ascending ) unsigned int column, bool ascending ) const
{ {
// sort branches before leaves // sort branches before leaves
bool item1_is_container = IsContainer(item1); bool item1_is_container = IsContainer(item1);
@@ -432,7 +432,7 @@ bool wxDataViewIndexListModel::HasDefaultCompare() const
int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1, int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1,
const wxDataViewItem& item2, const wxDataViewItem& item2,
unsigned int WXUNUSED(column), unsigned int WXUNUSED(column),
bool ascending) bool ascending) const
{ {
if (m_ordered) if (m_ordered)
{ {
@@ -587,7 +587,7 @@ bool wxDataViewVirtualListModel::HasDefaultCompare() const
int wxDataViewVirtualListModel::Compare(const wxDataViewItem& item1, int wxDataViewVirtualListModel::Compare(const wxDataViewItem& item1,
const wxDataViewItem& item2, const wxDataViewItem& item2,
unsigned int WXUNUSED(column), unsigned int WXUNUSED(column),
bool ascending) bool ascending) const
{ {
unsigned int pos1 = wxPtrToUInt(item1.GetID()); unsigned int pos1 = wxPtrToUInt(item1.GetID());
unsigned int pos2 = wxPtrToUInt(item2.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, 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 *node1 = FindNode( item1 );
wxDataViewTreeStoreNode *node2 = FindNode( item2 ); wxDataViewTreeStoreNode *node2 = FindNode( item2 );