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

restore sorting functionality of the generic wxDataViewCtrl but implement it on top of wxHeaderCtrl support for it now; don't have const and non-const overloads of GetSortingColumn() in wxDVC returning different things (could this have really been intentional?); added GetSortingColumnIndex()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-08 21:13:29 +00:00
parent 05867e397e
commit 46234a0383
2 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/generic/datavgen.cpp
View File

@@ -125,9 +125,46 @@ private:
void OnClick(wxHeaderCtrlEvent& event)
{
if ( !SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK,
event.GetColumn()) )
const unsigned idx = event.GetColumn();
if ( SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, idx) )
return;
// default handling for the column click is to sort by this column or
// toggle its sort order
wxDataViewCtrl * const owner = GetOwner();
wxDataViewColumn * const col = owner->GetColumn(idx);
if ( !col->IsSortable() )
{
// no default handling for non-sortable columns
event.Skip();
return;
}
if ( col->IsSortKey() )
{
// already using this column for sorting, just change the order
col->ToggleSortOrder();
}
else // not using this column for sorting yet
{
// first unset the old sort column if any
int oldSortKey = owner->GetSortingColumnIndex();
if ( oldSortKey != wxNOT_FOUND )
{
owner->GetColumn(oldSortKey)->UnsetAsSortKey();
owner->OnColumnChange(oldSortKey);
}
owner->SetSortingColumnIndex(idx);
col->SetAsSortKey();
}
wxDataViewModel * const model = owner->GetModel();
if ( model )
model->Resort();
owner->OnColumnChange(idx);
}
void OnRClick(wxHeaderCtrlEvent& event)
@@ -3188,7 +3225,8 @@ void wxDataViewCtrl::Init()
m_notifier = NULL;
// No sorting column at start
m_sortingColumn = NULL;
m_sortingColumnIdx = wxNOT_FOUND;
m_headerArea = NULL;
}
@@ -3414,7 +3452,8 @@ int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
{
return NULL;
return m_sortingColumnIdx == wxNOT_FOUND ? NULL
: GetColumn(m_sortingColumnIdx);
}
//Selection code with wxDataViewItem as parameters