X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc211fe5ce245c52b87be787a8e4ec507a2a42b4..ac0c512d865e6236fc81882cb84cc38d09f8f0ec:/src/gtk/dataview.cpp?ds=sidebyside diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 445ba52852..a5c67b1bef 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" @@ -33,15 +35,199 @@ #include #include +#include #include #include //----------------------------------------------------------------------------- -// classes //----------------------------------------------------------------------------- -class wxDataViewCtrl; +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; } + + void SetDataViewSortColumn( wxDataViewColumn *column ) { m_dataview_sort_column = column; } + wxDataViewColumn *GetDataViewSortColumn() { return m_dataview_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; + wxDataViewColumn *m_dataview_sort_column; + int m_sort_column; +}; + + +//----------------------------------------------------------------------------- +// 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, + wxDataViewCtrlInternal *internal ) + { + m_parent = parent; + m_item = item; + m_internal = internal; + } + + ~wxGtkTreeModelNode() + { + size_t count = m_children.GetCount(); + size_t i; + for (i = 0; i < count; 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 &GetNodes() + { return m_nodes; } + wxGtkTreeModelChildren &GetChildren() + { return m_children; } + + unsigned int GetChildCount() { return m_children.GetCount(); } + unsigned int GetNodesCount() { return m_nodes.GetCount(); } + + wxDataViewItem &GetItem() { return m_item; } + wxDataViewCtrlInternal *GetInternal() { return m_internal; } + + void Resort(); + +private: + wxGtkTreeModelNode *m_parent; + wxGtkTreeModelNodes m_nodes; + wxGtkTreeModelChildren m_children; + wxDataViewItem m_item; + wxDataViewCtrlInternal *m_internal; +}; + //----------------------------------------------------------------------------- // data @@ -50,159 +236,194 @@ class wxDataViewCtrl; extern bool g_blockEventsOnDrag; //----------------------------------------------------------------------------- -// define new GTK+ class wxGtkListStore +// define new GTK+ class wxGtkTreeModel //----------------------------------------------------------------------------- extern "C" { -#define GTK_TYPE_WX_LIST_STORE (gtk_wx_list_store_get_type ()) -#define GTK_WX_LIST_STORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_LIST_STORE, GtkWxListStore)) -#define GTK_WX_LIST_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WX_LIST_STORE, GtkWxListStoreClass)) -#define GTK_IS_WX_LIST_STORE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_LIST_STORE)) -#define GTK_IS_WX_LIST_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_LIST_STORE)) -#define GTK_WX_LIST_STORE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WX_LIST_STORE, GtkWxListStoreClass)) +#define GTK_TYPE_WX_TREE_MODEL (gtk_wx_tree_model_get_type ()) +#define GTK_WX_TREE_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_TREE_MODEL, GtkWxTreeModel)) +#define GTK_WX_TREE_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WX_TREE_MODEL, GtkWxTreeModelClass)) +#define GTK_IS_WX_TREE_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_TREE_MODEL)) +#define GTK_IS_WX_TREE_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_TREE_MODEL)) +#define GTK_WX_TREE_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WX_TREE_MODEL, GtkWxTreeModelClass)) -GType gtk_wx_list_store_get_type (void); +GType gtk_wx_tree_model_get_type (void); -typedef struct _GtkWxListStore GtkWxListStore; -typedef struct _GtkWxListStoreClass GtkWxListStoreClass; +typedef struct _GtkWxTreeModelClass GtkWxTreeModelClass; -struct _GtkWxListStore +struct _GtkWxTreeModel { GObject parent; /*< private >*/ gint stamp; - wxDataViewListModel *model; + wxDataViewCtrlInternal *internal; }; -struct _GtkWxListStoreClass +struct _GtkWxTreeModelClass { GObjectClass list_parent_class; }; -static GtkWxListStore *wxgtk_list_store_new (void); -static void wxgtk_list_store_init (GtkWxListStore *list_store); -static void wxgtk_list_store_class_init (GtkWxListStoreClass *klass); -static void wxgtk_list_store_tree_model_init (GtkTreeModelIface *iface); -static void wxgtk_list_store_finalize (GObject *object); -static GtkTreeModelFlags wxgtk_list_store_get_flags (GtkTreeModel *tree_model); -static gint wxgtk_list_store_get_n_columns (GtkTreeModel *tree_model); -static GType wxgtk_list_store_get_column_type (GtkTreeModel *tree_model, +static GtkWxTreeModel *wxgtk_tree_model_new (void); +static void wxgtk_tree_model_init (GtkWxTreeModel *tree_model); +static void wxgtk_tree_model_class_init (GtkWxTreeModelClass *klass); +static void wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface); +static void wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface); +static void wxgtk_tree_model_finalize (GObject *object); +static GtkTreeModelFlags wxgtk_tree_model_get_flags (GtkTreeModel *tree_model); +static gint wxgtk_tree_model_get_n_columns (GtkTreeModel *tree_model); +static GType wxgtk_tree_model_get_column_type (GtkTreeModel *tree_model, gint index); -static gboolean wxgtk_list_store_get_iter (GtkTreeModel *tree_model, +static gboolean wxgtk_tree_model_get_iter (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreePath *path); -static GtkTreePath *wxgtk_list_store_get_path (GtkTreeModel *tree_model, +static GtkTreePath *wxgtk_tree_model_get_path (GtkTreeModel *tree_model, GtkTreeIter *iter); -static void wxgtk_list_store_get_value (GtkTreeModel *tree_model, +static void wxgtk_tree_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, gint column, GValue *value); -static gboolean wxgtk_list_store_iter_next (GtkTreeModel *tree_model, +static gboolean wxgtk_tree_model_iter_next (GtkTreeModel *tree_model, GtkTreeIter *iter); -static gboolean wxgtk_list_store_iter_children (GtkTreeModel *tree_model, +static gboolean wxgtk_tree_model_iter_children (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *parent); -static gboolean wxgtk_list_store_iter_has_child (GtkTreeModel *tree_model, +static gboolean wxgtk_tree_model_iter_has_child (GtkTreeModel *tree_model, GtkTreeIter *iter); -static gint wxgtk_list_store_iter_n_children (GtkTreeModel *tree_model, +static gint wxgtk_tree_model_iter_n_children (GtkTreeModel *tree_model, GtkTreeIter *iter); -static gboolean wxgtk_list_store_iter_nth_child (GtkTreeModel *tree_model, +static gboolean wxgtk_tree_model_iter_nth_child (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *parent, gint n); -static gboolean wxgtk_list_store_iter_parent (GtkTreeModel *tree_model, +static gboolean wxgtk_tree_model_iter_parent (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *child); +/* sortable */ +static gboolean wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortable, + gint *sort_column_id, + GtkSortType *order); +static void wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable, + gint sort_column_id, + GtkSortType order); +static void wxgtk_tree_model_set_sort_func (GtkTreeSortable *sortable, + gint sort_column_id, + GtkTreeIterCompareFunc func, + gpointer data, + GtkDestroyNotify destroy); +static void wxgtk_tree_model_set_default_sort_func (GtkTreeSortable *sortable, + GtkTreeIterCompareFunc func, + gpointer data, + GtkDestroyNotify destroy); +static gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable *sortable); + + + static GObjectClass *list_parent_class = NULL; GType -gtk_wx_list_store_get_type (void) +gtk_wx_tree_model_get_type (void) { - static GType list_store_type = 0; + static GType tree_model_type = 0; - if (!list_store_type) + if (!tree_model_type) { - static const GTypeInfo list_store_info = + const GTypeInfo tree_model_info = { - sizeof (GtkWxListStoreClass), + sizeof (GtkWxTreeModelClass), NULL, /* base_init */ NULL, /* base_finalize */ - (GClassInitFunc) wxgtk_list_store_class_init, + (GClassInitFunc) wxgtk_tree_model_class_init, NULL, /* class_finalize */ NULL, /* class_data */ - sizeof (GtkWxListStore), + sizeof (GtkWxTreeModel), 0, - (GInstanceInitFunc) wxgtk_list_store_init, + (GInstanceInitFunc) wxgtk_tree_model_init, }; - static const GInterfaceInfo tree_model_info = - { - (GInterfaceInitFunc) wxgtk_list_store_tree_model_init, - NULL, - NULL - }; + static const GInterfaceInfo tree_model_iface_info = + { + (GInterfaceInitFunc) wxgtk_tree_model_tree_model_init, + NULL, + NULL + }; + + static const GInterfaceInfo sortable_iface_info = + { + (GInterfaceInitFunc) wxgtk_tree_model_sortable_init, + NULL, + NULL + }; - list_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkWxListStore", - &list_store_info, (GTypeFlags)0 ); + tree_model_type = g_type_register_static (G_TYPE_OBJECT, "GtkWxTreeModel", + &tree_model_info, (GTypeFlags)0 ); - g_type_add_interface_static (list_store_type, - GTK_TYPE_TREE_MODEL, - &tree_model_info); + g_type_add_interface_static (tree_model_type, + GTK_TYPE_TREE_MODEL, + &tree_model_iface_info); + g_type_add_interface_static (tree_model_type, + GTK_TYPE_TREE_SORTABLE, + &sortable_iface_info); } - return list_store_type; + return tree_model_type; } -static GtkWxListStore * -wxgtk_list_store_new(void) +static GtkWxTreeModel * +wxgtk_tree_model_new(void) { - GtkWxListStore *retval = (GtkWxListStore *) g_object_new (GTK_TYPE_WX_LIST_STORE, NULL); + GtkWxTreeModel *retval = (GtkWxTreeModel *) g_object_new (GTK_TYPE_WX_TREE_MODEL, NULL); return retval; } static void -wxgtk_list_store_class_init (GtkWxListStoreClass *klass) +wxgtk_tree_model_class_init (GtkWxTreeModelClass *klass) { list_parent_class = (GObjectClass*) g_type_class_peek_parent (klass); GObjectClass *object_class = (GObjectClass*) klass; - object_class->finalize = wxgtk_list_store_finalize; + object_class->finalize = wxgtk_tree_model_finalize; } static void -wxgtk_list_store_tree_model_init (GtkTreeModelIface *iface) -{ - iface->get_flags = wxgtk_list_store_get_flags; - iface->get_n_columns = wxgtk_list_store_get_n_columns; - iface->get_column_type = wxgtk_list_store_get_column_type; - iface->get_iter = wxgtk_list_store_get_iter; - iface->get_path = wxgtk_list_store_get_path; - iface->get_value = wxgtk_list_store_get_value; - iface->iter_next = wxgtk_list_store_iter_next; - iface->iter_children = wxgtk_list_store_iter_children; - iface->iter_has_child = wxgtk_list_store_iter_has_child; - iface->iter_n_children = wxgtk_list_store_iter_n_children; - iface->iter_nth_child = wxgtk_list_store_iter_nth_child; - iface->iter_parent = wxgtk_list_store_iter_parent; +wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface) +{ + iface->get_flags = wxgtk_tree_model_get_flags; + iface->get_n_columns = wxgtk_tree_model_get_n_columns; + iface->get_column_type = wxgtk_tree_model_get_column_type; + iface->get_iter = wxgtk_tree_model_get_iter; + iface->get_path = wxgtk_tree_model_get_path; + iface->get_value = wxgtk_tree_model_get_value; + iface->iter_next = wxgtk_tree_model_iter_next; + iface->iter_children = wxgtk_tree_model_iter_children; + iface->iter_has_child = wxgtk_tree_model_iter_has_child; + iface->iter_n_children = wxgtk_tree_model_iter_n_children; + iface->iter_nth_child = wxgtk_tree_model_iter_nth_child; + iface->iter_parent = wxgtk_tree_model_iter_parent; } static void -wxgtk_list_store_init (GtkWxListStore *list_store) +wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface) { - list_store->model = NULL; - list_store->stamp = g_random_int(); + iface->get_sort_column_id = wxgtk_tree_model_get_sort_column_id; + iface->set_sort_column_id = wxgtk_tree_model_set_sort_column_id; + iface->set_sort_func = wxgtk_tree_model_set_sort_func; + iface->set_default_sort_func = wxgtk_tree_model_set_default_sort_func; + iface->has_default_sort_func = wxgtk_tree_model_has_default_sort_func; } static void -wxgtk_list_store_finalize (GObject *object) +wxgtk_tree_model_init (GtkWxTreeModel *tree_model) { - /* GtkWxListStore *list_store = GTK_WX_LIST_STORE (object); */ - - /* we need to sort out, which class deletes what */ - /* delete list_store->model; */ + tree_model->internal = NULL; + tree_model->stamp = g_random_int(); +} +static void +wxgtk_tree_model_finalize (GObject *object) +{ /* must chain up */ (* list_parent_class->finalize) (object); } @@ -210,220 +431,249 @@ wxgtk_list_store_finalize (GObject *object) } // extern "C" //----------------------------------------------------------------------------- -// implement callbacks from wxGtkListStore class by letting -// them call the methods of wxWidgets' wxDataViewListModel +// implement callbacks from wxGtkTreeModel class by letting +// them call the methods of wxWidgets' wxDataViewModel //----------------------------------------------------------------------------- static GtkTreeModelFlags -wxgtk_list_store_get_flags (GtkTreeModel *tree_model) +wxgtk_tree_model_get_flags (GtkTreeModel *tree_model) { - g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), (GtkTreeModelFlags)0 ); + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (tree_model), (GtkTreeModelFlags)0 ); - // GTK+ list store uses a linked list for storing the - // items and a pointer to a child is used as the member - // field of a GtkTreeIter. This means that the iter is - // valid in the GtkListStore as long as the child exists. - // We use the index of the row and since the index of a - // specific row will change if a row above is deleted, - // the iter does not persist - return /* GTK_TREE_MODEL_ITERS_PERSIST | */ GTK_TREE_MODEL_LIST_ONLY; + return GTK_TREE_MODEL_ITERS_PERSIST; } static gint -wxgtk_list_store_get_n_columns (GtkTreeModel *tree_model) +wxgtk_tree_model_get_n_columns (GtkTreeModel *tree_model) { - GtkWxListStore *list_store = (GtkWxListStore *) tree_model; - g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), 0); + GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), 0); - return list_store->model->GetNumberOfCols(); + return wxtree_model->internal->GetDataViewModel()->GetColumnCount(); } static GType -wxgtk_list_store_get_column_type (GtkTreeModel *tree_model, +wxgtk_tree_model_get_column_type (GtkTreeModel *tree_model, gint index) { - GtkWxListStore *list_store = (GtkWxListStore *) tree_model; - g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), G_TYPE_INVALID); + GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), G_TYPE_INVALID); GType gtype = G_TYPE_INVALID; - wxString wxtype = list_store->model->GetColType( (unsigned int) index ); + wxString wxtype = wxtree_model->internal->GetDataViewModel()->GetColumnType( (unsigned int) index ); if (wxtype == wxT("string")) gtype = G_TYPE_STRING; + else + { + wxFAIL_MSG( _T("non-string columns not supported yet") ); + } return gtype; } static gboolean -wxgtk_list_store_get_iter (GtkTreeModel *tree_model, +wxgtk_tree_model_get_iter (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreePath *path) { - GtkWxListStore *list_store = (GtkWxListStore *) tree_model; - g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE); + GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) 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); - unsigned int i = (unsigned int)gtk_tree_path_get_indices (path)[0]; - - if (i >= list_store->model->GetNumberOfRows()) - return FALSE; - - iter->stamp = list_store->stamp; - // user_data is just the index - iter->user_data = (gpointer) i; - - return TRUE; + return wxtree_model->internal->get_iter( iter, path ); } static GtkTreePath * -wxgtk_list_store_get_path (GtkTreeModel *tree_model, +wxgtk_tree_model_get_path (GtkTreeModel *tree_model, GtkTreeIter *iter) { - g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), NULL); - g_return_val_if_fail (iter->stamp == GTK_WX_LIST_STORE (tree_model)->stamp, NULL); + GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), NULL); + g_return_val_if_fail (iter->stamp == GTK_WX_TREE_MODEL (wxtree_model)->stamp, NULL); - GtkTreePath *retval = gtk_tree_path_new (); - // user_data is just the index - int i = (wxUIntPtr) iter->user_data; - gtk_tree_path_append_index (retval, i); - return retval; + return wxtree_model->internal->get_path( iter ); } static void -wxgtk_list_store_get_value (GtkTreeModel *tree_model, +wxgtk_tree_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, gint column, GValue *value) { - GtkWxListStore *list_store = (GtkWxListStore *) tree_model; - g_return_if_fail (GTK_IS_WX_LIST_STORE (tree_model) ); + GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; + g_return_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model) ); - wxDataViewListModel *model = list_store->model; - wxString mtype = model->GetColType( (unsigned int) column ); + 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 ); - model->GetValue( variant, (unsigned int) column, (unsigned int) iter->user_data ); - g_value_set_string( value, wxGTK_CONV(variant.GetString()) ); + wxDataViewItem item( (void*) iter->user_data ); + model->GetValue( variant, item, (unsigned int) column ); + + g_value_set_string( value, variant.GetString().utf8_str() ); } else { + wxFAIL_MSG( _T("non-string columns not supported yet") ); } - -#if 0 - GtkTreeDataList *list; - gint tmp_column = column; - - g_return_if_fail (column < GTK_LIST_STORE (tree_model)->n_columns); - g_return_if_fail (GTK_LIST_STORE (tree_model)->stamp == iter->stamp); - - list = G_SLIST (iter->user_data)->data; - - while (tmp_column-- > 0 && list) - list = list->next; - - if (list == NULL) - g_value_init (value, GTK_LIST_STORE (tree_model)->column_headers[column]); - else - _gtk_tree_data_list_node_to_value (list, - GTK_LIST_STORE (tree_model)->column_headers[column], - value); -#endif - } static gboolean -wxgtk_list_store_iter_next (GtkTreeModel *tree_model, +wxgtk_tree_model_iter_next (GtkTreeModel *tree_model, GtkTreeIter *iter) { - g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE); - GtkWxListStore *list_store = (GtkWxListStore *) 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); - g_return_val_if_fail (list_store->stamp == iter->stamp, FALSE); - - int n = (wxUIntPtr) iter->user_data; - - if (n == -1) - return FALSE; - - if (n >= (int) list_store->model->GetNumberOfRows()-1) - return FALSE; - - iter->user_data = (gpointer) ++n; - - return TRUE; + return wxtree_model->internal->iter_next( iter ); } static gboolean -wxgtk_list_store_iter_children (GtkTreeModel *tree_model, +wxgtk_tree_model_iter_children (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *parent) { - g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE); - GtkWxListStore *list_store = (GtkWxListStore *) 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); - // this is a list, nodes have no children - if (parent) - return FALSE; - - iter->stamp = list_store->stamp; - iter->user_data = (gpointer) -1; - - return TRUE; + return wxtree_model->internal->iter_children( iter, parent ); } static gboolean -wxgtk_list_store_iter_has_child (GtkTreeModel *tree_model, +wxgtk_tree_model_iter_has_child (GtkTreeModel *tree_model, GtkTreeIter *iter) { - return FALSE; + 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); + + return wxtree_model->internal->iter_has_child( iter ); } static gint -wxgtk_list_store_iter_n_children (GtkTreeModel *tree_model, +wxgtk_tree_model_iter_n_children (GtkTreeModel *tree_model, GtkTreeIter *iter) { - g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), -1); - GtkWxListStore *list_store = (GtkWxListStore *) tree_model; - - if (iter == NULL) - return (gint) list_store->model->GetNumberOfRows(); - - g_return_val_if_fail (list_store->stamp == iter->stamp, -1); + 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); - return 0; + return wxtree_model->internal->iter_n_children( iter ); } static gboolean -wxgtk_list_store_iter_nth_child (GtkTreeModel *tree_model, +wxgtk_tree_model_iter_nth_child (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *parent, gint n) { - g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE); - GtkWxListStore *list_store = (GtkWxListStore *) tree_model; + GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - if (parent) - return FALSE; + return wxtree_model->internal->iter_nth_child( iter, parent, n ); +} - if (n < 0) - return FALSE; +static gboolean +wxgtk_tree_model_iter_parent (GtkTreeModel *tree_model, + GtkTreeIter *iter, + GtkTreeIter *child) +{ + 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); + + return wxtree_model->internal->iter_parent( iter, child ); +} - if (n >= (gint) list_store->model->GetNumberOfRows()) - return FALSE; +/* sortable */ +gboolean wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortable, + gint *sort_column_id, + GtkSortType *order) +{ + GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable; + + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE); + + if (!tree_model->internal->IsSorted()) + { + if (sort_column_id) + *sort_column_id = -1; + + return TRUE; + } - iter->stamp = list_store->stamp; - iter->user_data = (gpointer) n; + if (sort_column_id) + *sort_column_id = tree_model->internal->GetSortColumn(); + + if (order) + *order = tree_model->internal->GetSortOrder(); + return TRUE; } -static gboolean -wxgtk_list_store_iter_parent (GtkTreeModel *tree_model, - GtkTreeIter *iter, - GtkTreeIter *child) +wxDataViewColumn *gs_lastLeftClickHeader = NULL; + +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) ); + + tree_model->internal->SetDataViewSortColumn( gs_lastLeftClickHeader ); + + if ((sort_column_id != (gint) tree_model->internal->GetSortColumn()) || + (order != tree_model->internal->GetSortOrder())) + { + tree_model->internal->SetSortColumn( sort_column_id ); + tree_model->internal->SetSortOrder( order ); + + gtk_tree_sortable_sort_column_changed (sortable); + + tree_model->internal->GetDataViewModel()->Resort(); + } + + if (gs_lastLeftClickHeader) + { + wxDataViewCtrl *dv = tree_model->internal->GetOwner(); + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, dv->GetId() ); + event.SetDataViewColumn( gs_lastLeftClickHeader ); + event.SetModel( dv->GetModel() ); + dv->GetEventHandler()->ProcessEvent( event ); + } + + gs_lastLeftClickHeader = NULL; +} + +void wxgtk_tree_model_set_sort_func (GtkTreeSortable *sortable, + gint sort_column_id, + GtkTreeIterCompareFunc func, + gpointer data, + GtkDestroyNotify destroy) +{ + g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) ); + g_return_if_fail (func != NULL); +} + +void wxgtk_tree_model_set_default_sort_func (GtkTreeSortable *sortable, + GtkTreeIterCompareFunc func, + gpointer data, + GtkDestroyNotify destroy) +{ + g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) ); + g_return_if_fail (func != NULL); + + wxPrintf( "wxgtk_tree_model_set_default_sort_func\n" ); +} + +gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable *sortable) { return FALSE; } @@ -492,6 +742,15 @@ static gboolean gtk_wx_cell_renderer_activate( 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; @@ -504,7 +763,7 @@ gtk_wx_cell_renderer_get_type (void) if (!cell_wx_type) { - static const GTypeInfo cell_wx_info = + const GTypeInfo cell_wx_info = { sizeof (GtkWxCellRendererClass), NULL, /* base_init */ @@ -544,6 +803,7 @@ gtk_wx_cell_renderer_class_init (GtkWxCellRendererClass *klass) cell_class->get_size = gtk_wx_cell_renderer_get_size; cell_class->render = gtk_wx_cell_renderer_render; cell_class->activate = gtk_wx_cell_renderer_activate; + cell_class->start_editing = gtk_wx_cell_renderer_start_editing; } static void @@ -559,6 +819,48 @@ gtk_wx_cell_renderer_new (void) return (GtkCellRenderer*) g_object_new (GTK_TYPE_WX_CELL_RENDERER, NULL); } + + +static GtkCellEditable *gtk_wx_cell_renderer_start_editing( + GtkCellRenderer *renderer, + GdkEvent *event, + GtkWidget *widget, + const gchar *path, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkCellRendererState flags ) +{ + GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer; + wxDataViewCustomRenderer *cell = wxrenderer->cell; + if (!cell->HasEditorCtrl()) + return NULL; + + GdkRectangle rect; + gtk_wx_cell_renderer_get_size (renderer, widget, cell_area, + &rect.x, + &rect.y, + &rect.width, + &rect.height); + + rect.x += cell_area->x; + rect.y += cell_area->y; +// rect.width -= renderer->xpad * 2; +// rect.height -= renderer->ypad * 2; + +// wxRect renderrect( rect.x, rect.y, rect.width, rect.height ); + wxRect renderrect( cell_area->x, cell_area->y, cell_area->width, cell_area->height ); + + GtkTreePath *treepath = gtk_tree_path_new_from_string( path ); + GtkTreeIter iter; + cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, treepath ); + wxDataViewItem item( (void*) iter.user_data ); + gtk_tree_path_free( treepath ); + + cell->StartEditing( item, renderrect ); + + return NULL; +} + static void gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer, GtkWidget *widget, @@ -682,15 +984,26 @@ gtk_wx_cell_renderer_activate( wxRect renderrect( rect.x, rect.y, rect.width, rect.height ); - wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel(); + 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(); - if (event->type == GDK_BUTTON_PRESS) + if (!event) + { + bool ret = false; + + // activated by + if (cell->Activate( renderrect, model, item, model_col )) + ret = true; + + return ret; + } + else if (event->type == GDK_BUTTON_PRESS) { GdkEventButton *button_event = (GdkEventButton*) event; wxPoint pt( ((int) button_event->x) - renderrect.x, @@ -699,16 +1012,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; } @@ -721,180 +1034,344 @@ gtk_wx_cell_renderer_activate( } // --------------------------------------------------------- -// wxGtkDataViewListModelNotifier +// wxGtkDataViewModelNotifier // --------------------------------------------------------- -class wxGtkDataViewListModelNotifier: public wxDataViewListModelNotifier +class wxGtkDataViewModelNotifier: public wxDataViewModelNotifier { public: - wxGtkDataViewListModelNotifier( GtkWxListStore* gtk_store, wxDataViewListModel *wx_model ); - - virtual bool RowAppended(); - virtual bool RowPrepended(); - virtual bool RowInserted( unsigned int before ); - virtual bool RowDeleted( unsigned int row ); - virtual bool RowChanged( unsigned int row ); - virtual bool ValueChanged( unsigned int col, unsigned int row ); - virtual bool RowsReordered( unsigned int *new_order ); + wxGtkDataViewModelNotifier( GtkWxTreeModel *wxgtk_model, + wxDataViewModel *wx_model, + wxDataViewCtrl *ctrl ); + ~wxGtkDataViewModelNotifier(); + + virtual bool ItemAdded( const wxDataViewItem &parent, 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(); - GtkWxListStore *m_gtk_store; - wxDataViewListModel *m_wx_model; + GtkWxTreeModel *m_wxgtk_model; + wxDataViewModel *m_wx_model; + wxDataViewCtrl *m_owner; }; // --------------------------------------------------------- // wxGtkDataViewListModelNotifier // --------------------------------------------------------- -wxGtkDataViewListModelNotifier::wxGtkDataViewListModelNotifier( - GtkWxListStore* gtk_store, wxDataViewListModel *wx_model ) +wxGtkDataViewModelNotifier::wxGtkDataViewModelNotifier( + GtkWxTreeModel* wxgtk_model, wxDataViewModel *wx_model, + wxDataViewCtrl *ctrl ) { - m_gtk_store = gtk_store; + m_wxgtk_model = wxgtk_model; m_wx_model = wx_model; + m_owner = ctrl; } -bool wxGtkDataViewListModelNotifier::RowAppended() +wxGtkDataViewModelNotifier::~wxGtkDataViewModelNotifier() { - unsigned int pos = m_wx_model->GetNumberOfRows()-1; - - GtkTreeIter iter; - iter.stamp = m_gtk_store->stamp; - iter.user_data = (gpointer) pos; - - GtkTreePath *path = gtk_tree_path_new (); - gtk_tree_path_append_index (path, (gint) pos); - gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter); - gtk_tree_path_free (path); - - return true; + m_wx_model = NULL; + m_wxgtk_model = NULL; } -bool wxGtkDataViewListModelNotifier::RowPrepended() +bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) { + m_owner->GtkGetInternal()->ItemAdded( parent, item ); + GtkTreeIter iter; - iter.stamp = m_gtk_store->stamp; - iter.user_data = (gpointer) 0; + iter.stamp = m_wxgtk_model->stamp; + iter.user_data = (gpointer) item.GetID(); - GtkTreePath *path = gtk_tree_path_new (); - gtk_tree_path_append_index (path, (gint) 0); - gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter); + GtkTreePath *path = wxgtk_tree_model_get_path( + GTK_TREE_MODEL(m_wxgtk_model), &iter ); + gtk_tree_model_row_inserted( + GTK_TREE_MODEL(m_wxgtk_model), path, &iter); gtk_tree_path_free (path); return true; } -bool wxGtkDataViewListModelNotifier::RowInserted( unsigned int before ) +bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) { GtkTreeIter iter; - iter.stamp = m_gtk_store->stamp; - iter.user_data = (gpointer) before; + iter.stamp = m_wxgtk_model->stamp; + iter.user_data = (gpointer) item.GetID(); - GtkTreePath *path = gtk_tree_path_new (); - gtk_tree_path_append_index (path, (gint) before); - gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter); + GtkTreePath *path = wxgtk_tree_model_get_path( + GTK_TREE_MODEL(m_wxgtk_model), &iter ); + gtk_tree_model_row_deleted( + GTK_TREE_MODEL(m_wxgtk_model), path ); gtk_tree_path_free (path); + m_owner->GtkGetInternal()->ItemDeleted( parent, item ); + return true; } -bool wxGtkDataViewListModelNotifier::RowDeleted( unsigned int row ) +void wxGtkDataViewModelNotifier::Resort() { - GtkTreePath *path = gtk_tree_path_new (); - gtk_tree_path_append_index (path, (gint) row); - gtk_tree_model_row_deleted (GTK_TREE_MODEL (m_gtk_store), path); - gtk_tree_path_free (path); - - return true; + m_owner->GtkGetInternal()->Resort(); } -bool wxGtkDataViewListModelNotifier::RowChanged( unsigned int row ) +bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item ) { GtkTreeIter iter; - iter.stamp = m_gtk_store->stamp; - iter.user_data = (gpointer) row; - GtkTreePath *path = gtk_tree_model_get_path (GTK_TREE_MODEL (m_gtk_store), &iter); - gtk_tree_model_row_changed (GTK_TREE_MODEL (m_gtk_store), path, &iter); + iter.stamp = m_wxgtk_model->stamp; + iter.user_data = (gpointer) item.GetID(); + + GtkTreePath *path = wxgtk_tree_model_get_path( + GTK_TREE_MODEL(m_wxgtk_model), &iter ); + gtk_tree_model_row_changed( + GTK_TREE_MODEL(m_wxgtk_model), path, &iter ); gtk_tree_path_free (path); + m_owner->GtkGetInternal()->ItemChanged( item ); + return true; } -bool wxGtkDataViewListModelNotifier::ValueChanged( unsigned int model_col, unsigned int model_row ) +bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsigned int model_col ) { // This adds GTK+'s missing MVC logic for ValueChanged - wxNode *node = GetOwner()->m_viewingColumns.GetFirst(); - while (node) + unsigned int index; + for (index = 0; index < m_owner->GetColumnCount(); index++) { - wxDataViewViewingColumn* viewing_column = (wxDataViewViewingColumn*) node->GetData(); - if (viewing_column->m_modelColumn == model_col) + wxDataViewColumn *column = m_owner->GetColumn( index ); + if (column->GetModelColumn() == model_col) { - GtkTreeView *widget = GTK_TREE_VIEW(viewing_column->m_viewColumn->GetOwner()->m_treeview); - GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(viewing_column->m_viewColumn->GetGtkHandle()); + GtkTreeView *widget = GTK_TREE_VIEW(m_owner->m_treeview); + GtkTreeViewColumn *gcolumn = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()); // Get cell area - GtkTreePath *path = gtk_tree_path_new(); - gtk_tree_path_append_index( path, model_row ); + GtkTreeIter iter; + iter.stamp = m_wxgtk_model->stamp; + iter.user_data = (gpointer) item.GetID(); + GtkTreePath *path = wxgtk_tree_model_get_path( + GTK_TREE_MODEL(m_wxgtk_model), &iter ); GdkRectangle cell_area; - gtk_tree_view_get_cell_area( widget, path, column, &cell_area ); + gtk_tree_view_get_cell_area( widget, path, gcolumn, &cell_area ); gtk_tree_path_free( path ); - int ydiff = column->button->allocation.height; + GtkAdjustment* hadjust = gtk_tree_view_get_hadjustment( widget ); + double d = gtk_adjustment_get_value( hadjust ); + int xdiff = (int) d; + + int ydiff = gcolumn->button->allocation.height; // Redraw gtk_widget_queue_draw_area( GTK_WIDGET(widget), - cell_area.x, ydiff + cell_area.y, cell_area.width, cell_area.height ); + cell_area.x - xdiff, ydiff + cell_area.y, cell_area.width, cell_area.height ); + + m_owner->GtkGetInternal()->ValueChanged( item, model_col ); + + return true; } - - node = node->GetNext(); } - return true; + return false; } -bool wxGtkDataViewListModelNotifier::RowsReordered( unsigned int *new_order ) +bool wxGtkDataViewModelNotifier::Cleared() { - // Assume sizeof(unsigned int)= == sizeof(gint) + // TODO: delete everything - GtkTreePath *path = gtk_tree_path_new (); - gtk_tree_model_rows_reordered (GTK_TREE_MODEL (m_gtk_store), path, NULL, (gint*)new_order); - gtk_tree_path_free (path); + m_owner->GtkGetInternal()->Cleared(); + + return false; +} - // This adds GTK+'s missing MVC logic for RowsReordered - wxNode *node = GetOwner()->m_viewingColumns.GetFirst(); - while (node) - { - wxDataViewViewingColumn* viewing_column = (wxDataViewViewingColumn*) node->GetData(); - GtkTreeView *widget = GTK_TREE_VIEW(viewing_column->m_viewColumn->GetOwner()->m_treeview); - // Doesn't work yet... - gtk_widget_queue_draw( GTK_WIDGET(widget) ); +// --------------------------------------------------------- +// wxDataViewRenderer +// --------------------------------------------------------- - node = node->GetNext(); - } +static gpointer s_user_data = NULL; - return true; +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 ); } -bool wxGtkDataViewListModelNotifier::Cleared() +static void +wxgtk_renderer_editing_started( GtkCellRenderer *cell, GtkCellEditable *editable, + gchar *path, wxDataViewRenderer *wxrenderer ) { - return false; + 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 ); + + } } -// --------------------------------------------------------- -// wxDataViewRenderer -// --------------------------------------------------------- IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase) -wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewRendererBase( varianttype, mode ) +wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode, + int align ) : + wxDataViewRendererBase( varianttype, mode, align ) { m_renderer = NULL; -} -// --------------------------------------------------------- -// wxDataViewTextRenderer -// --------------------------------------------------------- + // NOTE: SetMode() and SetAlignment() needs to be called in the renderer's ctor, + // after the m_renderer pointer has been initialized +} -extern "C" { +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; + switch (mode) + { + case wxDATAVIEW_CELL_INERT: + gtkMode = GTK_CELL_RENDERER_MODE_INERT; + break; + case wxDATAVIEW_CELL_ACTIVATABLE: + gtkMode = GTK_CELL_RENDERER_MODE_ACTIVATABLE; + break; + case wxDATAVIEW_CELL_EDITABLE: + gtkMode = GTK_CELL_RENDERER_MODE_EDITABLE; + break; + } + + // This value is most often ignored in GtkTreeView + GValue gvalue = { 0, }; + g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() ); + g_value_set_enum( &gvalue, gtkMode ); + g_object_set_property( G_OBJECT(m_renderer), "mode", &gvalue ); + g_value_unset( &gvalue ); +} + +wxDataViewCellMode wxDataViewRenderer::GetMode() const +{ + wxDataViewCellMode ret; + + GValue gvalue; + g_object_get( G_OBJECT(m_renderer), "mode", &gvalue, NULL); + + switch (g_value_get_enum(&gvalue)) + { + case GTK_CELL_RENDERER_MODE_INERT: + ret = wxDATAVIEW_CELL_INERT; + break; + case GTK_CELL_RENDERER_MODE_ACTIVATABLE: + ret = wxDATAVIEW_CELL_ACTIVATABLE; + break; + case GTK_CELL_RENDERER_MODE_EDITABLE: + ret = wxDATAVIEW_CELL_EDITABLE; + break; + } + + g_value_unset( &gvalue ); + + return ret; +} + +void wxDataViewRenderer::SetAlignment( int align ) +{ + // horizontal alignment: + + gfloat xalign = 0.0; + if (align & wxALIGN_RIGHT) + xalign = 1.0; + else if (align & wxALIGN_CENTER_HORIZONTAL) + xalign = 0.5; + + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_FLOAT ); + g_value_set_float( &gvalue, xalign ); + g_object_set_property( G_OBJECT(m_renderer), "xalign", &gvalue ); + g_value_unset( &gvalue ); + + // vertical alignment: + + gfloat yalign = 0.0; + if (align & wxALIGN_BOTTOM) + yalign = 1.0; + else if (align & wxALIGN_CENTER_VERTICAL) + yalign = 0.5; + + GValue gvalue2 = { 0, }; + g_value_init( &gvalue2, G_TYPE_FLOAT ); + g_value_set_float( &gvalue2, yalign ); + g_object_set_property( G_OBJECT(m_renderer), "yalign", &gvalue2 ); + g_value_unset( &gvalue2 ); +} + +int wxDataViewRenderer::GetAlignment() const +{ + int ret = 0; + GValue gvalue; + + // horizontal alignment: + + g_object_get( G_OBJECT(m_renderer), "xalign", &gvalue, NULL ); + float xalign = g_value_get_float( &gvalue ); + if (xalign < 0.5) + ret |= wxALIGN_LEFT; + else if (xalign == 0.5) + ret |= wxALIGN_CENTER_HORIZONTAL; + else + ret |= wxALIGN_RIGHT; + g_value_unset( &gvalue ); + + + // vertical alignment: + + g_object_get( G_OBJECT(m_renderer), "yalign", &gvalue, NULL ); + float yalign = g_value_get_float( &gvalue ); + if (yalign < 0.5) + ret |= wxALIGN_TOP; + else if (yalign == 0.5) + ret |= wxALIGN_CENTER_VERTICAL; + else + ret |= wxALIGN_BOTTOM; + g_value_unset( &gvalue ); + + return ret; +} + + + +// --------------------------------------------------------- +// wxDataViewTextRenderer +// --------------------------------------------------------- + +extern "C" { static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer, gchar *arg1, gchar *arg2, gpointer user_data ); } @@ -904,31 +1381,34 @@ static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer, { wxDataViewTextRenderer *cell = (wxDataViewTextRenderer*) user_data; - wxString tmp = wxGTK_CONV_BACK( arg2 ); + wxString tmp = wxGTK_CONV_BACK_FONT(arg2, cell->GetOwner()->GetOwner()->GetFont()); wxVariant value = tmp; if (!cell->Validate( value )) return; - wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel(); + 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) -wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewRenderer( varianttype, mode ) +wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode, + int align ) : + wxDataViewRenderer( varianttype, mode, align ) { - m_renderer = (void*) gtk_cell_renderer_text_new(); + m_renderer = (GtkCellRenderer*) gtk_cell_renderer_text_new(); - if (m_mode & wxDATAVIEW_CELL_EDITABLE) + if (mode & wxDATAVIEW_CELL_EDITABLE) { GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_BOOLEAN ); @@ -937,7 +1417,12 @@ wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxD g_value_unset( &gvalue ); g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this ); + + GtkInitHandlers(); } + + SetMode(mode); + SetAlignment(align); } bool wxDataViewTextRenderer::SetValue( const wxVariant &value ) @@ -946,19 +1431,20 @@ bool wxDataViewTextRenderer::SetValue( const wxVariant &value ) GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_STRING ); - g_value_set_string( &gvalue, wxGTK_CONV( tmp ) ); + g_value_set_string( &gvalue, wxGTK_CONV_FONT( tmp, GetOwner()->GetOwner()->GetFont() ) ); g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); g_value_unset( &gvalue ); return true; } -bool wxDataViewTextRenderer::GetValue( wxVariant &value ) +bool wxDataViewTextRenderer::GetValue( wxVariant &value ) const { GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_STRING ); g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue ); - wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &gvalue ) ); + wxString tmp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ), + wx_const_cast(wxDataViewTextRenderer*, this)->GetOwner()->GetOwner()->GetFont() ); g_value_unset( &gvalue ); value = tmp; @@ -966,16 +1452,41 @@ bool wxDataViewTextRenderer::GetValue( wxVariant &value ) return true; } -// --------------------------------------------------------- +void wxDataViewTextRenderer::SetAlignment( int align ) +{ + wxDataViewRenderer::SetAlignment(align); + + if (gtk_check_version(2,10,0)) + return; + + // horizontal alignment: + PangoAlignment pangoAlign = PANGO_ALIGN_LEFT; + if (align & wxALIGN_RIGHT) + pangoAlign = PANGO_ALIGN_RIGHT; + else if (align & wxALIGN_CENTER_HORIZONTAL) + pangoAlign = PANGO_ALIGN_CENTER; + + GValue gvalue = { 0, }; + g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() ); + g_value_set_enum( &gvalue, pangoAlign ); + g_object_set_property( G_OBJECT(m_renderer), "alignment", &gvalue ); + g_value_unset( &gvalue ); +} + +// --------------------------------------------------------- // wxDataViewBitmapRenderer -// --------------------------------------------------------- +// --------------------------------------------------------- IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer) -wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewRenderer( varianttype, mode ) +wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode, + int align ) : + wxDataViewRenderer( varianttype, mode, align ) { - m_renderer = (void*) gtk_cell_renderer_pixbuf_new(); + m_renderer = (GtkCellRenderer*) gtk_cell_renderer_pixbuf_new(); + + SetMode(mode); + SetAlignment(align); } bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value ) @@ -984,46 +1495,46 @@ bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value ) { wxBitmap bitmap; bitmap << value; - + // This may create a Pixbuf representation in the // wxBitmap object (and it will stay there) GdkPixbuf *pixbuf = bitmap.GetPixbuf(); - + GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_OBJECT ); g_value_set_object( &gvalue, pixbuf ); g_object_set_property( G_OBJECT(m_renderer), "pixbuf", &gvalue ); g_value_unset( &gvalue ); - + return true; } - + if (value.GetType() == wxT("wxIcon")) { wxIcon bitmap; bitmap << value; - + // This may create a Pixbuf representation in the // wxBitmap object (and it will stay there) GdkPixbuf *pixbuf = bitmap.GetPixbuf(); - + GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_OBJECT ); g_value_set_object( &gvalue, pixbuf ); g_object_set_property( G_OBJECT(m_renderer), "pixbuf", &gvalue ); g_value_unset( &gvalue ); - + return true; } - + return false; } -bool wxDataViewBitmapRenderer::GetValue( wxVariant &value ) +bool wxDataViewBitmapRenderer::GetValue( wxVariant &value ) const { return false; } - + // --------------------------------------------------------- // wxDataViewToggleRenderer // --------------------------------------------------------- @@ -1051,46 +1562,44 @@ static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer, if (!cell->Validate( value )) return; - wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel(); + 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) wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype, - wxDataViewCellMode mode ) : - wxDataViewRenderer( varianttype, mode ) + wxDataViewCellMode mode, int align ) : + wxDataViewRenderer( varianttype, mode, align ) { - m_renderer = (void*) gtk_cell_renderer_toggle_new(); + m_renderer = (GtkCellRenderer*) gtk_cell_renderer_toggle_new(); - if (m_mode & wxDATAVIEW_CELL_ACTIVATABLE) + if (mode & wxDATAVIEW_CELL_ACTIVATABLE) { - g_signal_connect_after( m_renderer, "toggled", G_CALLBACK(wxGtkToggleRendererToggledCallback), this ); + g_signal_connect_after( m_renderer, "toggled", + G_CALLBACK(wxGtkToggleRendererToggledCallback), this ); } else { - GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_BOOLEAN ); g_value_set_boolean( &gvalue, false ); g_object_set_property( G_OBJECT(m_renderer), "activatable", &gvalue ); g_value_unset( &gvalue ); - - GValue gvalue2 = { 0, }; - g_value_init( &gvalue2, gtk_cell_renderer_mode_get_type() ); - g_value_set_enum( &gvalue2, GTK_CELL_RENDERER_MODE_INERT ); - g_object_set_property( G_OBJECT(m_renderer), "mode", &gvalue2 ); - g_value_unset( &gvalue2 ); - } + + SetMode(mode); + SetAlignment(align); } bool wxDataViewToggleRenderer::SetValue( const wxVariant &value ) @@ -1106,7 +1615,7 @@ bool wxDataViewToggleRenderer::SetValue( const wxVariant &value ) return true; } -bool wxDataViewToggleRenderer::GetValue( wxVariant &value ) +bool wxDataViewToggleRenderer::GetValue( wxVariant &value ) const { GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_BOOLEAN ); @@ -1151,33 +1660,30 @@ public: IMPLEMENT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer) wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, - wxDataViewCellMode mode, bool no_init ) : - wxDataViewRenderer( varianttype, mode ) + wxDataViewCellMode mode, int align, + bool no_init ) : + wxDataViewRenderer( varianttype, mode, align ) { m_dc = NULL; if (no_init) m_renderer = NULL; else - Init(); + Init(mode, align); } -bool wxDataViewCustomRenderer::Init() +bool wxDataViewCustomRenderer::Init(wxDataViewCellMode mode, int align) { GtkWxCellRenderer *renderer = (GtkWxCellRenderer *) gtk_wx_cell_renderer_new(); renderer->cell = this; - m_renderer = (void*) renderer; + m_renderer = (GtkCellRenderer*) renderer; - if (m_mode & wxDATAVIEW_CELL_ACTIVATABLE) - { - GValue gvalue = { 0, }; - g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() ); - g_value_set_enum( &gvalue, GTK_CELL_RENDERER_MODE_ACTIVATABLE ); - g_object_set_property( G_OBJECT(m_renderer), "mode", &gvalue ); - g_value_unset( &gvalue ); - } + SetMode(mode); + SetAlignment(align); + GtkInitHandlers(); + return true; } @@ -1208,8 +1714,8 @@ wxDC *wxDataViewCustomRenderer::GetDC() IMPLEMENT_CLASS(wxDataViewProgressRenderer, wxDataViewCustomRenderer) wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label, - const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCustomRenderer( varianttype, mode, true ) + const wxString &varianttype, wxDataViewCellMode mode, int align ) : + wxDataViewCustomRenderer( varianttype, mode, align, true ) { m_label = label; m_value = 0; @@ -1217,19 +1723,24 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label, #ifdef __WXGTK26__ if (!gtk_check_version(2,6,0)) { - m_renderer = (void*) gtk_cell_renderer_progress_new(); + m_renderer = (GtkCellRenderer*) gtk_cell_renderer_progress_new(); GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_STRING ); - g_value_set_boolean( &gvalue, wxGTK_CONV(m_label) ); + + // FIXME: font encoding support + g_value_set_string( &gvalue, wxGTK_CONV_SYS(m_label) ); g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); g_value_unset( &gvalue ); + + SetMode(mode); + SetAlignment(align); } else #endif { // Use custom cell code - wxDataViewCustomRenderer::Init(); + wxDataViewCustomRenderer::Init(mode, align); } } @@ -1242,10 +1753,10 @@ bool wxDataViewProgressRenderer::SetValue( const wxVariant &value ) #ifdef __WXGTK26__ if (!gtk_check_version(2,6,0)) { - gint tmp = (int) value; + gint tmp = (long) value; GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_INT ); - g_value_set_boolean( &gvalue, tmp ); + g_value_set_int( &gvalue, tmp ); g_object_set_property( G_OBJECT(m_renderer), "value", &gvalue ); g_value_unset( &gvalue ); } @@ -1261,6 +1772,11 @@ bool wxDataViewProgressRenderer::SetValue( const wxVariant &value ) return true; } +bool wxDataViewProgressRenderer::GetValue( wxVariant &value ) const +{ + return false; +} + bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int state ) { double pct = (double)m_value / 100.0; @@ -1277,7 +1793,7 @@ bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int state ) return true; } -wxSize wxDataViewProgressRenderer::GetSize() +wxSize wxDataViewProgressRenderer::GetSize() const { return wxSize(40,12); } @@ -1290,12 +1806,12 @@ class wxDataViewDateRendererPopupTransient: public wxPopupTransientWindow { public: wxDataViewDateRendererPopupTransient( wxWindow* parent, wxDateTime *value, - wxDataViewListModel *model, unsigned int col, unsigned int row ) : + wxDataViewModel *model, const wxDataViewItem &item, unsigned int col ) : wxPopupTransientWindow( parent, wxBORDER_SIMPLE ) { m_model = model; + m_item = item; m_col = col; - m_row = row; m_cal = new wxCalendarCtrl( this, -1, *value ); wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL ); sizer->Add( m_cal, 1, wxGROW ); @@ -1309,10 +1825,10 @@ public: void OnCalendar( wxCalendarEvent &event ); - wxCalendarCtrl *m_cal; - wxDataViewListModel *m_model; - unsigned int m_col; - unsigned int m_row; + wxCalendarCtrl *m_cal; + wxDataViewModel *m_model; + wxDataViewItem m_item; + unsigned int m_col; private: DECLARE_EVENT_TABLE() @@ -1326,17 +1842,19 @@ void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event ) { wxDateTime date = event.GetDate(); wxVariant value = date; - m_model->SetValue( value, m_col, m_row ); - m_model->ValueChanged( m_col, m_row ); + m_model->SetValue( value, m_item, m_col ); + m_model->ValueChanged( m_item, m_col ); DismissAndNotify(); } IMPLEMENT_CLASS(wxDataViewDateRenderer, wxDataViewCustomRenderer) wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype, - wxDataViewCellMode mode ) : - wxDataViewCustomRenderer( varianttype, mode ) + wxDataViewCellMode mode, int align ) : + wxDataViewCustomRenderer( varianttype, mode, align ) { + SetMode(mode); + SetAlignment(align); } bool wxDataViewDateRenderer::SetValue( const wxVariant &value ) @@ -1346,6 +1864,11 @@ bool wxDataViewDateRenderer::SetValue( const wxVariant &value ) return true; } +bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const +{ + return false; +} + bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state ) { dc->SetFont( GetOwner()->GetOwner()->GetFont() ); @@ -1355,23 +1878,23 @@ bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state ) return true; } -wxSize wxDataViewDateRenderer::GetSize() +wxSize wxDataViewDateRenderer::GetSize() const { - wxDataViewCtrl* view = GetOwner()->GetOwner(); wxString tmp = m_date.FormatDate(); wxCoord x,y,d; - view->GetTextExtent( tmp, &x, &y, &d ); + GetView()->GetTextExtent( tmp, &x, &y, &d ); return wxSize(x,y+d); } -bool wxDataViewDateRenderer::Activate( wxRect cell, wxDataViewListModel *model, unsigned int col, unsigned int row ) +bool wxDataViewDateRenderer::Activate( wxRect cell, wxDataViewModel *model, + const wxDataViewItem &item, unsigned int col ) { wxVariant variant; - model->GetValue( variant, col, row ); + model->GetValue( variant, item, col ); wxDateTime value = variant.GetDateTime(); wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient( - GetOwner()->GetOwner()->GetParent(), &value, model, col, row ); + GetOwner()->GetOwner()->GetParent(), &value, model, item, col ); wxPoint pos = wxGetMousePosition(); popup->Move( pos ); popup->Layout(); @@ -1380,10 +1903,105 @@ bool wxDataViewDateRenderer::Activate( wxRect cell, wxDataViewListModel *model, return true; } + +// --------------------------------------------------------- +// wxDataViewIconTextRenderer +// --------------------------------------------------------- + +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 ) +{ + if (gdk_event->type != GDK_BUTTON_PRESS) + return FALSE; + + if (gdk_event->button == 1) + { + gs_lastLeftClickHeader = column; + + wxDataViewCtrl *dv = column->GetOwner(); + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() ); + event.SetDataViewColumn( column ); + event.SetModel( dv->GetModel() ); + if (dv->GetEventHandler()->ProcessEvent( event )) + return FALSE; + } + + if (gdk_event->button == 3) + { + wxDataViewCtrl *dv = column->GetOwner(); + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, dv->GetId() ); + event.SetDataViewColumn( column ); + event.SetModel( dv->GetModel() ); + if (dv->GetEventHandler()->ProcessEvent( event )) + return FALSE; + } + + return FALSE; +} + extern "C" { static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, GtkCellRenderer *cell, @@ -1399,172 +2017,1058 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, GtkTreeIter *iter, gpointer data ) { - g_return_if_fail (GTK_IS_WX_LIST_STORE (model)); - GtkWxListStore *list_store = (GtkWxListStore *) model; + g_return_if_fail (GTK_IS_WX_TREE_MODEL (model)); + GtkWxTreeModel *tree_model = (GtkWxTreeModel *) model; wxDataViewRenderer *cell = (wxDataViewRenderer*) data; - unsigned int model_row = (unsigned int) iter->user_data; + wxDataViewItem item( (void*) iter->user_data ); wxVariant value; - list_store->model->GetValue( value, cell->GetOwner()->GetModelColumn(), model_row ); + tree_model->internal->GetDataViewModel()->GetValue( value, item, cell->GetOwner()->GetModelColumn() ); if (value.GetType() != cell->GetVariantType()) - wxLogError( wxT("Wrong type, required: %s but: %s"), - value.GetType().c_str(), + wxLogError( wxT("Wrong type, required: %s but: %s"), + value.GetType().c_str(), cell->GetVariantType().c_str() ); cell->SetValue( value ); + +#if 0 + wxListItemAttr attr; + tree_model->model->GetAttr( attr, cell->GetOwner()->GetModelColumn(), model_row ); + + if (attr.HasBackgroundColour()) + { + wxColour colour = attr.GetBackgroundColour(); + const GdkColor * const gcol = colour.GetColor(); + + GValue gvalue = { 0, }; + g_value_init( &gvalue, GDK_TYPE_COLOR ); + g_value_set_boxed( &gvalue, gcol ); + g_object_set_property( G_OBJECT(renderer), "cell-background_gdk", &gvalue ); + g_value_unset( &gvalue ); + } + else + { + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_BOOLEAN ); + g_value_set_boolean( &gvalue, FALSE ); + g_object_set_property( G_OBJECT(renderer), "cell-background-set", &gvalue ); + g_value_unset( &gvalue ); + } +#endif + } IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase) -wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell, unsigned int model_column, - int width, int flags ) : - wxDataViewColumnBase( title, cell, model_column, width, flags ) +#include +WX_DEFINE_LIST(wxDataViewColumnList); + +wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell, + unsigned int model_column, int width, + wxAlignment align, int flags ) : + wxDataViewColumnBase( title, cell, model_column, width, align, flags ) +{ + Init( align, flags, width ); + + gtk_tree_view_column_set_clickable( GTK_TREE_VIEW_COLUMN(m_column), TRUE ); + SetTitle( title ); +} + +wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell, + unsigned int model_column, int width, + wxAlignment align, int flags ) : + wxDataViewColumnBase( bitmap, cell, model_column, width, align, flags ) +{ + Init( align, flags, width ); + + SetBitmap( bitmap ); +} + +void wxDataViewColumn::Init(wxAlignment align, int flags, int width) { - GtkCellRenderer *renderer = (GtkCellRenderer *) cell->GetGtkHandle(); + m_isConnected = false; + GtkCellRenderer *renderer = (GtkCellRenderer *) GetRenderer()->GetGtkHandle(); GtkTreeViewColumn *column = gtk_tree_view_column_new(); + m_column = (GtkWidget*) column; - gtk_tree_view_column_set_title( column, wxGTK_CONV(title) ); + SetFlags( flags ); + SetAlignment( align ); - if (flags & wxDATAVIEW_COL_RESIZABLE) - gtk_tree_view_column_set_resizable( column, true ); - if (flags & wxDATAVIEW_COL_HIDDEN) - gtk_tree_view_column_set_visible( column, false ); - if (flags & wxDATAVIEW_COL_SORTABLE) - gtk_tree_view_column_set_sort_indicator( column, true ); + // NOTE: we prefer not to call SetMinWidth(wxDVC_DEFAULT_MINWIDTH); + // as GTK+ is smart and unless explicitely told, will set the minimal + // width to the title's lenght, which is a better default - if (width > 0) - { - gtk_tree_view_column_set_fixed_width( column, width ); - gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED ); - } + // the GTK_TREE_VIEW_COLUMN_FIXED is required by the "fixed height" mode + // that we use for the wxDataViewCtrl + gtk_tree_view_column_set_fixed_width( column, width < 0 ? wxDVC_DEFAULT_WIDTH : width ); + gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED ); - gtk_tree_view_column_pack_end( column, renderer, FALSE ); + gtk_tree_view_column_pack_end( column, renderer, TRUE ); gtk_tree_view_column_set_cell_data_func( column, renderer, - wxGtkTreeCellDataFunc, (gpointer) cell, NULL ); - - m_column = (void*) column; + wxGtkTreeCellDataFunc, (gpointer) GetRenderer(), NULL ); } wxDataViewColumn::~wxDataViewColumn() { } -void wxDataViewColumn::SetTitle( const wxString &title ) +void wxDataViewColumn::OnInternalIdle() { - wxDataViewColumnBase::SetTitle( title ); + if (m_isConnected) + return; + + if (GTK_WIDGET_REALIZED(GetOwner()->m_treeview)) + { + GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); + if (column->button) + { + g_signal_connect(column->button, "button_press_event", + G_CALLBACK (gtk_dataview_header_button_press_callback), this); - GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column; - gtk_tree_view_column_set_title( column, wxGTK_CONV(title) ); + m_isConnected = true; + } + } } -int wxDataViewColumn::GetWidth() +void wxDataViewColumn::SetOwner( wxDataViewCtrl *owner ) { - return gtk_tree_view_column_get_width( (GtkTreeViewColumn *)m_column ); + wxDataViewColumnBase::SetOwner( owner ); + + GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); + + gtk_tree_view_column_set_title( column, wxGTK_CONV_FONT(GetTitle(), GetOwner()->GetFont() ) ); } -void wxDataViewColumn::SetFixedWidth( int width ) +void wxDataViewColumn::SetTitle( const wxString &title ) { - gtk_tree_view_column_set_fixed_width( (GtkTreeViewColumn *)m_column, width ); + GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); + + if (m_isConnected) + { + // disconnect before column->button gets recreated + g_signal_handlers_disconnect_by_func( column->button, + (GtkWidget*) gtk_dataview_header_button_press_callback, this); + + m_isConnected = false; + } + + // FIXME: can it really happen that we don't have the owner here?? + wxDataViewCtrl *ctrl = GetOwner(); + gtk_tree_view_column_set_title( column, ctrl ? wxGTK_CONV_FONT(title, ctrl->GetFont()) + : wxGTK_CONV_SYS(title) ); + + gtk_tree_view_column_set_widget( column, NULL ); } -int wxDataViewColumn::GetFixedWidth() +wxString wxDataViewColumn::GetTitle() const { - return gtk_tree_view_column_get_fixed_width( (GtkTreeViewColumn *)m_column ); + const gchar *str = gtk_tree_view_column_get_title( GTK_TREE_VIEW_COLUMN(m_column) ); + return wxConvFileName->cMB2WX(str); } -//----------------------------------------------------------------------------- -// wxDataViewCtrl signal callbacks -//----------------------------------------------------------------------------- - -static void -wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCtrl *dv ) +void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap ) { - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ROW_SELECTED, dv->GetId() ); - event.SetRow( dv->GetSelection() ); - event.SetModel( dv->GetModel() ); - dv->GetEventHandler()->ProcessEvent( event ); -} + wxDataViewColumnBase::SetBitmap( bitmap ); -//----------------------------------------------------------------------------- -// wxDataViewCtrl -//----------------------------------------------------------------------------- + GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); + if (bitmap.Ok()) + { + GtkImage *gtk_image = GTK_IMAGE( gtk_image_new() ); -IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase) + GdkBitmap *mask = (GdkBitmap *) NULL; + if (bitmap.GetMask()) + mask = bitmap.GetMask()->GetBitmap(); -wxDataViewCtrl::~wxDataViewCtrl() + if (bitmap.HasPixbuf()) + { + gtk_image_set_from_pixbuf(GTK_IMAGE(gtk_image), + bitmap.GetPixbuf()); + } + else + { + gtk_image_set_from_pixmap(GTK_IMAGE(gtk_image), + bitmap.GetPixmap(), mask); + } + gtk_widget_show( GTK_WIDGET(gtk_image) ); + + gtk_tree_view_column_set_widget( column, GTK_WIDGET(gtk_image) ); + } + else + { + gtk_tree_view_column_set_widget( column, NULL ); + } +} + +void wxDataViewColumn::SetHidden( bool hidden ) { - if (m_notifier) - GetModel()->RemoveNotifier( m_notifier ); + gtk_tree_view_column_set_visible( GTK_TREE_VIEW_COLUMN(m_column), !hidden ); } -void wxDataViewCtrl::Init() +void wxDataViewColumn::SetResizeable( bool resizeable ) { - m_notifier = NULL; + gtk_tree_view_column_set_resizable( GTK_TREE_VIEW_COLUMN(m_column), resizeable ); } -bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxValidator& validator ) +void wxDataViewColumn::SetAlignment( wxAlignment align ) { - Init(); + GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - m_needParent = true; - m_acceptsFocus = true; + gfloat xalign = 0.0; + if (align == wxALIGN_RIGHT) + xalign = 1.0; + if (align == wxALIGN_CENTER_HORIZONTAL || + align == wxALIGN_CENTER) + xalign = 0.5; - if (!PreCreation( parent, pos, size ) || - !CreateBase( parent, id, pos, size, style, validator )) - { - wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") ); - return false; - } + gtk_tree_view_column_set_alignment( column, xalign ); +} - m_widget = gtk_scrolled_window_new (NULL, NULL); +wxAlignment wxDataViewColumn::GetAlignment() const +{ + gfloat xalign = gtk_tree_view_column_get_alignment( GTK_TREE_VIEW_COLUMN(m_column) ); - GtkScrolledWindowSetBorder(m_widget, style); + if (xalign == 1.0) + return wxALIGN_RIGHT; + if (xalign == 0.5) + return wxALIGN_CENTER_HORIZONTAL; - m_treeview = gtk_tree_view_new(); - gtk_container_add (GTK_CONTAINER (m_widget), m_treeview); + return wxALIGN_LEFT; +} - if (style & wxDV_MULTIPLE) +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 +{ + GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); + return (gtk_tree_view_column_get_sort_column_id( column ) != -1); +} + +bool wxDataViewColumn::IsResizeable() const +{ + GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); + return gtk_tree_view_column_get_resizable( column ); +} + +bool wxDataViewColumn::IsHidden() const +{ + GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); + return !gtk_tree_view_column_get_visible( column ); +} + +void wxDataViewColumn::SetSortOrder( bool ascending ) +{ + GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); + + if (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 +{ + GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); + + return (gtk_tree_view_column_get_sort_order( column ) != GTK_SORT_DESCENDING); +} + +void wxDataViewColumn::SetMinWidth( int width ) +{ + gtk_tree_view_column_set_min_width( GTK_TREE_VIEW_COLUMN(m_column), width ); +} + +int wxDataViewColumn::GetMinWidth() const +{ + return gtk_tree_view_column_get_min_width( GTK_TREE_VIEW_COLUMN(m_column) ); +} + +int wxDataViewColumn::GetWidth() const +{ + return gtk_tree_view_column_get_width( GTK_TREE_VIEW_COLUMN(m_column) ); +} + +void wxDataViewColumn::SetWidth( int width ) +{ + gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), width ); +} + + +//----------------------------------------------------------------------------- +// wxGtkTreeModelNode +//----------------------------------------------------------------------------- + +void wxGtkTreeModelNode::Resort() +{ + size_t child_count = GetChildCount(); + if (child_count == 0) + return; + + size_t node_count = GetNodesCount(); + + if (child_count == 1) + { + if (node_count == 1) + { + wxGtkTreeModelNode *node = m_nodes.Item( 0 ); + node->Resort(); + } + return; + } + + wxGtkTreeModelChildren 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(); + } +} + +//----------------------------------------------------------------------------- +// wxDataViewCtrlInternal +//----------------------------------------------------------------------------- + +wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, + wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model ) +{ + m_owner = owner; + m_wx_model = wx_model; + m_gtk_model = gtk_model; + m_root = NULL; + m_sort_order = GTK_SORT_ASCENDING; + m_sort_column = -1; + m_dataview_sort_column = NULL; + InitTree(); +} + +wxDataViewCtrlInternal::~wxDataViewCtrlInternal() +{ + g_object_unref( m_gtk_model ); +} + +void wxDataViewCtrlInternal::InitTree() +{ + wxDataViewItem item; + m_root = new wxGtkTreeModelNode( NULL, item, this ); + + BuildBranch( m_root ); +} + +void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node ) +{ + if (node->GetChildCount() == 0) + { + 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 ); + + return true; +} + +bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) +{ + wxGtkTreeModelNode *parent_node = FindNode( parent ); + parent_node->DeleteChild( item.GetID() ); + + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_DELETED, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetModel( m_owner->GetModel() ); + event.SetItem( item ); + m_owner->GetEventHandler()->ProcessEvent( event ); + + return true; +} + +bool wxDataViewCtrlInternal::ItemChanged( const wxDataViewItem &item ) +{ + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_CHANGED, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetModel( m_owner->GetModel() ); + event.SetItem( item ); + m_owner->GetEventHandler()->ProcessEvent( event ); + + return true; +} + +bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned int col ) +{ + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetModel( m_owner->GetModel() ); + event.SetColumn( col ); + event.SetItem( item ); + m_owner->GetEventHandler()->ProcessEvent( event ); + + return true; +} + +bool wxDataViewCtrlInternal::Cleared() +{ + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetModel( m_owner->GetModel() ); + m_owner->GetEventHandler()->ProcessEvent( event ); + + return true; +} + +gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path ) +{ + int depth = gtk_tree_path_get_depth( path ); + + wxGtkTreeModelNode *node = m_root; + + int i; + for (i = 0; i < depth; i++) + { + BuildBranch( node ); + + gint pos = gtk_tree_path_get_indices (path)[i]; + if (pos < 0) return FALSE; + if ((size_t)pos >= node->GetChildCount()) return FALSE; + + void* id = node->GetChildren().Item( (size_t) pos ); + + if (i == depth-1) + { + iter->stamp = m_gtk_model->stamp; + iter->user_data = id; + return TRUE; + } + + size_t count = node->GetNodes().GetCount(); + size_t pos2; + for (pos2 = 0; pos2 < count; pos2++) + { + wxGtkTreeModelNode *child_node = node->GetNodes().Item( pos2 ); + if (child_node->GetItem().GetID() == id) + { + node = child_node; + break; + } + } + } + + return FALSE; +} + +GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter ) +{ + GtkTreePath *retval = gtk_tree_path_new (); + void *id = iter->user_data; + + wxGtkTreeModelNode *node = FindParentNode( iter ); + while (node) + { + int pos = node->GetChildren().Index( id ); + + gtk_tree_path_prepend_index( retval, pos ); + + id = node->GetItem().GetID(); + node = node->GetParent(); + } + + return retval; +} + +gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter ) +{ + wxGtkTreeModelNode *parent = FindParentNode( iter ); + if( parent == NULL ) + return FALSE; + + int pos = parent->GetChildren().Index( iter->user_data ); + + if (pos == (int) parent->GetChildCount()-1) + return FALSE; + + iter->stamp = m_gtk_model->stamp; + iter->user_data = parent->GetChildren().Item( pos+1 ); + + return TRUE; +} + +gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *parent ) +{ + 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_SELECTION_CHANGED, 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 ); - 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); - 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; } -bool wxDataViewCtrl::AssociateModel( wxDataViewListModel *model ) +void wxDataViewCtrl::OnInternalIdle() +{ + wxWindow::OnInternalIdle(); + + unsigned int cols = GetColumnCount(); + unsigned int i; + for (i = 0; i < cols; i++) + { + wxDataViewColumn *col = GetColumn( i ); + col->OnInternalIdle(); + } +} + +bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) { if (!wxDataViewCtrlBase::AssociateModel( model )) return false; - GtkWxListStore *gtk_store = wxgtk_list_store_new(); - gtk_store->model = model; + GtkWxTreeModel *gtk_model = wxgtk_tree_model_new(); + m_internal = new wxDataViewCtrlInternal( this, model, gtk_model ); + gtk_model->internal = m_internal; - m_notifier = new wxGtkDataViewListModelNotifier( gtk_store, model ); + m_notifier = new wxGtkDataViewModelNotifier( gtk_model, model, this ); model->AddNotifier( m_notifier ); - gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_store) ); - g_object_unref( gtk_store ); + gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_model) ); + + // unref in wxDataViewCtrlInternal + // g_object_unref( gtk_model ); return true; } @@ -1574,133 +3078,165 @@ 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), column ); + gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), + GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ); return true; } -void wxDataViewCtrl::SetSelection( int row ) +unsigned int wxDataViewCtrl::GetColumnCount() const { - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - - if (row < 0) + 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++) { - gtk_tree_selection_unselect_all( selection ); + wxDataViewColumn *col = *iter; + if (GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) == gtk_col) + { + return col; + } } - else + + 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 ); + + delete column; + + return true; +} + +bool wxDataViewCtrl::ClearColumns() +{ + wxDataViewColumnList::iterator iter; + for (iter = m_cols.begin(); iter != m_cols.end(); iter++) { - GtkTreePath *path = gtk_tree_path_new (); - gtk_tree_path_append_index( path, row ); - - gtk_tree_selection_select_path( selection, path ); - - gtk_tree_path_free( path ); + 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::Unselect( unsigned int row ) +int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const { - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); + GtkTreeViewColumn *gtk_column = GTK_TREE_VIEW_COLUMN(column->GetConstGtkHandle()); + + GList *list = gtk_tree_view_get_columns( GTK_TREE_VIEW(m_treeview) ); - GtkTreePath *path = gtk_tree_path_new (); - gtk_tree_path_append_index( path, row ); - - gtk_tree_selection_unselect_path( selection, path ); - - gtk_tree_path_free( path ); + gint pos = g_list_index( list, (gconstpointer) gtk_column ); + + g_list_free( list ); + + return pos; } -void wxDataViewCtrl::SetSelectionRange( unsigned int from, unsigned int to ) +wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const { + return m_internal->GetDataViewSortColumn(); } -void wxDataViewCtrl::SetSelections( const wxArrayInt& aSelections) +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 ); } - -bool wxDataViewCtrl::IsSelected( unsigned int row ) const + +void wxDataViewCtrl::Collapse( const wxDataViewItem & item ) { - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - - GtkTreePath *path = gtk_tree_path_new (); - gtk_tree_path_append_index( path, row ); - - gboolean ret = gtk_tree_selection_path_is_selected( selection, path ); - + 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 ); - - return ret; } -int wxDataViewCtrl::GetSelection() const +wxDataViewItem wxDataViewCtrl::GetSelection() const { GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - if (HasFlag(wxDV_MULTIPLE)) + + if (m_windowStyle & wxDV_MULTIPLE) { + // Report the first one GtkTreeModel *model; GList *list = gtk_tree_selection_get_selected_rows( selection, &model ); - - // do something + if (list) { - // list = g_list_nth( list, 0 ); should be a noop GtkTreePath *path = (GtkTreePath*) list->data; + GtkTreeIter iter; + m_internal->get_iter( &iter, path ); - unsigned int row = (unsigned int)gtk_tree_path_get_indices (path)[0]; - // delete list g_list_foreach( list, (GFunc) gtk_tree_path_free, NULL ); g_list_free( list ); - return (int) row; + return wxDataViewItem( (void*) iter.user_data ); } } else { - - GtkTreeModel *model; GtkTreeIter iter; - gboolean has_selection = gtk_tree_selection_get_selected( selection, &model, &iter ); - if (has_selection) + if (gtk_tree_selection_get_selected( selection, NULL, &iter )) { - unsigned int row = (wxUIntPtr) iter.user_data; - return (int) row; + wxDataViewItem item( (void*) iter.user_data ); + return item; } } - return -1; + return wxDataViewItem(0); } -int wxDataViewCtrl::GetSelections(wxArrayInt& aSelections) const +int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const { - aSelections.Clear(); + 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) { - - // list = g_list_nth( list, 0 ); should be a noop GtkTreePath *path = (GtkTreePath*) list->data; - unsigned int row = (unsigned int)gtk_tree_path_get_indices (path)[0]; - - aSelections.Add( (int) row ); - - list = g_list_next( list ); + 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 @@ -1710,15 +3246,144 @@ int wxDataViewCtrl::GetSelections(wxArrayInt& aSelections) const gboolean has_selection = gtk_tree_selection_get_selected( selection, &model, &iter ); if (has_selection) { - unsigned int row = (wxUIntPtr) iter.user_data; - aSelections.Add( (int) row ); + 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() +{ +} + +void wxDataViewCtrl::GtkDisableSelectionEvents() +{ + 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); +} + +void wxDataViewCtrl::GtkEnableSelectionEvents() +{ + 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); +} + +// static +wxVisualAttributes +wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new); +} + #endif // !wxUSE_GENERICDATAVIEWCTRL