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

change wxDataViewModel::Compare() to including column and sortorder

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-08-19 14:12:52 +00:00
parent 10d1a99617
commit 7ee7191cee
4 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/datavcmn.cpp
View File

@@ -42,7 +42,6 @@ WX_DEFINE_LIST(wxDataViewModelNotifiers);
wxDataViewModel::wxDataViewModel()
{
m_notifiers.DeleteContents( true );
m_sortingColumn = 0;
}
bool wxDataViewModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
@@ -141,7 +140,8 @@ void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier )
m_notifiers.DeleteObject( notifier );
}
int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2 )
int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
unsigned int column, bool ascending )
{
// sort branches before leaves
bool item1_is_container = IsContainer(item1);
@@ -153,8 +153,15 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem
return -1;
wxVariant value1,value2;
GetValue( value1, item1, m_sortingColumn );
GetValue( value2, item2, m_sortingColumn );
GetValue( value1, item1, column );
GetValue( value2, item2, column );
if (!ascending)
{
wxVariant temp = value1;
value1 = value2;
value2 = temp;
}
if (value1.GetType() == wxT("string"))
{
@@ -188,6 +195,9 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem
// items must be different
unsigned long litem1 = (unsigned long) item1.GetID();
unsigned long litem2 = (unsigned long) item2.GetID();
if (!ascending)
return litem2-litem2;
return litem1-litem2;
}
@@ -261,9 +271,13 @@ wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const
return wxDataViewItem( m_hash[row] );
}
int wxDataViewIndexListModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2 )
int wxDataViewIndexListModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
unsigned int column, bool ascending )
{
return GetRow(item1) - GetRow(item2);
if (ascending)
return GetRow(item1) - GetRow(item2);
return GetRow(item2) - GetRow(item1);
}
void wxDataViewIndexListModel::GetValue( wxVariant &variant,