X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94b1f7bcd382ade6549b070a9fa342afd495a061..e93523680ba3c83cdae75b511214c82f28a2d853:/src/gtk/dataview.cpp diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 7ab2a3eeda..d0de7177ec 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -42,7 +42,95 @@ // classes //----------------------------------------------------------------------------- -class wxDataViewCtrl; +//----------------------------------------------------------------------------- +// wxGtkTreeModelNode +//----------------------------------------------------------------------------- + +class wxGtkTreeModelNode; +WX_DEFINE_ARRAY_PTR( wxGtkTreeModelNode*, wxGtkTreeModelNodes ); + +class wxGtkTreeModelNode +{ +public: + wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item ) + { + m_parent = parent; + m_item = item; + } + + ~wxGtkTreeModelNode() + { + size_t count = m_children.GetCount(); + size_t i; + for (i = 0; i < count; i++) + { + wxGtkTreeModelNode *child = m_children[i]; + delete child; + } + } + + 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(); } + + wxDataViewItem &GetItem() { return m_item; } + + bool HasChildren() { return m_hasChildren; } + void SetHasChildren( bool has ) { m_hasChildren = has; } + +private: + wxGtkTreeModelNode *m_parent; + wxGtkTreeModelNodes m_children; + wxDataViewItem m_item; + bool m_hasChildren; +}; + + +extern "C" { +typedef struct _GtkWxTreeModel GtkWxTreeModel; +} + +class wxGtkTreeModel +{ +public: + wxGtkTreeModel( wxDataViewModel *wx_model, GtkWxTreeModel *owner ); + ~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 ); + + wxDataViewModel* GetDataViewModel() { return m_wx_model; } + GtkWxTreeModel* GetOwner() { return m_owner; } + + bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ); + bool ItemDeleted( const wxDataViewItem &item ); + +protected: + void InitTree(); + wxGtkTreeModelNode *FindNode( const wxDataViewItem &item ); + wxGtkTreeModelNode *FindNode( GtkTreeIter *iter ); + void BuildBranch( wxGtkTreeModelNode *branch ); + +private: + wxGtkTreeModelNode *m_root; + wxDataViewModel *m_wx_model; + GtkWxTreeModel *m_owner; +}; //----------------------------------------------------------------------------- // data @@ -65,7 +153,6 @@ extern "C" { GType gtk_wx_tree_model_get_type (void); -typedef struct _GtkWxTreeModel GtkWxTreeModel; typedef struct _GtkWxTreeModelClass GtkWxTreeModelClass; struct _GtkWxTreeModel @@ -74,12 +161,10 @@ struct _GtkWxTreeModel /*< private >*/ gint stamp; - wxDataViewModel *model; + wxGtkTreeModel *model; gint sort_column_id; GtkSortType order; - GtkTreeIterCompareFunc default_sort_func; - GtkTreeIterCompareFunc sort_func; }; struct _GtkWxTreeModelClass @@ -242,17 +327,15 @@ wxgtk_tree_model_init (GtkWxTreeModel *tree_model) 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); */ + GtkWxTreeModel *tree_model = GTK_WX_TREE_MODEL(object); /* we need to sort out, which class deletes what */ - /* delete tree_model->model; */ + delete tree_model->model; /* must chain up */ (* list_parent_class->finalize) (object); @@ -279,7 +362,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->model->GetDataViewModel()->GetColumnCount(); } static GType @@ -291,7 +374,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->model->GetDataViewModel()->GetColumnType( (unsigned int) index ); if (wxtype == wxT("string")) gtype = G_TYPE_STRING; @@ -312,26 +395,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->model->get_iter( iter, path ); } static GtkTreePath * @@ -342,37 +406,7 @@ 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 ); - - item = model->GetParent( item ); - } - - return retval; + return wxtree_model->model->get_path( iter ); } static void @@ -384,13 +418,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->model->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() ); @@ -407,19 +441,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->model->iter_next( iter ); } static gboolean @@ -429,20 +453,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->model->iter_children( iter, parent ); } static gboolean @@ -451,14 +464,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->model->iter_has_child( iter ); } static gint @@ -467,14 +475,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->model->iter_n_children( iter ); } static gboolean @@ -486,34 +489,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->model->iter_nth_child( iter, parent, n ); } static gboolean @@ -523,21 +499,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->model->iter_parent( iter, child ); } /* sortable */ @@ -573,11 +537,6 @@ void wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortabl (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; @@ -593,13 +552,9 @@ 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 } @@ -609,14 +564,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" ); } @@ -625,6 +575,245 @@ gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable *sortabl return FALSE; } + +//----------------------------------------------------------------------------- +// wxGtkTreeModel +//----------------------------------------------------------------------------- + +wxGtkTreeModel::wxGtkTreeModel( wxDataViewModel *wx_model, GtkWxTreeModel *owner ) +{ + m_wx_model = wx_model; + m_owner = owner; + m_root = NULL; + InitTree(); +} + +wxGtkTreeModel::~wxGtkTreeModel() +{ +} + +void wxGtkTreeModel::BuildBranch( wxGtkTreeModelNode *node ) +{ + if (node->GetChildCount() == 0) + { + wxDataViewItem child = m_wx_model->GetFirstChild( node->GetItem() ); + while (child.IsOk()) + { + // wxPrintf( "AddItem %d\n", (int) child.GetID() ); + node->Append( new wxGtkTreeModelNode( node, child ) ); + child = m_wx_model->GetNextSibling( child ); + } + } +} + +bool wxGtkTreeModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) +{ + wxGtkTreeModelNode *parent_node = FindNode( parent ); + parent_node->Append( new wxGtkTreeModelNode( parent_node, item ) ); + return true; +} + +bool wxGtkTreeModel::ItemDeleted( const wxDataViewItem &item ) +{ + wxGtkTreeModelNode *node = FindNode( item ); + wxGtkTreeModelNode *parent = node->GetParent(); + parent->GetChildren().Remove( node ); + delete node; + + return true; +} + +gboolean wxGtkTreeModel::get_iter( GtkTreeIter *iter, GtkTreePath *path ) +{ + 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; + + node = node->GetChildren().Item( (size_t) pos ); + } + + iter->stamp = m_owner->stamp; + iter->user_data = (gpointer) node->GetItem().GetID(); + + return TRUE; +} + +GtkTreePath *wxGtkTreeModel::get_path( GtkTreeIter *iter ) +{ + GtkTreePath *retval = gtk_tree_path_new (); + + wxGtkTreeModelNode *node = FindNode( iter ); + while (node->GetParent()) + { + wxGtkTreeModelNode *parent = node->GetParent(); + int pos = parent->GetChildren().Index( node ); + + gtk_tree_path_prepend_index( retval, pos ); + + node = parent; + } + + return retval; +} + +gboolean wxGtkTreeModel::iter_next( GtkTreeIter *iter ) +{ + wxDataViewItem item( (void*) iter->user_data ); + item = m_wx_model->GetNextSibling( item ); + if (!item.IsOk()) + return FALSE; + + iter->user_data = (gpointer) item.GetID(); + + return TRUE; +} + +gboolean wxGtkTreeModel::iter_children( GtkTreeIter *iter, GtkTreeIter *parent ) +{ + wxDataViewItem item( (void*) parent->user_data ); + + if (!m_wx_model->HasChildren( item )) + return FALSE; + + wxGtkTreeModelNode *parent_node = FindNode( parent ); + BuildBranch( parent_node ); + + wxGtkTreeModelNode *first_child_node = parent_node->GetChildren().Item( 0 ); + + iter->stamp = m_owner->stamp; + iter->user_data = (gpointer) first_child_node->GetItem().GetID(); + + return TRUE; +} + +gboolean wxGtkTreeModel::iter_has_child( GtkTreeIter *iter ) +{ + wxDataViewItem item( (void*) iter->user_data ); + + return m_wx_model->HasChildren( item ); +} + +gint wxGtkTreeModel::iter_n_children( GtkTreeIter *iter ) +{ + wxDataViewItem item( (void*) iter->user_data ); + + if (!m_wx_model->HasChildren( item )) + return 0; + + wxGtkTreeModelNode *parent_node = FindNode( iter ); + BuildBranch( parent_node ); + + return parent_node->GetChildCount(); +} + +gboolean wxGtkTreeModel::iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n ) +{ + void* id = NULL; + if (parent) id = (void*) parent->user_data; + wxDataViewItem item( id ); + + if (!m_wx_model->HasChildren( item )) + return FALSE; + + wxGtkTreeModelNode *parent_node = FindNode( parent ); + BuildBranch( parent_node ); + + wxGtkTreeModelNode *child_node = parent_node->GetChildren().Item( (size_t) n ); + if (!child_node) + return FALSE; + + iter->stamp = m_owner->stamp; + iter->user_data = (gpointer) child_node->GetItem().GetID(); + + return TRUE; +} + +gboolean wxGtkTreeModel::iter_parent( GtkTreeIter *iter, GtkTreeIter *child ) +{ + wxDataViewItem item( (void*) child->user_data ); + + wxGtkTreeModelNode *node = FindNode( child ); + node = node->GetParent(); + if (!node) + return FALSE; + + iter->stamp = m_owner->stamp; + iter->user_data = (gpointer) node->GetItem().GetID(); + + return TRUE; +} + +void wxGtkTreeModel::InitTree() +{ + wxDataViewItem item; + m_root = new wxGtkTreeModelNode( NULL, item ); + + BuildBranch( m_root ); +} + +static wxGtkTreeModelNode* +wxGtkTreeModel_FindNode( wxGtkTreeModelNode *node, const wxDataViewItem &item ) +{ + if (!node) return NULL; + + size_t count = node->GetChildCount(); + size_t i; + for (i = 0; i < count; i++) + { + wxGtkTreeModelNode *child = node->GetChildren().Item( i ); + if (child->GetItem().GetID() == item.GetID()) + return child; + + wxGtkTreeModelNode *node2 = wxGtkTreeModel_FindNode( child, item ); + if (node2) + return node2; + } + + return NULL; +} + +wxGtkTreeModelNode *wxGtkTreeModel::FindNode( GtkTreeIter *iter ) +{ + if (!iter) + return m_root; + + wxDataViewItem item( (void*) iter->user_data ); + + wxGtkTreeModelNode *result = wxGtkTreeModel_FindNode( m_root, item ); + + if (!result) + { + wxPrintf( "Not found %d\n", (int) iter->user_data ); + char *crash = NULL; + *crash = 0; + } + + return result; +} + +wxGtkTreeModelNode *wxGtkTreeModel::FindNode( const wxDataViewItem &item ) +{ + wxGtkTreeModelNode *result = wxGtkTreeModel_FindNode( m_root, item ); + + if (!result) + { + wxPrintf( "Not found %d\n", (int) item.GetID() ); + char *crash = NULL; + *crash = 0; + } + + return result; +} + //----------------------------------------------------------------------------- // define new GTK+ class wxGtkRendererRenderer //----------------------------------------------------------------------------- @@ -800,10 +989,11 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing( // 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]; + // TODO + wxDataViewItem item; gtk_tree_path_free( treepath ); - cell->StartEditing( model_row, renderrect ); + cell->StartEditing( item, renderrect ); return NULL; } @@ -934,7 +1124,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(); @@ -944,7 +1135,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; @@ -958,16 +1149,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; } @@ -1023,6 +1214,8 @@ wxGtkDataViewModelNotifier::~wxGtkDataViewModelNotifier() bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) { + m_wxgtk_model->model->ItemAdded( parent, item ); + GtkTreeIter iter; iter.stamp = m_wxgtk_model->stamp; iter.user_data = (gpointer) item.GetID(); @@ -1048,6 +1241,8 @@ bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &item ) GTK_TREE_MODEL(m_wxgtk_model), path ); gtk_tree_path_free (path); + m_wxgtk_model->model->ItemDeleted( item ); + return true; } @@ -1259,13 +1454,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; + // TODO + wxDataViewItem item; 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) @@ -1431,13 +1628,14 @@ 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]; + // TODO + wxDataViewItem item; 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) @@ -1811,10 +2009,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->model->GetDataViewModel()->GetValue( value, item, cell->GetOwner()->GetModelColumn() ); if (value.GetType() != cell->GetVariantType()) wxLogError( wxT("Wrong type, required: %s but: %s"), @@ -2275,15 +2473,17 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) if (!wxDataViewCtrlBase::AssociateModel( model )) return false; - GtkWxTreeModel *gtk_store = wxgtk_tree_model_new(); - gtk_store->model = model; + GtkWxTreeModel *gtkwx_tree_model = wxgtk_tree_model_new(); + wxGtkTreeModel *wxgtk_tree_model = new wxGtkTreeModel( model, gtkwx_tree_model ); + + gtkwx_tree_model->model = wxgtk_tree_model; - m_notifier = new wxGtkDataViewModelNotifier( gtk_store, model, this ); + m_notifier = new wxGtkDataViewModelNotifier( gtkwx_tree_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(gtkwx_tree_model) ); + g_object_unref( gtkwx_tree_model ); return true; } @@ -2300,6 +2500,34 @@ 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() +{ +} + +void wxDataViewCtrl::DoSetIndent() +{ +} + void wxDataViewCtrl::GtkDisableSelectionEvents() { GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );