class wxGtkTreeModelNode;
+extern "C" {
+typedef struct _GtkWxTreeModel GtkWxTreeModel;
+}
+
int LINKAGEMODE wxGtkTreeModelNodeCmp( wxGtkTreeModelNode* node1, wxGtkTreeModelNode* node2 );
WX_DEFINE_SORTED_ARRAY( wxGtkTreeModelNode*, wxGtkTreeModelNodes );
{
public:
wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item,
- wxDataViewModel *model ) :
- m_children( wxGtkTreeModelNodeCmp )
+ wxDataViewCtrlInternal *internal )
{
m_parent = parent;
m_item = item;
- m_model = model;
+ m_internal = internal;
+ m_children = new wxGtkTreeModelNodes( wxGtkTreeModelNodeCmp );
}
~wxGtkTreeModelNode()
{
- size_t count = m_children.GetCount();
+ size_t count = m_children->GetCount();
size_t i;
for (i = 0; i < count; i++)
{
- wxGtkTreeModelNode *child = m_children[i];
+ wxGtkTreeModelNode *child = m_children->Item( i );
delete child;
}
+ delete m_children;
}
wxGtkTreeModelNode* GetParent()
{ return m_parent; }
wxGtkTreeModelNodes &GetChildren()
- { return m_children; }
+ { return *m_children; }
wxGtkTreeModelNode* GetNthChild( unsigned int n )
- { return m_children.Item( n ); }
+ { return m_children->Item( n ); }
unsigned int Add( wxGtkTreeModelNode* child )
- { return m_children.Add( child ); }
-
- unsigned int GetChildCount() { return m_children.GetCount(); }
+ { return m_children->Add( child ); }
+
+ unsigned int GetChildCount() { return m_children->GetCount(); }
wxDataViewItem &GetItem() { return m_item; }
- wxDataViewModel *GetModel() { return m_model; }
+ wxDataViewCtrlInternal *GetInternal() { return m_internal; }
bool HasChildren() { return m_hasChildren; }
void SetHasChildren( bool has ) { m_hasChildren = has; }
+ void Resort();
+
private:
- wxGtkTreeModelNode *m_parent;
- wxGtkTreeModelNodes m_children;
- wxDataViewItem m_item;
- bool m_hasChildren;
- wxDataViewModel *m_model;
+ wxGtkTreeModelNode *m_parent;
+ wxGtkTreeModelNodes *m_children;
+ wxDataViewItem m_item;
+ bool m_hasChildren;
+ wxDataViewCtrlInternal *m_internal;
};
-int LINKAGEMODE wxGtkTreeModelNodeCmp( wxGtkTreeModelNode* node1, wxGtkTreeModelNode* node2 )
-{
- return node1->GetModel()->Compare( node1->GetItem(), node2->GetItem() );
-}
-
-extern "C" {
-typedef struct _GtkWxTreeModel GtkWxTreeModel;
-}
class wxDataViewCtrlInternal
{
gboolean iter_parent( GtkTreeIter *iter, GtkTreeIter *child );
wxDataViewModel* GetDataViewModel() { return m_wx_model; }
- GtkWxTreeModel* GetOwner() { return m_gtk_model; }
+ wxDataViewCtrl* GetOwner() { return m_owner; }
+ GtkWxTreeModel* GetGtkModel() { return m_gtk_model; }
bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
bool ItemDeleted( const wxDataViewItem &item );
+ void Resort();
+
protected:
void InitTree();
wxGtkTreeModelNode *FindNode( const wxDataViewItem &item );
wxDataViewCtrl *m_owner;
};
+
+int LINKAGEMODE wxGtkTreeModelNodeCmp( wxGtkTreeModelNode* node1, wxGtkTreeModelNode* node2 )
+{
+ return node1->GetInternal()->GetDataViewModel()->Compare( node1->GetItem(), node2->GetItem() );
+}
+
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable;
g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
- // TODO check for equality
-
- return;
-
- gtk_tree_sortable_sort_column_changed (sortable);
-
- tree_model->internal->GetDataViewModel()->SetSortingColumn( sort_column_id );
-
bool ascending = TRUE;
if (order != GTK_SORT_ASCENDING)
ascending = FALSE;
+
+ if ((sort_column_id == tree_model->internal->GetDataViewModel()->GetSortingColumn()) &&
+ (ascending == tree_model->internal->GetDataViewModel()->GetSortOrderAscending()))
+ return;
+
+ tree_model->internal->GetDataViewModel()->SetSortingColumn( sort_column_id );
+
tree_model->internal->GetDataViewModel()->SetSortOrderAscending( ascending );
+ gtk_tree_sortable_sort_column_changed (sortable);
+
tree_model->internal->GetDataViewModel()->Resort();
}
virtual bool ItemChanged( const wxDataViewItem &item );
virtual bool ValueChanged( const wxDataViewItem &item, unsigned int col );
virtual bool Cleared();
+ virtual void Resort();
GtkWxTreeModel *m_wxgtk_model;
wxDataViewModel *m_wx_model;
return true;
}
+void wxGtkDataViewModelNotifier::Resort()
+{
+ m_owner->GtkGetInternal()->Resort();
+}
+
bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item )
{
GtkTreeIter iter;
}
+//-----------------------------------------------------------------------------
+// wxGtkTreeModelNode
+//-----------------------------------------------------------------------------
+
+void wxGtkTreeModelNode::Resort()
+{
+ size_t count = m_children->GetCount();
+ if (count == 0)
+ return;
+
+ if (count == 1)
+ {
+ wxGtkTreeModelNode *node = m_children->Item( 0 );
+ node->Resort();
+ return;
+ }
+
+ wxGtkTreeModelNodes *new_array = new wxGtkTreeModelNodes( wxGtkTreeModelNodeCmp );
+
+ size_t pos;
+
+ for (pos = 0; pos < count; pos++)
+ new_array->Add( m_children->Item( pos ) );
+
+
+ gint *new_order = new gint[count];
+
+ for (pos = 0; pos < count; pos++)
+ {
+ wxGtkTreeModelNode *node = new_array->Item( pos );
+ size_t old_pos;
+ for (old_pos = 0; old_pos < count; old_pos++)
+ {
+ if (node == m_children->Item(old_pos))
+ {
+ new_order[pos] = old_pos;
+ break;
+ }
+ }
+ }
+
+// for (pos = 0; pos < count; pos++)
+// m_children->Clear();
+ delete m_children;
+
+ m_children = new_array;
+
+ GtkTreeModel *gtk_tree_model = GTK_TREE_MODEL( m_internal->GetGtkModel() );
+
+ GtkTreeIter iter;
+ iter.user_data = (gpointer) GetItem().GetID();
+ iter.stamp = m_internal->GetGtkModel()->stamp;
+ GtkTreePath *path = wxgtk_tree_model_get_path( gtk_tree_model, &iter );
+
+ gtk_tree_model_rows_reordered( gtk_tree_model, path, &iter, new_order );
+
+ gtk_tree_path_free (path);
+
+ delete [] new_order;
+
+ for (pos = 0; pos < count; pos++)
+ {
+ wxGtkTreeModelNode *node = m_children->Item( pos );
+ node->Resort();
+ }
+}
+
//-----------------------------------------------------------------------------
// wxDataViewCtrlInternal
//-----------------------------------------------------------------------------
void wxDataViewCtrlInternal::InitTree()
{
wxDataViewItem item;
- m_root = new wxGtkTreeModelNode( NULL, item, m_wx_model );
+ m_root = new wxGtkTreeModelNode( NULL, item, this );
BuildBranch( m_root );
}
wxDataViewItem child = m_wx_model->GetFirstChild( node->GetItem() );
while (child.IsOk())
{
- node->Add( new wxGtkTreeModelNode( node, child, node->GetModel() ) );
+ node->Add( new wxGtkTreeModelNode( node, child, this ) );
child = m_wx_model->GetNextSibling( child );
}
}
}
+void wxDataViewCtrlInternal::Resort()
+{
+ m_root->Resort();
+}
+
bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
{
wxGtkTreeModelNode *parent_node = FindNode( parent );
- parent_node->Add( new wxGtkTreeModelNode( parent_node, item, parent_node->GetModel() ) );
+ parent_node->Add( new wxGtkTreeModelNode( parent_node, item, this ) );
return true;
}
return m_root;
wxDataViewItem item( (void*) iter->user_data );
+ if (!item.IsOk())
+ return m_root;
wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_root, item );
wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( const wxDataViewItem &item )
{
+ if (!item.IsOk())
+ return m_root;
+
wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_root, item );
if (!result)
projects / wxWidgets.git / blobdiff