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

Commit third algorithm for sorting and preserving old positions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2009-03-11 14:33:00 +00:00
parent 8793514e03
commit 5b276ac1db
1 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/gtk/dataview.cpp
View File

@@ -2973,6 +2973,7 @@ bool wxDataViewColumn::IsReorderable() const
// wxGtkTreeModelNode // wxGtkTreeModelNode
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#if 0
class wxGtkTreeModelChildWithPos class wxGtkTreeModelChildWithPos
{ {
public: public:
@@ -2987,10 +2988,20 @@ int wxGtkTreeModelChildWithPosCmp( const void* data1, const void* data2, const v
const wxGtkTreeModelChildWithPos* child2 = (const wxGtkTreeModelChildWithPos*) data2; const wxGtkTreeModelChildWithPos* child2 = (const wxGtkTreeModelChildWithPos*) data2;
const wxDataViewCtrlInternal *internal = (const wxDataViewCtrlInternal *) user_data; const wxDataViewCtrlInternal *internal = (const wxDataViewCtrlInternal *) user_data;
int ret = internal->GetDataViewModel()->Compare( child1->id, child2->id, int ret = internal->GetDataViewModel()->Compare( child1->id, child2->id,
internal->GetSortColumn(), (internal->GetSortOrder() == GTK_SORT_ASCENDING) ); internal->GetSortColumn(), (internal->GetSortOrder() == GTK_SORT_DESCENDING) );
return ret; return ret;
} }
#else
static
int LINKAGEMODE wxGtkTreeModelChildPtrCmp( void*** data1, void*** data2 )
{
return gs_internal->GetDataViewModel()->Compare( **data1, **data2,
gs_internal->GetSortColumn(), (gs_internal->GetSortOrder() == GTK_SORT_ASCENDING) );
}
WX_DEFINE_ARRAY_PTR( void**, wxGtkTreeModelChildrenPtr );
#endif
void wxGtkTreeModelNode::Resort() void wxGtkTreeModelNode::Resort()
{ {
@@ -3010,7 +3021,36 @@ void wxGtkTreeModelNode::Resort()
return; return;
} }
gint *new_order = new gint[child_count];
#if 1 #if 1
// m_children has the original *void
// ptrs points to these
wxGtkTreeModelChildrenPtr ptrs;
size_t i;
for (i = 0; i < child_count; i++)
ptrs.Add( &(m_children[i]) );
// Sort the ptrs
gs_internal = m_internal;
ptrs.Sort( &wxGtkTreeModelChildPtrCmp );
wxGtkTreeModelChildren temp;
void** base_ptr = &(m_children[0]);
// Transfer positions to new_order array and
// IDs to temp
for (i = 0; i < child_count; i++)
{
new_order[i] = ptrs[i] - base_ptr;
temp.Add( *ptrs[i] );
}
// Transfer IDs back to m_children
m_children.Clear();
WX_APPEND_ARRAY( temp, m_children );
#endif
#if 0
// Too slow
// Build up array with IDs and original positions // Build up array with IDs and original positions
wxGtkTreeModelChildWithPos* temp = new wxGtkTreeModelChildWithPos[child_count]; wxGtkTreeModelChildWithPos* temp = new wxGtkTreeModelChildWithPos[child_count];
size_t i; size_t i;
@@ -3025,7 +3065,6 @@ void wxGtkTreeModelNode::Resort()
// Transfer positions to new_order array and // Transfer positions to new_order array and
// IDs to m_children // IDs to m_children
m_children.Clear(); m_children.Clear();
gint *new_order = new gint[child_count];
for (i = 0; i < child_count; i++) for (i = 0; i < child_count; i++)
{ {
new_order[i] = temp[i].pos; new_order[i] = temp[i].pos;
@@ -3033,15 +3072,17 @@ void wxGtkTreeModelNode::Resort()
} }
// Delete array // Delete array
delete [] temp; delete [] temp;
#else #endif
#if 0
// Too slow
wxGtkTreeModelChildren temp; wxGtkTreeModelChildren temp;
WX_APPEND_ARRAY( temp, m_children ); WX_APPEND_ARRAY( temp, m_children );
gs_internal = m_internal; gs_internal = m_internal;
m_children.Sort( &wxGtkTreeModelChildCmp ); m_children.Sort( &wxGtkTreeModelChildCmp );
gint *new_order = new gint[child_count];
unsigned int pos; unsigned int pos;
for (pos = 0; pos < child_count; pos++) for (pos = 0; pos < child_count; pos++)
{ {