X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e63807a8a4c31bb18d2dfaddc4c519cdbf9e82e3..c5288c5cfebea56239369dddcce8ac3ef6f4a8dd:/src/gtk/dataview.cpp diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 8f3b700e41..9b7df0db61 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,23 +41,102 @@ #include //----------------------------------------------------------------------------- -// classes //----------------------------------------------------------------------------- +class wxDataViewCtrlInternal; + +wxDataViewCtrlInternal *g_internal = 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); + 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(); + + void SetSortOrder( GtkSortType sort_order ) { m_sort_order = sort_order; } + GtkSortType GetSortOrder() { return m_sort_order; } + + void SetSortColumn( int column ) { m_sort_column = column; } + int GetSortColumn() { return m_sort_column; } + + bool IsSorted() { return (m_sort_column >= 0); } + + +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; + GtkSortType m_sort_order; + int m_sort_column; +}; + + //----------------------------------------------------------------------------- // wxGtkTreeModelNode //----------------------------------------------------------------------------- -class wxGtkTreeModelNode; +int LINKAGEMODE wxGtkTreeModelChildCmp( void** id1, void** id2 ) +{ + int ret = g_internal->GetDataViewModel()->Compare( *id1, *id2, + g_internal->GetSortColumn(), (g_internal->GetSortOrder() == GTK_SORT_ASCENDING) ); + + return ret; +} + WX_DEFINE_ARRAY_PTR( wxGtkTreeModelNode*, wxGtkTreeModelNodes ); +WX_DEFINE_ARRAY_PTR( void*, wxGtkTreeModelChildren ); class wxGtkTreeModelNode { public: - wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item ) + wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item, + wxDataViewCtrlInternal *internal ) { m_parent = parent; m_item = item; + m_internal = internal; } ~wxGtkTreeModelNode() @@ -64,74 +145,86 @@ public: size_t i; for (i = 0; i < count; i++) { - wxGtkTreeModelNode *child = m_children[i]; + wxGtkTreeModelNode *child = m_nodes.Item( i ); delete child; } } + unsigned int AddNode( wxGtkTreeModelNode* child ) + { + m_nodes.Add( child ); + + void *id = child->GetItem().GetID(); + + m_children.Add( id ); + + if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare()) + { + g_internal = m_internal; + m_children.Sort( &wxGtkTreeModelChildCmp ); + return m_children.Index( id ); + } + + return m_children.GetCount()-1; + } + + unsigned int AddLeave( void* id ) + { + m_children.Add( id ); + + if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare()) + { + g_internal = m_internal; + m_children.Sort( &wxGtkTreeModelChildCmp ); + return m_children.Index( id ); + } + + return m_children.GetCount()-1; + } + + void DeleteChild( void* id ) + { + m_children.Remove( id ); + + unsigned int count = m_nodes.GetCount(); + unsigned int pos; + 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() + wxGtkTreeModelNodes &GetNodes() + { return m_nodes; } + wxGtkTreeModelChildren &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(); } + unsigned int GetNodesCount() { return m_nodes.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(); + wxDataViewCtrlInternal *GetInternal() { return m_internal; } - 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 ); + void Resort(); private: - wxGtkTreeModelNode *m_root; - wxDataViewModel *m_wx_model; - GtkWxTreeModel *m_owner; + wxGtkTreeModelNode *m_parent; + wxGtkTreeModelNodes m_nodes; + wxGtkTreeModelChildren m_children; + wxDataViewItem m_item; + wxDataViewCtrlInternal *m_internal; }; + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -161,10 +254,7 @@ struct _GtkWxTreeModel /*< private >*/ gint stamp; - wxGtkTreeModel *model; - - gint sort_column_id; - GtkSortType order; + wxDataViewCtrlInternal *internal; }; struct _GtkWxTreeModelClass @@ -323,20 +413,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; } static void wxgtk_tree_model_finalize (GObject *object) { - GtkWxTreeModel *tree_model = GTK_WX_TREE_MODEL(object); - - /* we need to sort out, which class deletes what */ - delete tree_model->model; - /* must chain up */ (* list_parent_class->finalize) (object); } @@ -362,7 +445,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->GetDataViewModel()->GetColumnCount(); + return wxtree_model->internal->GetDataViewModel()->GetColumnCount(); } static GType @@ -374,7 +457,7 @@ wxgtk_tree_model_get_column_type (GtkTreeModel *tree_model, GType gtype = G_TYPE_INVALID; - wxString wxtype = wxtree_model->model->GetDataViewModel()->GetColumnType( (unsigned int) index ); + wxString wxtype = wxtree_model->internal->GetDataViewModel()->GetColumnType( (unsigned int) index ); if (wxtype == wxT("string")) gtype = G_TYPE_STRING; @@ -395,7 +478,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); - return wxtree_model->model->get_iter( iter, path ); + return wxtree_model->internal->get_iter( iter, path ); } static GtkTreePath * @@ -406,7 +489,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); - return wxtree_model->model->get_path( iter ); + return wxtree_model->internal->get_path( iter ); } static void @@ -418,13 +501,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->GetDataViewModel(); + 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() ); @@ -443,7 +526,7 @@ wxgtk_tree_model_iter_next (GtkTreeModel *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); - return wxtree_model->model->iter_next( iter ); + return wxtree_model->internal->iter_next( iter ); } static gboolean @@ -455,7 +538,7 @@ wxgtk_tree_model_iter_children (GtkTreeModel *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); - return wxtree_model->model->iter_children( iter, parent ); + return wxtree_model->internal->iter_children( iter, parent ); } static gboolean @@ -466,7 +549,7 @@ wxgtk_tree_model_iter_has_child (GtkTreeModel *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); - return wxtree_model->model->iter_has_child( iter ); + return wxtree_model->internal->iter_has_child( iter ); } static gint @@ -477,7 +560,7 @@ wxgtk_tree_model_iter_n_children (GtkTreeModel *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); - return wxtree_model->model->iter_n_children( iter ); + return wxtree_model->internal->iter_n_children( iter ); } static gboolean @@ -489,7 +572,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); - return wxtree_model->model->iter_nth_child( iter, parent, n ); + return wxtree_model->internal->iter_nth_child( iter, parent, n ); } static gboolean @@ -501,7 +584,7 @@ wxgtk_tree_model_iter_parent (GtkTreeModel *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); - return wxtree_model->model->iter_parent( iter, child ); + return wxtree_model->internal->iter_parent( iter, child ); } /* sortable */ @@ -513,37 +596,48 @@ 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 (!tree_model->internal->IsSorted()) + { + if (sort_column_id) + *sort_column_id = -1; + + return TRUE; + } + if (sort_column_id) - *sort_column_id = tree_model->sort_column_id; + *sort_column_id = tree_model->internal->GetSortColumn(); if (order) - *order = tree_model->order; + *order = tree_model->internal->GetSortOrder(); return TRUE; } -void wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable, +void wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable, gint sort_column_id, 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; - - tree_model->sort_column_id = sort_column_id; - tree_model->order = order; - + if ((sort_column_id == (gint) tree_model->internal->GetSortColumn()) && + (order == tree_model->internal->GetSortOrder())) + return; + + tree_model->internal->SetSortColumn( sort_column_id ); + + tree_model->internal->SetSortOrder( order ); + gtk_tree_sortable_sort_column_changed (sortable); + + tree_model->internal->GetDataViewModel()->Resort(); - wxPrintf( "wxgtk_tree_model_set_column_id, sort_column_id = %d, order = %d\n", sort_column_id, (int)order ); - // sort + wxDataViewCtrl *dv = tree_model->internal->GetOwner(); + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, dv->GetId() ); + // TODO event.SetDataViewColumn( column ); + event.SetModel( dv->GetModel() ); + dv->GetEventHandler()->ProcessEvent( event ); } void wxgtk_tree_model_set_sort_func (GtkTreeSortable *sortable, @@ -554,9 +648,6 @@ void wxgtk_tree_model_set_sort_func (GtkTreeSortable *sortabl { g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) ); g_return_if_fail (func != NULL); - - 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, @@ -575,356 +666,117 @@ gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable *sortabl return FALSE; } - //----------------------------------------------------------------------------- -// wxGtkTreeModel +// define new GTK+ class wxGtkRendererRenderer //----------------------------------------------------------------------------- -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 ); - } - } -} +extern "C" { -bool wxGtkTreeModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) -{ - wxGtkTreeModelNode *parent_node = FindNode( parent ); - parent_node->Append( new wxGtkTreeModelNode( parent_node, item ) ); - return true; -} +#define GTK_TYPE_WX_CELL_RENDERER (gtk_wx_cell_renderer_get_type ()) +#define GTK_WX_CELL_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRenderer)) +#define GTK_WX_CELL_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRendererClass)) +#define GTK_IS_WX_CELL_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_CELL_RENDERER)) +#define GTK_IS_WX_CELL_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_CELL_RENDERER)) +#define GTK_WX_CELL_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRendererClass)) + +GType gtk_wx_cell_renderer_get_type (void); + +typedef struct _GtkWxCellRenderer GtkWxCellRenderer; +typedef struct _GtkWxCellRendererClass GtkWxCellRendererClass; -bool wxGtkTreeModel::ItemDeleted( const wxDataViewItem &item ) +struct _GtkWxCellRenderer { - wxGtkTreeModelNode *node = FindNode( item ); - wxGtkTreeModelNode *parent = node->GetParent(); - parent->GetChildren().Remove( node ); - delete node; + GtkCellRenderer parent; - return true; -} + /*< private >*/ + wxDataViewCustomRenderer *cell; + guint32 last_click; +}; -gboolean wxGtkTreeModel::get_iter( GtkTreeIter *iter, GtkTreePath *path ) +struct _GtkWxCellRendererClass { - int depth = gtk_tree_path_get_depth( path ); + GtkCellRendererClass cell_parent_class; +}; - 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 ); - } +static GtkCellRenderer *gtk_wx_cell_renderer_new (void); +static void gtk_wx_cell_renderer_init ( + GtkWxCellRenderer *cell ); +static void gtk_wx_cell_renderer_class_init( + GtkWxCellRendererClass *klass ); +static void gtk_wx_cell_renderer_finalize ( + GObject *object ); +static void gtk_wx_cell_renderer_get_size ( + GtkCellRenderer *cell, + GtkWidget *widget, + GdkRectangle *rectangle, + gint *x_offset, + gint *y_offset, + gint *width, + gint *height ); +static void gtk_wx_cell_renderer_render ( + GtkCellRenderer *cell, + GdkWindow *window, + GtkWidget *widget, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GdkRectangle *expose_area, + GtkCellRendererState flags ); +static gboolean gtk_wx_cell_renderer_activate( + GtkCellRenderer *cell, + GdkEvent *event, + GtkWidget *widget, + const gchar *path, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkCellRendererState flags ); +static GtkCellEditable *gtk_wx_cell_renderer_start_editing( + GtkCellRenderer *cell, + GdkEvent *event, + GtkWidget *widget, + const gchar *path, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkCellRendererState flags ); - iter->stamp = m_owner->stamp; - iter->user_data = (gpointer) node->GetItem().GetID(); - return TRUE; -} +static GObjectClass *cell_parent_class = NULL; -GtkTreePath *wxGtkTreeModel::get_path( GtkTreeIter *iter ) +} // extern "C" + +GType +gtk_wx_cell_renderer_get_type (void) { - GtkTreePath *retval = gtk_tree_path_new (); - - wxGtkTreeModelNode *node = FindNode( iter ); - while (node->GetParent()) + static GType cell_wx_type = 0; + + if (!cell_wx_type) { - wxGtkTreeModelNode *parent = node->GetParent(); - int pos = parent->GetChildren().Index( node ); - - gtk_tree_path_prepend_index( retval, pos ); + const GTypeInfo cell_wx_info = + { + sizeof (GtkWxCellRendererClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) gtk_wx_cell_renderer_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GtkWxCellRenderer), + 0, /* n_preallocs */ + (GInstanceInitFunc) gtk_wx_cell_renderer_init, + }; - node = parent; + cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER, + "GtkWxCellRenderer", &cell_wx_info, (GTypeFlags)0 ); } - return retval; + return cell_wx_type; } -gboolean wxGtkTreeModel::iter_next( GtkTreeIter *iter ) +static void +gtk_wx_cell_renderer_init (GtkWxCellRenderer *cell) { - wxDataViewItem item( (wxUint32) 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( (wxUint32) 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( (wxUint32) iter->user_data ); - - return m_wx_model->HasChildren( item ); -} - -gint wxGtkTreeModel::iter_n_children( GtkTreeIter *iter ) -{ - wxDataViewItem item( (wxUint32) 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 ) -{ - wxUint32 id = 0; - if (parent) id = (wxUint32) 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( (wxUint32) 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( (wxUint32) 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 -//----------------------------------------------------------------------------- - -extern "C" { - -#define GTK_TYPE_WX_CELL_RENDERER (gtk_wx_cell_renderer_get_type ()) -#define GTK_WX_CELL_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRenderer)) -#define GTK_WX_CELL_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRendererClass)) -#define GTK_IS_WX_CELL_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_CELL_RENDERER)) -#define GTK_IS_WX_CELL_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_CELL_RENDERER)) -#define GTK_WX_CELL_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRendererClass)) - -GType gtk_wx_cell_renderer_get_type (void); - -typedef struct _GtkWxCellRenderer GtkWxCellRenderer; -typedef struct _GtkWxCellRendererClass GtkWxCellRendererClass; - -struct _GtkWxCellRenderer -{ - GtkCellRenderer parent; - - /*< private >*/ - wxDataViewCustomRenderer *cell; - guint32 last_click; -}; - -struct _GtkWxCellRendererClass -{ - GtkCellRendererClass cell_parent_class; -}; - - -static GtkCellRenderer *gtk_wx_cell_renderer_new (void); -static void gtk_wx_cell_renderer_init ( - GtkWxCellRenderer *cell ); -static void gtk_wx_cell_renderer_class_init( - GtkWxCellRendererClass *klass ); -static void gtk_wx_cell_renderer_finalize ( - GObject *object ); -static void gtk_wx_cell_renderer_get_size ( - GtkCellRenderer *cell, - GtkWidget *widget, - GdkRectangle *rectangle, - gint *x_offset, - gint *y_offset, - gint *width, - gint *height ); -static void gtk_wx_cell_renderer_render ( - GtkCellRenderer *cell, - GdkWindow *window, - GtkWidget *widget, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GdkRectangle *expose_area, - GtkCellRendererState flags ); -static gboolean gtk_wx_cell_renderer_activate( - GtkCellRenderer *cell, - GdkEvent *event, - GtkWidget *widget, - const gchar *path, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GtkCellRendererState flags ); -static GtkCellEditable *gtk_wx_cell_renderer_start_editing( - GtkCellRenderer *cell, - GdkEvent *event, - GtkWidget *widget, - const gchar *path, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GtkCellRendererState flags ); - - -static GObjectClass *cell_parent_class = NULL; - -} // extern "C" - -GType -gtk_wx_cell_renderer_get_type (void) -{ - static GType cell_wx_type = 0; - - if (!cell_wx_type) - { - const GTypeInfo cell_wx_info = - { - sizeof (GtkWxCellRendererClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gtk_wx_cell_renderer_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GtkWxCellRenderer), - 0, /* n_preallocs */ - (GInstanceInitFunc) gtk_wx_cell_renderer_init, - }; - - cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER, - "GtkWxCellRenderer", &cell_wx_info, (GTypeFlags)0 ); - } - - return cell_wx_type; -} - -static void -gtk_wx_cell_renderer_init (GtkWxCellRenderer *cell) -{ - cell->cell = NULL; - cell->last_click = 0; -} + cell->cell = NULL; + cell->last_click = 0; +} static void gtk_wx_cell_renderer_class_init (GtkWxCellRendererClass *klass) @@ -986,13 +838,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; } @@ -1123,7 +975,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(); @@ -1133,7 +986,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; @@ -1147,16 +1000,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; } @@ -1181,10 +1034,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; @@ -1212,7 +1066,7 @@ wxGtkDataViewModelNotifier::~wxGtkDataViewModelNotifier() bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) { - m_wxgtk_model->model->ItemAdded( parent, item ); + m_owner->GtkGetInternal()->ItemAdded( parent, item ); GtkTreeIter iter; iter.stamp = m_wxgtk_model->stamp; @@ -1227,7 +1081,7 @@ 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; @@ -1239,11 +1093,16 @@ bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &item ) GTK_TREE_MODEL(m_wxgtk_model), path ); gtk_tree_path_free (path); - m_wxgtk_model->model->ItemDeleted( item ); + m_owner->GtkGetInternal()->ItemDeleted( parent, item ); return true; } +void wxGtkDataViewModelNotifier::Resort() +{ + m_owner->GtkGetInternal()->Resort(); +} + bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item ) { GtkTreeIter iter; @@ -1256,6 +1115,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; } @@ -1289,14 +1150,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; } @@ -1304,6 +1173,51 @@ bool wxGtkDataViewModelNotifier::Cleared() // wxDataViewRenderer // --------------------------------------------------------- +static gpointer s_user_data = NULL; + +static void +wxgtk_cell_editable_editing_done( GtkCellEditable *editable, + wxDataViewRenderer *wxrenderer ) +{ + wxDataViewColumn *column = wxrenderer->GetOwner(); + wxDataViewCtrl *dv = column->GetOwner(); + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, dv->GetId() ); + event.SetDataViewColumn( column ); + event.SetModel( dv->GetModel() ); + wxDataViewItem item( s_user_data ); + event.SetItem( item ); + dv->GetEventHandler()->ProcessEvent( event ); +} + +static void +wxgtk_renderer_editing_started( GtkCellRenderer *cell, GtkCellEditable *editable, + gchar *path, wxDataViewRenderer *wxrenderer ) +{ + wxDataViewColumn *column = wxrenderer->GetOwner(); + wxDataViewCtrl *dv = column->GetOwner(); + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, dv->GetId() ); + event.SetDataViewColumn( column ); + event.SetModel( dv->GetModel() ); + GtkTreePath *tree_path = gtk_tree_path_new_from_string( path ); + GtkTreeIter iter; + dv->GtkGetInternal()->get_iter( &iter, tree_path ); + gtk_tree_path_free( tree_path ); + wxDataViewItem item( iter.user_data ); + event.SetItem( item ); + dv->GetEventHandler()->ProcessEvent( event ); + + if (GTK_IS_CELL_EDITABLE(editable)) + { + s_user_data = iter.user_data; + + g_signal_connect (GTK_CELL_EDITABLE (editable), "editing_done", + G_CALLBACK (wxgtk_cell_editable_editing_done), + (gpointer) wxrenderer ); + + } +} + + IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase) wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode, @@ -1316,6 +1230,16 @@ wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewC // after the m_renderer pointer has been initialized } +void wxDataViewRenderer::GtkInitHandlers() +{ + if (!gtk_check_version(2,6,0)) + { + g_signal_connect (GTK_CELL_RENDERER(m_renderer), "editing_started", + G_CALLBACK (wxgtk_renderer_editing_started), + this); + } +} + void wxDataViewRenderer::SetMode( wxDataViewCellMode mode ) { GtkCellRendererMode gtkMode; @@ -1452,13 +1376,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) @@ -1478,6 +1404,8 @@ wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxD g_value_unset( &gvalue ); g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this ); + + GtkInitHandlers(); } SetMode(mode); @@ -1624,13 +1552,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) @@ -1739,6 +1669,8 @@ bool wxDataViewCustomRenderer::Init(wxDataViewCellMode mode, int align) SetMode(mode); SetAlignment(align); + GtkInitHandlers(); + return true; } @@ -1958,13 +1890,74 @@ bool wxDataViewDateRenderer::Activate( wxRect cell, wxDataViewModel *model, return true; } -// --------------------------------------------------------- -// wxDataViewColumn -// --------------------------------------------------------- +// --------------------------------------------------------- +// wxDataViewIconTextRenderer +// --------------------------------------------------------- -static gboolean -gtk_dataview_header_button_press_callback( GtkWidget *widget, +IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer) + +wxDataViewIconTextRenderer::wxDataViewIconTextRenderer( + const wxString &varianttype, wxDataViewCellMode mode, int align ) : + wxDataViewCustomRenderer( varianttype, mode, align ) +{ + SetMode(mode); + SetAlignment(align); +} + +wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer() +{ +} + +bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value ) +{ + m_value << value; + return true; +} + +bool wxDataViewIconTextRenderer::GetValue( wxVariant &value ) const +{ + return false; +} + +bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state ) +{ + dc->SetFont( GetOwner()->GetOwner()->GetFont() ); + + const wxIcon &icon = m_value.GetIcon(); + if (icon.IsOk()) + { + dc->DrawIcon( icon, cell.x, cell.y ); // TODO centre + cell.x += icon.GetWidth()+4; + } + + dc->DrawText( m_value.GetText(), cell.x, cell.y ); + + return true; +} + +wxSize wxDataViewIconTextRenderer::GetSize() const +{ + return wxSize(80,16); // TODO +} + +wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) +{ + return NULL; +} + +bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ) +{ + return false; +} + +// --------------------------------------------------------- +// wxDataViewColumn +// --------------------------------------------------------- + + +static gboolean +gtk_dataview_header_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxDataViewColumn *column ) { @@ -1978,7 +1971,7 @@ gtk_dataview_header_button_press_callback( GtkWidget *widget, event.SetDataViewColumn( column ); event.SetModel( dv->GetModel() ); if (dv->GetEventHandler()->ProcessEvent( event )) - return TRUE; + return FALSE; } return FALSE; @@ -2004,10 +1997,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->GetDataViewModel()->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"), @@ -2045,6 +2038,9 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase) +#include +WX_DEFINE_LIST(wxDataViewColumnList); + wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell, unsigned int model_column, int width, wxAlignment align, int flags ) : @@ -2224,9 +2220,14 @@ void wxDataViewColumn::SetSortable( bool sortable ) GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); if (sortable) + { gtk_tree_view_column_set_sort_column_id( column, GetModelColumn() ); + } else + { gtk_tree_view_column_set_sort_column_id( column, -1 ); + gtk_tree_view_column_set_sort_indicator( column, FALSE ); + } } bool wxDataViewColumn::IsSortable() const @@ -2255,6 +2256,8 @@ void wxDataViewColumn::SetSortOrder( bool ascending ) gtk_tree_view_column_set_sort_order( column, GTK_SORT_ASCENDING ); else gtk_tree_view_column_set_sort_order( column, GTK_SORT_DESCENDING ); + + gtk_tree_view_column_set_sort_indicator( column, TRUE ); } bool wxDataViewColumn::IsSortOrderAscending() const @@ -2286,173 +2289,733 @@ void wxDataViewColumn::SetWidth( int width ) //----------------------------------------------------------------------------- -// wxDataViewCtrl signal callbacks +// wxGtkTreeModelNode //----------------------------------------------------------------------------- -static void -wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCtrl *dv ) +void wxGtkTreeModelNode::Resort() { - if (!GTK_WIDGET_REALIZED(dv->m_widget)) + size_t child_count = GetChildCount(); + if (child_count == 0) return; - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_SELECTED, dv->GetId() ); - // TODO: item - event.SetModel( dv->GetModel() ); - dv->GetEventHandler()->ProcessEvent( event ); -} + size_t node_count = GetNodesCount(); -static void -wxdataview_row_activated_callback( GtkTreeView* treeview, GtkTreePath *path, - GtkTreeViewColumn *column, wxDataViewCtrl *dv ) -{ - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, dv->GetId() ); - // TODO: item - event.SetModel( dv->GetModel() ); - dv->GetEventHandler()->ProcessEvent( event ); -} + if (child_count == 1) + { + if (node_count == 1) + { + wxGtkTreeModelNode *node = m_nodes.Item( 0 ); + node->Resort(); + } + return; + } -//----------------------------------------------------------------------------- -// wxDataViewCtrl -//----------------------------------------------------------------------------- + wxGtkTreeModelChildren temp; + WX_APPEND_ARRAY( temp, m_children ); + + g_internal = m_internal; + m_children.Sort( &wxGtkTreeModelChildCmp ); + + gint *new_order = new gint[child_count]; + + unsigned int pos; + for (pos = 0; pos < child_count; pos++) + { + void *id = m_children.Item( pos ); + int old_pos = temp.Index( id ); + new_order[pos] = old_pos; + } + + GtkTreeModel *gtk_tree_model = GTK_TREE_MODEL( m_internal->GetGtkModel() ); + + GtkTreeIter iter; + iter.user_data = GetItem().GetID(); + iter.stamp = m_internal->GetGtkModel()->stamp; + + GtkTreePath *path = m_internal->get_path( &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 < node_count; pos++) + { + wxGtkTreeModelNode *node = m_nodes.Item( pos ); + node->Resort(); + } +} //----------------------------------------------------------------------------- -// InsertChild for wxDataViewCtrl +// wxDataViewCtrlInternal //----------------------------------------------------------------------------- -static void wxInsertChildInDataViewCtrl( wxWindowGTK* parent, wxWindowGTK* child ) +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; + m_sort_order = GTK_SORT_ASCENDING; + m_sort_column = -1; + InitTree(); +} + +wxDataViewCtrlInternal::~wxDataViewCtrlInternal() { - wxDataViewCtrl * dvc = (wxDataViewCtrl*) parent; - GtkWidget *treeview = dvc->GtkGetTreeView(); + g_object_unref( m_gtk_model ); +} + +void wxDataViewCtrlInternal::InitTree() +{ + wxDataViewItem item; + m_root = new wxGtkTreeModelNode( NULL, item, this ); - // Insert widget in GtkTreeView - if (GTK_WIDGET_REALIZED(treeview)) - gtk_widget_set_parent_window( child->m_widget, - gtk_tree_view_get_bin_window( GTK_TREE_VIEW(treeview) ) ); - gtk_widget_set_parent( child->m_widget, treeview ); + BuildBranch( m_root ); } -static -void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget), - GtkAllocation *alloc, - wxDataViewCtrl *win ) +void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node ) { - - wxWindowList::Node *node = win->GetChildren().GetFirst(); - while (node) + if (node->GetChildCount() == 0) { - wxWindow *child = node->GetData(); - - GtkRequisition req; - gtk_widget_size_request( child->m_widget, &req ); - - GtkAllocation alloc; - alloc.x = child->m_x; - alloc.y = child->m_y; - alloc.width = child->m_width; - alloc.height = child->m_height; - gtk_widget_size_allocate( child->m_widget, &alloc ); - - node = node->GetNext(); + wxDataViewItemArray children; + unsigned int count = m_wx_model->GetChildren( node->GetItem(), children ); + unsigned int pos; + for (pos = 0; pos < count; pos++) + { + wxDataViewItem child = children[pos]; + + if (m_wx_model->IsContainer( child )) + node->AddNode( new wxGtkTreeModelNode( node, child, this ) ); + else + node->AddLeave( child.GetID() ); + + // Don't send any events here + } } } +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 ); -IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase) + return true; +} -wxDataViewCtrl::~wxDataViewCtrl() +bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) { - if (m_notifier) - GetModel()->RemoveNotifier( m_notifier ); + 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 ); - // 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 ); + return true; } -void wxDataViewCtrl::Init() +bool wxDataViewCtrlInternal::ItemChanged( const wxDataViewItem &item ) { - m_notifier = NULL; + 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 wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxValidator& validator ) +bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned int col ) { - Init(); - - if (!PreCreation( parent, pos, size ) || - !CreateBase( parent, id, pos, size, style, validator )) - { - wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") ); - return false; - } - - m_insertCallback = wxInsertChildInDataViewCtrl; - - m_widget = gtk_scrolled_window_new (NULL, NULL); - - GtkScrolledWindowSetBorder(m_widget, style); + 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; +} - m_treeview = gtk_tree_view_new(); - gtk_container_add (GTK_CONTAINER (m_widget), m_treeview); +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; +} - g_signal_connect (m_treeview, "size_allocate", - G_CALLBACK (gtk_dataviewctrl_size_callback), this); +gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path ) +{ + int depth = gtk_tree_path_get_depth( path ); -#ifdef __WXGTK26__ - if (!gtk_check_version(2,6,0)) - gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), TRUE ); -#endif + wxGtkTreeModelNode *node = m_root; - if (style & wxDV_MULTIPLE) + int i; + for (i = 0; i < depth; i++) { - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE ); + 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; + } + } } - gtk_tree_view_set_headers_visible( GTK_TREE_VIEW(m_treeview), (style & wxDV_NO_HEADER) == 0 ); + return FALSE; +} -#ifdef __WXGTK210__ - if (!gtk_check_version(2,10,0)) +GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter ) +{ + GtkTreePath *retval = gtk_tree_path_new (); + void *id = iter->user_data; + + wxGtkTreeModelNode *node = FindParentNode( iter ); + while (node) { - GtkTreeViewGridLines grid = GTK_TREE_VIEW_GRID_LINES_NONE; - - if ((style & wxDV_HORIZ_RULES) != 0 && - (style & wxDV_VERT_RULES) != 0) - grid = GTK_TREE_VIEW_GRID_LINES_BOTH; - else if (style & wxDV_VERT_RULES) - grid = GTK_TREE_VIEW_GRID_LINES_VERTICAL; - else if (style & wxDV_HORIZ_RULES) - grid = GTK_TREE_VIEW_GRID_LINES_HORIZONTAL; + int pos = node->GetChildren().Index( id ); - gtk_tree_view_set_grid_lines( GTK_TREE_VIEW(m_treeview), grid ); - } - else -#endif - { - gtk_tree_view_set_rules_hint( GTK_TREE_VIEW(m_treeview), (style & wxDV_HORIZ_RULES) != 0 ); + gtk_tree_path_prepend_index( retval, pos ); + + id = node->GetItem().GetID(); + node = node->GetParent(); } - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget), - GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); - gtk_widget_show (m_treeview); - - m_parent->DoAddChild( this ); + return retval; +} - PostCreation(size); +gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter ) +{ + wxGtkTreeModelNode *parent = FindParentNode( iter ); + if( parent == NULL ) + return FALSE; - GtkEnableSelectionEvents(); + int pos = parent->GetChildren().Index( iter->user_data ); - g_signal_connect_after (m_treeview, "row_activated", - G_CALLBACK (wxdataview_row_activated_callback), this); + if (pos == (int) parent->GetChildCount()-1) + return FALSE; + + iter->stamp = m_gtk_model->stamp; + iter->user_data = parent->GetChildren().Item( pos+1 ); - return true; + return TRUE; } -void wxDataViewCtrl::OnInternalIdle() +gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *parent ) { - wxWindow::OnInternalIdle(); + 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 ) +{ + 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 ) +{ + 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 ) +{ + 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 ) +{ + 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 +//----------------------------------------------------------------------------- + +static void +wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCtrl *dv ) +{ + if (!GTK_WIDGET_REALIZED(dv->m_widget)) + return; + + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_SELECTED, dv->GetId() ); + event.SetItem( dv->GetSelection() ); + event.SetModel( dv->GetModel() ); + dv->GetEventHandler()->ProcessEvent( event ); +} + +static void +wxdataview_row_activated_callback( GtkTreeView* treeview, GtkTreePath *path, + GtkTreeViewColumn *column, wxDataViewCtrl *dv ) +{ + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, dv->GetId() ); + + 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 ); +} + +static gboolean +wxdataview_test_expand_row_callback( GtkTreeView* treeview, GtkTreeIter* iter, + GtkTreePath *path, wxDataViewCtrl *dv ) +{ + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, dv->GetId() ); + + wxDataViewItem item( (void*) iter->user_data );; + event.SetItem( item ); + event.SetModel( dv->GetModel() ); + dv->GetEventHandler()->ProcessEvent( event ); + + return !event.IsAllowed(); +} + +static void +wxdataview_row_expanded_callback( GtkTreeView* treeview, GtkTreeIter* iter, + GtkTreePath *path, wxDataViewCtrl *dv ) +{ + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, dv->GetId() ); + + wxDataViewItem item( (void*) iter->user_data );; + event.SetItem( item ); + event.SetModel( dv->GetModel() ); + dv->GetEventHandler()->ProcessEvent( event ); +} + +static gboolean +wxdataview_test_collapse_row_callback( GtkTreeView* treeview, GtkTreeIter* iter, + GtkTreePath *path, wxDataViewCtrl *dv ) +{ + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, dv->GetId() ); + + wxDataViewItem item( (void*) iter->user_data );; + event.SetItem( item ); + event.SetModel( dv->GetModel() ); + dv->GetEventHandler()->ProcessEvent( event ); + + return !event.IsAllowed(); +} + +static void +wxdataview_row_collapsed_callback( GtkTreeView* treeview, GtkTreeIter* iter, + GtkTreePath *path, wxDataViewCtrl *dv ) +{ + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, dv->GetId() ); + + wxDataViewItem item( (void*) iter->user_data );; + event.SetItem( item ); + event.SetModel( dv->GetModel() ); + dv->GetEventHandler()->ProcessEvent( event ); +} + +//----------------------------------------------------------------------------- + // wxDataViewCtrl +//----------------------------------------------------------------------------- + +//----------------------------------------------------------------------------- +// InsertChild for wxDataViewCtrl +//----------------------------------------------------------------------------- + +static void wxInsertChildInDataViewCtrl( wxWindowGTK* parent, wxWindowGTK* child ) +{ + wxDataViewCtrl * dvc = (wxDataViewCtrl*) parent; + GtkWidget *treeview = dvc->GtkGetTreeView(); + + // Insert widget in GtkTreeView + if (GTK_WIDGET_REALIZED(treeview)) + gtk_widget_set_parent_window( child->m_widget, + gtk_tree_view_get_bin_window( GTK_TREE_VIEW(treeview) ) ); + gtk_widget_set_parent( child->m_widget, treeview ); +} + +static +void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget), + GtkAllocation *alloc, + wxDataViewCtrl *win ) +{ + wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst(); + while (node) + { + wxWindow *child = node->GetData(); + + GtkRequisition req; + gtk_widget_size_request( child->m_widget, &req ); + + GtkAllocation alloc; + alloc.x = child->m_x; + alloc.y = child->m_y; + alloc.width = child->m_width; + alloc.height = child->m_height; + gtk_widget_size_allocate( child->m_widget, &alloc ); + + node = node->GetNext(); + } +} + + + +IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase) + +wxDataViewCtrl::~wxDataViewCtrl() +{ + if (m_notifier) + GetModel()->RemoveNotifier( m_notifier ); + + // 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() +{ + m_notifier = NULL; +} + +bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos, const wxSize& size, + long style, const wxValidator& validator ) +{ + Init(); + + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator )) + { + wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") ); + return false; + } + + m_insertCallback = wxInsertChildInDataViewCtrl; + + m_widget = gtk_scrolled_window_new (NULL, NULL); + + GtkScrolledWindowSetBorder(m_widget, style); + + m_treeview = gtk_tree_view_new(); + gtk_container_add (GTK_CONTAINER (m_widget), m_treeview); + + g_signal_connect (m_treeview, "size_allocate", + G_CALLBACK (gtk_dataviewctrl_size_callback), this); + +#ifdef __WXGTK26__ + if (!gtk_check_version(2,6,0)) + gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), TRUE ); +#endif + + if (style & wxDV_MULTIPLE) + { + GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); + gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE ); + } + + gtk_tree_view_set_headers_visible( GTK_TREE_VIEW(m_treeview), (style & wxDV_NO_HEADER) == 0 ); + +#ifdef __WXGTK210__ + if (!gtk_check_version(2,10,0)) + { + GtkTreeViewGridLines grid = GTK_TREE_VIEW_GRID_LINES_NONE; + + if ((style & wxDV_HORIZ_RULES) != 0 && + (style & wxDV_VERT_RULES) != 0) + grid = GTK_TREE_VIEW_GRID_LINES_BOTH; + else if (style & wxDV_VERT_RULES) + grid = GTK_TREE_VIEW_GRID_LINES_VERTICAL; + else if (style & wxDV_HORIZ_RULES) + grid = GTK_TREE_VIEW_GRID_LINES_HORIZONTAL; + + gtk_tree_view_set_grid_lines( GTK_TREE_VIEW(m_treeview), grid ); + } + else +#endif + { + gtk_tree_view_set_rules_hint( GTK_TREE_VIEW(m_treeview), (style & wxDV_HORIZ_RULES) != 0 ); + } + + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget), + GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); + gtk_widget_show (m_treeview); + + m_parent->DoAddChild( this ); + + PostCreation(size); + + GtkEnableSelectionEvents(); + + g_signal_connect_after (m_treeview, "row-activated", + G_CALLBACK (wxdataview_row_activated_callback), this); + + g_signal_connect (m_treeview, "test-collapse-row", + G_CALLBACK (wxdataview_test_collapse_row_callback), this); + + g_signal_connect_after (m_treeview, "row-collapsed", + G_CALLBACK (wxdataview_row_collapsed_callback), this); + + g_signal_connect (m_treeview, "test-expand-row", + G_CALLBACK (wxdataview_test_expand_row_callback), this); + + g_signal_connect_after (m_treeview, "row-expanded", + G_CALLBACK (wxdataview_row_expanded_callback), this); + + return true; +} + +void wxDataViewCtrl::OnInternalIdle() +{ + wxWindow::OnInternalIdle(); unsigned int cols = GetColumnCount(); unsigned int i; @@ -2468,17 +3031,18 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) if (!wxDataViewCtrlBase::AssociateModel( model )) return false; - 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; + GtkWxTreeModel *gtk_model = wxgtk_tree_model_new(); + m_internal = new wxDataViewCtrlInternal( this, model, gtk_model ); + gtk_model->internal = m_internal; - m_notifier = new wxGtkDataViewModelNotifier( gtkwx_tree_model, 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(gtkwx_tree_model) ); - g_object_unref( gtkwx_tree_model ); + 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; } @@ -2488,26 +3052,112 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) if (!wxDataViewCtrlBase::AppendColumn(col)) return false; - GtkTreeViewColumn *column = (GtkTreeViewColumn *)col->GetGtkHandle(); + m_cols.Append( col ); + + gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), + GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ); + + return true; +} + +unsigned int wxDataViewCtrl::GetColumnCount() const +{ + return m_cols.GetCount(); +} + +wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const +{ + GtkTreeViewColumn *gtk_col = gtk_tree_view_get_column( GTK_TREE_VIEW(m_treeview), pos ); + if (!gtk_col) + return NULL; + + wxDataViewColumnList::const_iterator iter; + for (iter = m_cols.begin(); iter != m_cols.end(); iter++) + { + wxDataViewColumn *col = *iter; + if (GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) == gtk_col) + { + return col; + } + } + + return NULL; +} + +bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) +{ + gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview), + GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()) ); + + m_cols.remove( column ); - gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), column ); + delete column; return true; } -wxDataViewItem wxDataViewCtrl::GetSelection() +bool wxDataViewCtrl::ClearColumns() +{ + wxDataViewColumnList::iterator iter; + for (iter = m_cols.begin(); iter != m_cols.end(); iter++) + { + wxDataViewColumn *col = *iter; + gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview), + GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ); + } + + m_cols.clear(); + + return true; +} + +void wxDataViewCtrl::Expand( const wxDataViewItem & item ) +{ + GtkTreeIter iter; + iter.user_data = item.GetID(); + GtkTreePath *path = m_internal->get_path( &iter ); + gtk_tree_view_expand_row( GTK_TREE_VIEW(m_treeview), path, false ); + gtk_tree_path_free( path ); +} + +void wxDataViewCtrl::Collapse( const wxDataViewItem & item ) +{ + GtkTreeIter iter; + iter.user_data = item.GetID(); + GtkTreePath *path = m_internal->get_path( &iter ); + gtk_tree_view_collapse_row( GTK_TREE_VIEW(m_treeview), path ); + gtk_tree_path_free( path ); +} + +wxDataViewItem wxDataViewCtrl::GetSelection() const { GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); if (m_windowStyle & wxDV_MULTIPLE) { + // Report the first one + GtkTreeModel *model; + GList *list = gtk_tree_selection_get_selected_rows( selection, &model ); + + if (list) + { + GtkTreePath *path = (GtkTreePath*) list->data; + GtkTreeIter iter; + m_internal->get_iter( &iter, path ); + + // delete list + g_list_foreach( list, (GFunc) gtk_tree_path_free, NULL ); + g_list_free( list ); + + return wxDataViewItem( (void*) iter.user_data ); + } } else { GtkTreeIter iter; if (gtk_tree_selection_get_selected( selection, NULL, &iter )) { - wxDataViewItem item( (wxUint32) iter.user_data ); + wxDataViewItem item( (void*) iter.user_data ); return item; } } @@ -2515,8 +3165,154 @@ wxDataViewItem wxDataViewCtrl::GetSelection() return wxDataViewItem(0); } +int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const +{ + sel.Clear(); + + GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); + if (HasFlag(wxDV_MULTIPLE)) + { + GtkTreeModel *model; + GList *list = gtk_tree_selection_get_selected_rows( selection, &model ); + + int count = 0; + while (list) + { + GtkTreePath *path = (GtkTreePath*) list->data; + + GtkTreeIter iter; + m_internal->get_iter( &iter, path ); + + sel.Add( wxDataViewItem( (void*) iter.user_data ) ); + + list = g_list_next( list ); + count++; + } + + // delete list + g_list_foreach( list, (GFunc) gtk_tree_path_free, NULL ); + g_list_free( list ); + + return count; + } + else + { + GtkTreeModel *model; + GtkTreeIter iter; + gboolean has_selection = gtk_tree_selection_get_selected( selection, &model, &iter ); + if (has_selection) + { + sel.Add( wxDataViewItem( (void*) iter.user_data) ); + return 1; + } + } + + return 0; +} + +void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) +{ + GtkDisableSelectionEvents(); + + GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); + + gtk_tree_selection_unselect_all( selection ); + + size_t i; + for (i = 0; i < sel.GetCount(); i++) + { + GtkTreeIter iter; + iter.user_data = (gpointer) sel[i].GetID(); + gtk_tree_selection_select_iter( selection, &iter ); + } + + GtkEnableSelectionEvents(); +} + +void wxDataViewCtrl::Select( const wxDataViewItem & item ) +{ + GtkDisableSelectionEvents(); + + GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); + + GtkTreeIter iter; + iter.user_data = (gpointer) item.GetID(); + gtk_tree_selection_select_iter( selection, &iter ); + + GtkEnableSelectionEvents(); +} + +void wxDataViewCtrl::Unselect( const wxDataViewItem & item ) +{ + GtkDisableSelectionEvents(); + + GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); + + GtkTreeIter iter; + iter.user_data = (gpointer) item.GetID(); + gtk_tree_selection_unselect_iter( selection, &iter ); + + GtkEnableSelectionEvents(); +} + +bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const +{ + GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); + + GtkTreeIter iter; + iter.user_data = (gpointer) item.GetID(); + + return gtk_tree_selection_iter_is_selected( selection, &iter ); +} + +void wxDataViewCtrl::SelectAll() +{ + GtkDisableSelectionEvents(); + + GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); + + gtk_tree_selection_select_all( selection ); + + GtkEnableSelectionEvents(); +} + +void wxDataViewCtrl::UnselectAll() +{ + GtkDisableSelectionEvents(); + + GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); + + gtk_tree_selection_unselect_all( selection ); + + GtkEnableSelectionEvents(); +} + +void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn *column ) +{ + GtkTreeIter iter; + iter.user_data = (gpointer) item.GetID(); + GtkTreePath *path = m_internal->get_path( &iter ); + gtk_tree_view_scroll_to_cell( GTK_TREE_VIEW(m_treeview), path, NULL, false, 0.0, 0.0 ); + gtk_tree_path_free( path ); +} + +void wxDataViewCtrl::HitTest( const wxPoint &point, + wxDataViewItem &item, wxDataViewColumn *&column ) const +{ + item = wxDataViewItem(0); + column = NULL; +} + +wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem &item, + const wxDataViewColumn *column ) const +{ + return wxRect(); +} + void wxDataViewCtrl::DoSetExpanderColumn() { + gtk_tree_view_set_expander_column( GTK_TREE_VIEW(m_treeview), + GTK_TREE_VIEW_COLUMN( GetExpanderColumn()->GetGtkHandle() ) ); } void wxDataViewCtrl::DoSetIndent() @@ -2526,15 +3322,15 @@ void wxDataViewCtrl::DoSetIndent() void wxDataViewCtrl::GtkDisableSelectionEvents() { GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - g_signal_connect_after (selection, "changed", - G_CALLBACK (wxdataview_selection_changed_callback), this); + g_signal_handlers_disconnect_by_func( selection, + (gpointer) (wxdataview_selection_changed_callback), this); } void wxDataViewCtrl::GtkEnableSelectionEvents() { GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - g_signal_handlers_disconnect_by_func( selection, - (gpointer) (wxdataview_selection_changed_callback), this); + g_signal_connect_after (selection, "changed", + G_CALLBACK (wxdataview_selection_changed_callback), this); } // static