X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b6280beb2561836b296b4b01493b053ed4bf69e..03859c918c4c1c740291ca6e90ee2d9d6166b11b:/src/gtk/dataview.cpp?ds=sidebyside diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 20eccb9d22..e9ad3b983d 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -26,6 +26,8 @@ #include "wx/calctrl.h" #include "wx/popupwin.h" #include "wx/icon.h" +#include "wx/list.h" +#include "wx/listimpl.cpp" #include "wx/gtk/private.h" @@ -39,97 +41,169 @@ #include //----------------------------------------------------------------------------- -// classes //----------------------------------------------------------------------------- +wxDataViewModel *g_model = NULL; + +class wxGtkTreeModelNode; + +extern "C" { +typedef struct _GtkWxTreeModel GtkWxTreeModel; +} + +//----------------------------------------------------------------------------- +// wxDataViewCtrlInternal +//----------------------------------------------------------------------------- + +WX_DECLARE_LIST(wxDataViewItem, ItemList); +WX_DEFINE_LIST(ItemList); + +class wxDataViewCtrlInternal +{ +public: + wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model, GtkWxTreeModel *owner ); + ~wxDataViewCtrlInternal(); + + gboolean get_iter( GtkTreeIter *iter, GtkTreePath *path ); + GtkTreePath *get_path( GtkTreeIter *iter); + GtkTreePath *get_path_safe( GtkTreeIter *iter); + gboolean iter_next( GtkTreeIter *iter ); + gboolean iter_children( GtkTreeIter *iter, GtkTreeIter *parent); + gboolean iter_has_child( GtkTreeIter *iter ); + gint iter_n_children( GtkTreeIter *iter ); + gboolean iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n ); + gboolean iter_parent( GtkTreeIter *iter, GtkTreeIter *child ); + + wxDataViewModel* GetDataViewModel() { return m_wx_model; } + wxDataViewCtrl* GetOwner() { return m_owner; } + GtkWxTreeModel* GetGtkModel() { return m_gtk_model; } + + bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ); + bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ); + bool ItemChanged( const wxDataViewItem &item ); + bool ValueChanged( const wxDataViewItem &item, unsigned int col ); + bool Cleared(); + void Resort(); + +protected: + void InitTree(); + wxGtkTreeModelNode *FindNode( const wxDataViewItem &item ); + wxGtkTreeModelNode *FindNode( GtkTreeIter *iter ); + wxGtkTreeModelNode *FindParentNode( const wxDataViewItem &item ); + wxGtkTreeModelNode *FindParentNode( GtkTreeIter *iter ); + void BuildBranch( wxGtkTreeModelNode *branch ); + +private: + wxGtkTreeModelNode *m_root; + wxDataViewModel *m_wx_model; + GtkWxTreeModel *m_gtk_model; + wxDataViewCtrl *m_owner; +}; + + //----------------------------------------------------------------------------- // wxGtkTreeModelNode //----------------------------------------------------------------------------- -class wxGtkTreeModelNode; +int LINKAGEMODE wxGtkTreeModelNodeCmp( void *id1, void *id2 ); + WX_DEFINE_ARRAY_PTR( wxGtkTreeModelNode*, wxGtkTreeModelNodes ); +WX_DEFINE_SORTED_ARRAY( void* , wxGtkTreeModelChildren ); class wxGtkTreeModelNode { public: - wxGtkTreeModelNode( wxGtkTreeModelNode* parent ) + wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item, + wxDataViewCtrlInternal *internal ) { m_parent = parent; + m_item = item; + m_internal = internal; + g_model = internal->GetDataViewModel(); + m_children = new wxGtkTreeModelChildren( wxGtkTreeModelNodeCmp ); } ~wxGtkTreeModelNode() { - size_t count = m_children.GetCount(); + g_model = m_internal->GetDataViewModel(); + size_t count = m_children->GetCount(); size_t i; for (i = 0; i < count; i++) { - wxGtkTreeModelNode *child = m_children[i]; + wxGtkTreeModelNode *child = m_nodes.Item( i ); delete child; } + delete m_children; } + unsigned int AddNode( wxGtkTreeModelNode* child ) + { + g_model = m_internal->GetDataViewModel(); + m_nodes.Add( child ); + return m_children->Add( child->GetItem().GetID() ); + } + + unsigned int AddLeave( void* id ) + { + g_model = m_internal->GetDataViewModel(); + return m_children->Add( id ); + } + + void DeleteChild( void* id ) + { + g_model = m_internal->GetDataViewModel(); + size_t pos; + size_t count = m_children->GetCount(); + for (pos = 0; pos < count; pos++) + { + if (m_children->Item( pos ) == id) + { + m_children->RemoveAt( pos ); + break; + } + } + count = m_nodes.GetCount(); + for (pos = 0; pos < count; pos++) + { + wxGtkTreeModelNode *node = m_nodes.Item( pos ); + if (node->GetItem().GetID() == id) + { + m_nodes.RemoveAt( pos ); + delete node; + break; + } + } + + } + wxGtkTreeModelNode* GetParent() { return m_parent; } - wxGtkTreeModelNodes &GetChildren() - { return m_children; } - wxGtkTreeModelNode* GetNthChild( unsigned int n ) - { return m_children.Item( n ); } - void Insert( wxGtkTreeModelNode* child, unsigned int n) - { m_children.Insert( child, n); } - void Append( wxGtkTreeModelNode* child ) - { m_children.Add( child ); } - - unsigned int GetChildCount() { return m_children.GetCount(); } + wxGtkTreeModelNodes &GetNodes() + { return m_nodes; } + wxGtkTreeModelChildren &GetChildren() + { return *m_children; } + + unsigned int GetChildCount() { return m_children->GetCount(); } + unsigned int GetNodesCount() { return m_nodes.GetCount(); } wxDataViewItem &GetItem() { return m_item; } - void SetItem( wxDataViewItem& item ) { m_item = item; } - - bool HasChildren() { return m_hasChildren; } - void SetHasChildren( bool has ) { m_hasChildren = has; } + wxDataViewCtrlInternal *GetInternal() { return m_internal; } + + void Resort(); private: - wxGtkTreeModelNode *m_parent; - wxGtkTreeModelNodes m_children; - wxDataViewItem m_item; - bool m_hasChildren; + wxGtkTreeModelNode *m_parent; + wxGtkTreeModelNodes m_nodes; + wxGtkTreeModelChildren *m_children; + wxDataViewItem m_item; + wxDataViewCtrlInternal *m_internal; }; -extern "C" { -typedef struct _GtkWxTreeModel GtkWxTreeModel; -} - -class wxGtkTreeModel +int LINKAGEMODE wxGtkTreeModelNodeCmp( void* id1, void* id2 ) { -public: - wxGtkTreeModel( wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model ) - { - m_wx_model = wx_model; - m_gtk_model = gtk_model; - m_root = NULL; - InitTree(); - } - - ~wxGtkTreeModel(); - - gboolean get_iter( GtkTreeIter *iter, GtkTreePath *path ); - GtkTreePath *get_path( GtkTreeIter *iter); - gboolean iter_next( GtkTreeIter *iter ); - gboolean iter_children( GtkTreeIter *iter, GtkTreeIter *parent); - gboolean iter_has_child( GtkTreeIter *iter ); - gint iter_n_children( GtkTreeIter *iter ); - gboolean iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n ); - gboolean iter_parent( GtkTreeIter *iter, GtkTreeIter *child ); - -protected: - void InitTree(); - wxGtkTreeModelNode *FindNode( GtkTreeIter *iter ); - -private: - wxGtkTreeModelNode *m_root; - wxDataViewModel *m_wx_model; - GtkWxTreeModel *m_gtk_model; -}; + return g_model->Compare( id1, id2 ); +} //----------------------------------------------------------------------------- // data @@ -160,12 +234,7 @@ struct _GtkWxTreeModel /*< private >*/ gint stamp; - wxDataViewModel *model; - - gint sort_column_id; - GtkSortType order; - GtkTreeIterCompareFunc default_sort_func; - GtkTreeIterCompareFunc sort_func; + wxDataViewCtrlInternal *internal; }; struct _GtkWxTreeModelClass @@ -188,6 +257,8 @@ static gboolean wxgtk_tree_model_get_iter (GtkTreeModel *tree_mo GtkTreePath *path); static GtkTreePath *wxgtk_tree_model_get_path (GtkTreeModel *tree_model, GtkTreeIter *iter); +static GtkTreePath *wxgtk_tree_model_get_path_safe (GtkTreeModel *tree_model, + GtkTreeIter *iter); static void wxgtk_tree_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, gint column, @@ -324,22 +395,13 @@ wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface) static void wxgtk_tree_model_init (GtkWxTreeModel *tree_model) { - tree_model->model = NULL; + tree_model->internal = NULL; tree_model->stamp = g_random_int(); - tree_model->sort_column_id = -2; - tree_model->order = GTK_SORT_ASCENDING; - tree_model->sort_func = NULL; - tree_model->default_sort_func = NULL; } static void wxgtk_tree_model_finalize (GObject *object) { - /* GtkWxTreeModel *tree_model = GTK_WX_LIST_STORE (object); */ - - /* we need to sort out, which class deletes what */ - /* delete tree_model->model; */ - /* must chain up */ (* list_parent_class->finalize) (object); } @@ -365,7 +427,7 @@ wxgtk_tree_model_get_n_columns (GtkTreeModel *tree_model) GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), 0); - return wxtree_model->model->GetColumnCount(); + return wxtree_model->internal->GetDataViewModel()->GetColumnCount(); } static GType @@ -377,7 +439,7 @@ wxgtk_tree_model_get_column_type (GtkTreeModel *tree_model, GType gtype = G_TYPE_INVALID; - wxString wxtype = wxtree_model->model->GetColumnType( (unsigned int) index ); + wxString wxtype = wxtree_model->internal->GetDataViewModel()->GetColumnType( (unsigned int) index ); if (wxtype == wxT("string")) gtype = G_TYPE_STRING; @@ -398,26 +460,7 @@ wxgtk_tree_model_get_iter (GtkTreeModel *tree_model, g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE); - wxDataViewModel *model = wxtree_model->model; - - int depth = gtk_tree_path_get_depth( path ); - - wxDataViewItem item; - - int i; - for (i = 0; i < depth; i++) - { - gint pos = gtk_tree_path_get_indices (path)[i]; - item = model->GetNthChild( item, (unsigned int) pos ); - - if (!item.IsOk()) - return FALSE; - } - - iter->stamp = wxtree_model->stamp; - iter->user_data = (gpointer) item.GetID(); - - return TRUE; + return wxtree_model->internal->get_iter( iter, path ); } static GtkTreePath * @@ -428,37 +471,18 @@ wxgtk_tree_model_get_path (GtkTreeModel *tree_model, g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), NULL); g_return_val_if_fail (iter->stamp == GTK_WX_TREE_MODEL (wxtree_model)->stamp, NULL); - GtkTreePath *retval = gtk_tree_path_new (); - wxDataViewItem item( (wxUint32) iter->user_data ); - - wxDataViewModel *model = wxtree_model->model; - - while (item.IsOk()) - { - int n = 0; - wxDataViewItem parent = model->GetParent( item ); - - if (!parent.IsOk()) - wxPrintf( wxT("wrong parent\n") ); - - wxDataViewItem node = model->GetFirstChild( parent ); - - while (node.GetID() != item.GetID()) - { - node = model->GetNextSibling( node ); - - if (!node.IsOk()) - wxPrintf( wxT("wrong node\n") ); - - n++; - } - - gtk_tree_path_prepend_index( retval, n ); + return wxtree_model->internal->get_path( iter ); +} - item = model->GetParent( item ); - } +static GtkTreePath * +wxgtk_tree_model_get_path_safe (GtkTreeModel *tree_model, + GtkTreeIter *iter) +{ + GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), NULL); + g_return_val_if_fail (iter->stamp == GTK_WX_TREE_MODEL (wxtree_model)->stamp, NULL); - return retval; + return wxtree_model->internal->get_path_safe( iter ); } static void @@ -470,13 +494,13 @@ wxgtk_tree_model_get_value (GtkTreeModel *tree_model, GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; g_return_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model) ); - wxDataViewModel *model = wxtree_model->model; + wxDataViewModel *model = wxtree_model->internal->GetDataViewModel(); wxString mtype = model->GetColumnType( (unsigned int) column ); if (mtype == wxT("string")) { wxVariant variant; g_value_init( value, G_TYPE_STRING ); - wxDataViewItem item( (wxUint32) iter->user_data ); + wxDataViewItem item( (void*) iter->user_data ); model->GetValue( variant, item, (unsigned int) column ); g_value_set_string( value, variant.GetString().utf8_str() ); @@ -493,19 +517,9 @@ wxgtk_tree_model_iter_next (GtkTreeModel *tree_model, { GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE); - wxDataViewModel *model = wxtree_model->model; - - wxDataViewItem item( (wxUint32) iter->user_data ); - item = model->GetNextSibling( item ); - if (!item.IsOk()) - return FALSE; - - iter->user_data = (gpointer) item.GetID(); - - return TRUE; + return wxtree_model->internal->iter_next( iter ); } static gboolean @@ -515,20 +529,9 @@ wxgtk_tree_model_iter_children (GtkTreeModel *tree_model, { GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - g_return_val_if_fail (wxtree_model->stamp == parent->stamp, FALSE); - - wxDataViewModel *model = wxtree_model->model; - - wxDataViewItem item( (wxUint32) parent->user_data ); - item = model->GetFirstChild( item ); - if (!item.IsOk()) - return FALSE; - iter->stamp = wxtree_model->stamp; - iter->user_data = (gpointer) item.GetID(); - - return TRUE; + return wxtree_model->internal->iter_children( iter, parent ); } static gboolean @@ -537,14 +540,9 @@ wxgtk_tree_model_iter_has_child (GtkTreeModel *tree_model, { GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE); - - wxDataViewModel *model = wxtree_model->model; - - wxDataViewItem item( (wxUint32) iter->user_data ); - - return model->HasChildren( item ); + + return wxtree_model->internal->iter_has_child( iter ); } static gint @@ -553,14 +551,9 @@ wxgtk_tree_model_iter_n_children (GtkTreeModel *tree_model, { GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - g_return_val_if_fail (wxtree_model->stamp == iter->stamp, 0); - - wxDataViewModel *model = wxtree_model->model; - - wxDataViewItem item( (wxUint32) iter->user_data ); - - return model->GetChildCount( item ); + + return wxtree_model->internal->iter_n_children( iter ); } static gboolean @@ -572,34 +565,7 @@ wxgtk_tree_model_iter_nth_child (GtkTreeModel *tree_model, GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - wxDataViewModel *model = wxtree_model->model; - - if (!parent) - { - wxDataViewItem item; - item = model->GetNthChild( item, n ); - - if (!item.IsOk()) - return FALSE; - - iter->stamp = wxtree_model->stamp; - iter->user_data = (gpointer) item.GetID(); - } - else - { - g_return_val_if_fail (wxtree_model->stamp == parent->stamp, FALSE); - - wxDataViewItem item( (wxUint32) parent->user_data ); - item = model->GetNthChild( item, n ); - - if (!item.IsOk()) - return FALSE; - - iter->stamp = wxtree_model->stamp; - iter->user_data = (gpointer) item.GetID(); - } - - return TRUE; + return wxtree_model->internal->iter_nth_child( iter, parent, n ); } static gboolean @@ -609,21 +575,9 @@ wxgtk_tree_model_iter_parent (GtkTreeModel *tree_model, { GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - g_return_val_if_fail (wxtree_model->stamp == child->stamp, FALSE); - wxDataViewModel *model = wxtree_model->model; - - wxDataViewItem item( (wxUint32) child->user_data ); - item = model->GetParent( item ); - - if (!item.IsOk()) - return FALSE; - - iter->stamp = wxtree_model->stamp; - iter->user_data = (gpointer) item.GetID(); - - return TRUE; + return wxtree_model->internal->iter_parent( iter, child ); } /* sortable */ @@ -635,14 +589,17 @@ gboolean wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortabl g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE); - if (tree_model->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID) - return FALSE; - if (sort_column_id) - *sort_column_id = tree_model->sort_column_id; + *sort_column_id = tree_model->internal->GetDataViewModel()->GetSortingColumn(); if (order) - *order = tree_model->order; + { + bool ascending = tree_model->internal->GetDataViewModel()->GetSortOrderAscending(); + if (ascending) + *order = GTK_SORT_ASCENDING; + else + *order = GTK_SORT_DESCENDING; + } return TRUE; } @@ -652,25 +609,23 @@ void wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortabl GtkSortType order) { GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable; - g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) ); - if ((tree_model->sort_column_id == sort_column_id) && - (tree_model->order == order)) - return; - - if (sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID) - { - g_return_if_fail (tree_model->default_sort_func != NULL); - } - - tree_model->sort_column_id = sort_column_id; - tree_model->order = order; + bool ascending = TRUE; + if (order != GTK_SORT_ASCENDING) + ascending = FALSE; + if ((sort_column_id == (gint) 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); - - wxPrintf( "wxgtk_tree_model_set_column_id, sort_column_id = %d, order = %d\n", sort_column_id, (int)order ); - // sort + + tree_model->internal->GetDataViewModel()->Resort(); } void wxgtk_tree_model_set_sort_func (GtkTreeSortable *sortable, @@ -679,15 +634,8 @@ void wxgtk_tree_model_set_sort_func (GtkTreeSortable *sortabl gpointer data, GtkDestroyNotify destroy) { - GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable; - g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) ); g_return_if_fail (func != NULL); - - tree_model->sort_func = func; - - wxPrintf( "wxgtk_tree_model_set_sort_func, sort_column_id = %d\n", sort_column_id ); - // sort } void wxgtk_tree_model_set_default_sort_func (GtkTreeSortable *sortable, @@ -695,14 +643,9 @@ void wxgtk_tree_model_set_default_sort_func (GtkTreeSortable *sortabl gpointer data, GtkDestroyNotify destroy) { - GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable; - g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) ); - g_return_if_fail (func != NULL); - tree_model->default_sort_func = func; - wxPrintf( "wxgtk_tree_model_set_default_sort_func\n" ); } @@ -883,13 +826,13 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing( // wxRect renderrect( rect.x, rect.y, rect.width, rect.height ); wxRect renderrect( cell_area->x, cell_area->y, cell_area->width, cell_area->height ); - // wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel(); - GtkTreePath *treepath = gtk_tree_path_new_from_string( path ); - unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (treepath)[0]; + GtkTreeIter iter; + cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, treepath ); + wxDataViewItem item( (void*) iter.user_data ); gtk_tree_path_free( treepath ); - cell->StartEditing( model_row, renderrect ); + cell->StartEditing( item, renderrect ); return NULL; } @@ -1020,7 +963,8 @@ gtk_wx_cell_renderer_activate( wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel(); GtkTreePath *treepath = gtk_tree_path_new_from_string( path ); - unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (treepath)[0]; + // TODO + wxDataViewItem item; gtk_tree_path_free( treepath ); unsigned int model_col = cell->GetOwner()->GetModelColumn(); @@ -1030,7 +974,7 @@ gtk_wx_cell_renderer_activate( bool ret = false; // activated by - if (cell->Activate( renderrect, model, model_col, model_row )) + if (cell->Activate( renderrect, model, item, model_col )) ret = true; return ret; @@ -1044,16 +988,16 @@ gtk_wx_cell_renderer_activate( bool ret = false; if (button_event->button == 1) { - if (cell->LeftClick( pt, renderrect, model, model_col, model_row )) + if (cell->LeftClick( pt, renderrect, model, item, model_col )) ret = true; // TODO: query system double-click time if (button_event->time - wxrenderer->last_click < 400) - if (cell->Activate( renderrect, model, model_col, model_row )) + if (cell->Activate( renderrect, model, item, model_col )) ret = true; } if (button_event->button == 3) { - if (cell->RightClick( pt, renderrect, model, model_col, model_row )) + if (cell->RightClick( pt, renderrect, model, item, model_col )) ret = true; } @@ -1078,10 +1022,11 @@ public: ~wxGtkDataViewModelNotifier(); virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ); - virtual bool ItemDeleted( const wxDataViewItem &item ); + virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ); 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; @@ -1109,6 +1054,8 @@ wxGtkDataViewModelNotifier::~wxGtkDataViewModelNotifier() bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) { + m_owner->GtkGetInternal()->ItemAdded( parent, item ); + GtkTreeIter iter; iter.stamp = m_wxgtk_model->stamp; iter.user_data = (gpointer) item.GetID(); @@ -1122,21 +1069,28 @@ bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const return true; } -bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &item ) +bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) { GtkTreeIter iter; iter.stamp = m_wxgtk_model->stamp; iter.user_data = (gpointer) item.GetID(); - GtkTreePath *path = wxgtk_tree_model_get_path( + GtkTreePath *path = wxgtk_tree_model_get_path_safe( GTK_TREE_MODEL(m_wxgtk_model), &iter ); gtk_tree_model_row_deleted( GTK_TREE_MODEL(m_wxgtk_model), path ); gtk_tree_path_free (path); + m_owner->GtkGetInternal()->ItemDeleted( parent, item ); + return true; } +void wxGtkDataViewModelNotifier::Resort() +{ + m_owner->GtkGetInternal()->Resort(); +} + bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item ) { GtkTreeIter iter; @@ -1149,6 +1103,8 @@ bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item ) GTK_TREE_MODEL(m_wxgtk_model), path, &iter ); gtk_tree_path_free (path); + m_owner->GtkGetInternal()->ItemChanged( item ); + return true; } @@ -1182,14 +1138,22 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig // Redraw gtk_widget_queue_draw_area( GTK_WIDGET(widget), cell_area.x - xdiff, ydiff + cell_area.y, cell_area.width, cell_area.height ); + + m_owner->GtkGetInternal()->ValueChanged( item, model_col ); + + return true; } } - return true; + return false; } bool wxGtkDataViewModelNotifier::Cleared() { + // TODO: delete everything + + m_owner->GtkGetInternal()->Cleared(); + return false; } @@ -1345,13 +1309,15 @@ static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer, wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel(); GtkTreePath *path = gtk_tree_path_new_from_string( arg1 ); - unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (path)[0]; + GtkTreeIter iter; + cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, path ); + wxDataViewItem item( (void*) iter.user_data );; gtk_tree_path_free( path ); unsigned int model_col = cell->GetOwner()->GetModelColumn(); - model->SetValue( value, model_col, model_row ); - model->ValueChanged( model_col, model_row ); + model->SetValue( value, item, model_col ); + model->ValueChanged( item, model_col ); } IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer) @@ -1517,13 +1483,15 @@ static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer, wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel(); GtkTreePath *gtk_path = gtk_tree_path_new_from_string( path ); - unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (gtk_path)[0]; + GtkTreeIter iter; + cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, gtk_path ); + wxDataViewItem item( (void*) iter.user_data );; gtk_tree_path_free( gtk_path ); unsigned int model_col = cell->GetOwner()->GetModelColumn(); - model->SetValue( value, model_col, model_row ); - model->ValueChanged( model_col, model_row ); + model->SetValue( value, item, model_col ); + model->ValueChanged( item, model_col ); } IMPLEMENT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer) @@ -1897,10 +1865,10 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, wxDataViewRenderer *cell = (wxDataViewRenderer*) data; - wxDataViewItem item( (wxUint32) iter->user_data ); + wxDataViewItem item( (void*) iter->user_data ); wxVariant value; - tree_model->model->GetValue( value, item, cell->GetOwner()->GetModelColumn() ); + tree_model->internal->GetDataViewModel()->GetValue( value, item, cell->GetOwner()->GetModelColumn() ); if (value.GetType() != cell->GetVariantType()) wxLogError( wxT("Wrong type, required: %s but: %s"), @@ -2178,6 +2146,558 @@ void wxDataViewColumn::SetWidth( int width ) } +//----------------------------------------------------------------------------- +// wxGtkTreeModelNode +//----------------------------------------------------------------------------- + +void wxGtkTreeModelNode::Resort() +{ + g_model = m_internal->GetDataViewModel(); + + size_t child_count = GetChildCount(); + if (child_count == 0) + return; + + size_t node_count = GetNodesCount(); + + if (child_count == 1) + { + if (node_count == 1) + { + wxGtkTreeModelNode *node = m_nodes.Item( 0 ); + node->Resort(); + } + return; + } + + wxGtkTreeModelChildren *new_array = new wxGtkTreeModelChildren( wxGtkTreeModelNodeCmp ); + + size_t pos; + for (pos = 0; pos < child_count; pos++) + new_array->Add( m_children->Item( pos ) ); + + gint *new_order = new gint[child_count]; + + for (pos = 0; pos < child_count; pos++) + { + void *id = new_array->Item( pos ); + size_t old_pos; + for (old_pos = 0; old_pos < child_count; old_pos++) + { + if (id == 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() ); + + GtkTreePath *path = gtk_tree_path_new (); + wxGtkTreeModelNode *parent = GetParent(); + void *id = GetItem().GetID(); + + while (parent) + { + int pos = parent->GetChildren().Index( id ); + gtk_tree_path_prepend_index( path, pos ); + id = parent->GetItem().GetID(); + parent = parent->GetParent(); + } + + GtkTreeIter iter; + iter.user_data = id; + iter.stamp = m_internal->GetGtkModel()->stamp; + gtk_tree_model_rows_reordered( gtk_tree_model, path, &iter, new_order ); + + gtk_tree_path_free (path); + + delete [] new_order; + + for (pos = 0; pos < node_count; pos++) + { + wxGtkTreeModelNode *node = m_nodes.Item( pos ); + node->Resort(); + } +} + +//----------------------------------------------------------------------------- +// wxDataViewCtrlInternal +//----------------------------------------------------------------------------- + +wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, + wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model ) +{ + m_owner = owner; + m_wx_model = wx_model; + m_gtk_model = gtk_model; + m_root = NULL; + InitTree(); +} + +wxDataViewCtrlInternal::~wxDataViewCtrlInternal() +{ + g_object_unref( m_gtk_model ); +} + +void wxDataViewCtrlInternal::InitTree() +{ + wxDataViewItem item; + m_root = new wxGtkTreeModelNode( NULL, item, this ); + + BuildBranch( m_root ); +} + +void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node ) +{ + if (node->GetChildCount() == 0) + { + wxDataViewItem child = m_wx_model->GetFirstChild( node->GetItem() ); + while (child.IsOk()) + { + if (m_wx_model->IsContainer( child )) + node->AddNode( new wxGtkTreeModelNode( node, child, this ) ); + else + node->AddLeave( child.GetID() ); + + // Don't send any events here + + 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 ); + if (m_wx_model->IsContainer( item )) + parent_node->AddNode( new wxGtkTreeModelNode( parent_node, item, this ) ); + else + parent_node->AddLeave( item.GetID() ); + + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_ADDED, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetModel( m_owner->GetModel() ); + event.SetItem( item ); + m_owner->GetEventHandler()->ProcessEvent( event ); + + return true; +} + +bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) +{ + wxGtkTreeModelNode *parent_node = FindNode( parent ); + parent_node->DeleteChild( item.GetID() ); + + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_DELETED, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetModel( m_owner->GetModel() ); + event.SetItem( item ); + m_owner->GetEventHandler()->ProcessEvent( event ); + + return true; +} + +bool wxDataViewCtrlInternal::ItemChanged( const wxDataViewItem &item ) +{ + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_CHANGED, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetModel( m_owner->GetModel() ); + event.SetItem( item ); + m_owner->GetEventHandler()->ProcessEvent( event ); + + return true; +} + +bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned int col ) +{ + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetModel( m_owner->GetModel() ); + event.SetColumn( col ); + event.SetItem( item ); + m_owner->GetEventHandler()->ProcessEvent( event ); + + return true; +} + +bool wxDataViewCtrlInternal::Cleared() +{ + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetModel( m_owner->GetModel() ); + m_owner->GetEventHandler()->ProcessEvent( event ); + + return true; +} + +gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path ) +{ + g_model = m_wx_model; + + int depth = gtk_tree_path_get_depth( path ); + + wxGtkTreeModelNode *node = m_root; + + int i; + for (i = 0; i < depth; i++) + { + BuildBranch( node ); + + gint pos = gtk_tree_path_get_indices (path)[i]; + if (pos < 0) return FALSE; + if ((size_t)pos >= node->GetChildCount()) return FALSE; + + void* id = node->GetChildren().Item( (size_t) pos ); + + if (i == depth-1) + { + iter->stamp = m_gtk_model->stamp; + iter->user_data = id; + return TRUE; + } + + size_t count = node->GetNodes().GetCount(); + size_t pos2; + for (pos2 = 0; pos2 < count; pos2++) + { + wxGtkTreeModelNode *child_node = node->GetNodes().Item( pos2 ); + if (child_node->GetItem().GetID() == id) + { + node = child_node; + break; + } + } + } + + return FALSE; +} + +GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter ) +{ + g_model = m_wx_model; + + GtkTreePath *retval = gtk_tree_path_new (); + void *id = iter->user_data; + + wxGtkTreeModelNode *node = FindParentNode( iter ); + while (node) + { + int pos = node->GetChildren().Index( id ); + gtk_tree_path_prepend_index( retval, pos ); + + id = node->GetItem().GetID(); + node = node->GetParent(); + } + + return retval; +} + +GtkTreePath *wxDataViewCtrlInternal::get_path_safe( GtkTreeIter *iter ) +{ + g_model = m_wx_model; + + GtkTreePath *retval = gtk_tree_path_new (); + void *id = iter->user_data; + + wxGtkTreeModelNode *node = FindParentNode( iter ); + while (node) + { + size_t pos; + for (pos = 0; pos < node->GetChildren().GetCount(); pos++) + { + if (id == node->GetChildren().Item( pos )) + { + gtk_tree_path_prepend_index( retval, (int) pos ); + continue; + } + } + + id = node->GetItem().GetID(); + node = node->GetParent(); + } + + return retval; +} + +gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter ) +{ + g_model = m_wx_model; + + wxGtkTreeModelNode *parent = FindParentNode( iter ); + if( parent == NULL ) + return FALSE; + + unsigned int pos = parent->GetChildren().Index( iter->user_data ); + + if (pos == parent->GetChildCount()-1) + return FALSE; + + iter->stamp = m_gtk_model->stamp; + iter->user_data = parent->GetChildren().Item( pos+1 ); + + return TRUE; +} + +gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *parent ) +{ + g_model = m_wx_model; + + wxDataViewItem item( (void*) parent->user_data ); + + if (!m_wx_model->IsContainer( item )) + return FALSE; + + wxGtkTreeModelNode *parent_node = FindNode( parent ); + BuildBranch( parent_node ); + + if (parent_node->GetChildCount() == 0) + return FALSE; + + iter->stamp = m_gtk_model->stamp; + iter->user_data = (gpointer) parent_node->GetChildren().Item( 0 ); + + return TRUE; +} + +gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter ) +{ + g_model = m_wx_model; + + wxDataViewItem item( (void*) iter->user_data ); + bool is_container = m_wx_model->IsContainer( item ); + + if (!is_container) + return FALSE; + + wxGtkTreeModelNode *node = FindNode( iter ); + BuildBranch( node ); + + return (node->GetChildCount() > 0); +} + +gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter ) +{ + g_model = m_wx_model; + + wxDataViewItem item( (void*) iter->user_data ); + + if (!m_wx_model->IsContainer( item )) + return 0; + + wxGtkTreeModelNode *parent_node = FindNode( iter ); + BuildBranch( parent_node ); + + // wxPrintf( "iter_n_children %d\n", parent_node->GetChildCount() ); + + return parent_node->GetChildCount(); +} + +gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n ) +{ + g_model = m_wx_model; + + void* id = NULL; + if (parent) id = (void*) parent->user_data; + wxDataViewItem item( id ); + + if (!m_wx_model->IsContainer( item )) + return FALSE; + + wxGtkTreeModelNode *parent_node = FindNode( parent ); + BuildBranch( parent_node ); + + // wxPrintf( "iter_nth_child %d\n", n ); + + iter->stamp = m_gtk_model->stamp; + iter->user_data = parent_node->GetChildren().Item( n ); + + return TRUE; +} + +gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *child ) +{ + g_model = m_wx_model; + + wxGtkTreeModelNode *node = FindParentNode( child ); + if (!node) + return FALSE; + + iter->stamp = m_gtk_model->stamp; + iter->user_data = (gpointer) node->GetItem().GetID(); + + return TRUE; +} + +static wxGtkTreeModelNode* +wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item ) +{ + if( model == NULL ) + return NULL; + + ItemList list; + list.DeleteContents( true ); + wxDataViewItem it( item ); + while( it.IsOk() ) + { + wxDataViewItem * pItem = new wxDataViewItem( it ); + list.Insert( pItem ); + it = model->GetParent( it ); + } + + wxGtkTreeModelNode * node = treeNode; + for( ItemList::compatibility_iterator n = list.GetFirst(); n; n = n->GetNext() ) + { + if( node && node->GetNodes().GetCount() != 0 ) + { + int len = node->GetNodes().GetCount(); + wxGtkTreeModelNodes nodes = node->GetNodes(); + int j = 0; + for( ; j < len; j ++) + { + if( nodes[j]->GetItem() == *(n->GetData())) + { + node = nodes[j]; + break; + } + } + + if( j == len ) + { + return NULL; + } + } + else + return NULL; + } + return node; + +} + +wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( GtkTreeIter *iter ) +{ + if (!iter) + return m_root; + + wxDataViewItem item( (void*) iter->user_data ); + if (!item.IsOk()) + return m_root; + + wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item ); + + if (!result) + { + wxPrintf( "Not found %d\n", (int) iter->user_data ); + char *crash = NULL; + *crash = 0; + } + + return result; +} + +wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( const wxDataViewItem &item ) +{ + if (!item.IsOk()) + return m_root; + + wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item ); + + if (!result) + { + wxPrintf( "Not found %d\n", (int) item.GetID() ); + char *crash = NULL; + *crash = 0; + } + + return result; +} + +static wxGtkTreeModelNode* +wxDataViewCtrlInternal_FindParentNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item ) +{ + if( model == NULL ) + return NULL; + + ItemList list; + list.DeleteContents( true ); + if( !item.IsOk() ) + return NULL; + + wxDataViewItem it( model->GetParent( item ) ); + while( it.IsOk() ) + { + wxDataViewItem * pItem = new wxDataViewItem( it ); + list.Insert( pItem ); + it = model->GetParent( it ); + } + + wxGtkTreeModelNode * node = treeNode; + for( ItemList::compatibility_iterator n = list.GetFirst(); n; n = n->GetNext() ) + { + if( node && node->GetNodes().GetCount() != 0 ) + { + int len = node->GetNodes().GetCount(); + wxGtkTreeModelNodes nodes = node->GetNodes(); + int j = 0; + for( ; j < len; j ++) + { + if( nodes[j]->GetItem() == *(n->GetData())) + { + node = nodes[j]; + break; + } + } + + if( j == len ) + { + return NULL; + } + } + else + return NULL; + } + //Examine whether the node is item's parent node + int len = node->GetChildCount(); + for( int i = 0; i < len ; i ++ ) + { + if( node->GetChildren().Item( i ) == item.GetID() ) + return node; + } + return NULL; +} + +wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( GtkTreeIter *iter ) +{ + if (!iter) + return NULL; + + wxDataViewItem item( (void*) iter->user_data ); + if (!item.IsOk()) + return NULL; + + return wxDataViewCtrlInternal_FindParentNode( m_wx_model, m_root, item ); +} + +wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( const wxDataViewItem &item ) +{ + if (!item.IsOk()) + return NULL; + + return wxDataViewCtrlInternal_FindParentNode( m_wx_model, m_root, item ); +} + //----------------------------------------------------------------------------- // wxDataViewCtrl signal callbacks //----------------------------------------------------------------------------- @@ -2199,7 +2719,11 @@ wxdataview_row_activated_callback( GtkTreeView* treeview, GtkTreePath *path, GtkTreeViewColumn *column, wxDataViewCtrl *dv ) { wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, dv->GetId() ); - // TODO: item + + GtkTreeIter iter; + dv->GtkGetInternal()->get_iter( &iter, path ); + wxDataViewItem item( (void*) iter.user_data );; + event.SetItem( item ); event.SetModel( dv->GetModel() ); dv->GetEventHandler()->ProcessEvent( event ); } @@ -2229,8 +2753,7 @@ void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation *alloc, wxDataViewCtrl *win ) { - - wxWindowList::Node *node = win->GetChildren().GetFirst(); + wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst(); while (node) { wxWindow *child = node->GetData(); @@ -2261,6 +2784,8 @@ wxDataViewCtrl::~wxDataViewCtrl() // remove the model from the GtkTreeView before it gets destroyed by the // wxDataViewCtrlBase's dtor gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), NULL ); + + delete m_internal; } void wxDataViewCtrl::Init() @@ -2361,15 +2886,18 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) if (!wxDataViewCtrlBase::AssociateModel( model )) return false; - GtkWxTreeModel *gtk_store = wxgtk_tree_model_new(); - gtk_store->model = model; + GtkWxTreeModel *gtk_model = wxgtk_tree_model_new(); + m_internal = new wxDataViewCtrlInternal( this, model, gtk_model ); + gtk_model->internal = m_internal; - m_notifier = new wxGtkDataViewModelNotifier( gtk_store, model, this ); + m_notifier = new wxGtkDataViewModelNotifier( gtk_model, model, this ); model->AddNotifier( m_notifier ); - gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_store) ); - g_object_unref( gtk_store ); + gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_model) ); + + // unref in wxDataViewCtrlInternal + // g_object_unref( gtk_model ); return true; } @@ -2386,6 +2914,26 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) return true; } +wxDataViewItem wxDataViewCtrl::GetSelection() +{ + GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); + + if (m_windowStyle & wxDV_MULTIPLE) + { + } + else + { + GtkTreeIter iter; + if (gtk_tree_selection_get_selected( selection, NULL, &iter )) + { + wxDataViewItem item( (void*) iter.user_data ); + return item; + } + } + + return wxDataViewItem(0); +} + void wxDataViewCtrl::DoSetExpanderColumn() { }