X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1cd5e95c1c788574d01971f6f58ba33014495e35..94f6d685cb30a8e62d21254bbf19902b48eb2443:/src/gtk/dataview.cpp diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 46bea947cc..e9ad3b983d 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -26,6 +26,8 @@ #include "wx/calctrl.h" #include "wx/popupwin.h" #include "wx/icon.h" +#include "wx/list.h" +#include "wx/listimpl.cpp" #include "wx/gtk/private.h" @@ -33,15 +35,175 @@ #include #include +#include #include #include //----------------------------------------------------------------------------- -// classes //----------------------------------------------------------------------------- -class wxDataViewCtrl; +wxDataViewModel *g_model = NULL; + +class wxGtkTreeModelNode; + +extern "C" { +typedef struct _GtkWxTreeModel GtkWxTreeModel; +} + +//----------------------------------------------------------------------------- +// wxDataViewCtrlInternal +//----------------------------------------------------------------------------- + +WX_DECLARE_LIST(wxDataViewItem, ItemList); +WX_DEFINE_LIST(ItemList); + +class wxDataViewCtrlInternal +{ +public: + wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model, GtkWxTreeModel *owner ); + ~wxDataViewCtrlInternal(); + + gboolean get_iter( GtkTreeIter *iter, GtkTreePath *path ); + GtkTreePath *get_path( GtkTreeIter *iter); + GtkTreePath *get_path_safe( GtkTreeIter *iter); + gboolean iter_next( GtkTreeIter *iter ); + gboolean iter_children( GtkTreeIter *iter, GtkTreeIter *parent); + gboolean iter_has_child( GtkTreeIter *iter ); + gint iter_n_children( GtkTreeIter *iter ); + gboolean iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n ); + gboolean iter_parent( GtkTreeIter *iter, GtkTreeIter *child ); + + wxDataViewModel* GetDataViewModel() { return m_wx_model; } + wxDataViewCtrl* GetOwner() { return m_owner; } + GtkWxTreeModel* GetGtkModel() { return m_gtk_model; } + + bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ); + bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ); + bool ItemChanged( const wxDataViewItem &item ); + bool ValueChanged( const wxDataViewItem &item, unsigned int col ); + bool Cleared(); + void Resort(); + +protected: + void InitTree(); + wxGtkTreeModelNode *FindNode( const wxDataViewItem &item ); + wxGtkTreeModelNode *FindNode( GtkTreeIter *iter ); + wxGtkTreeModelNode *FindParentNode( const wxDataViewItem &item ); + wxGtkTreeModelNode *FindParentNode( GtkTreeIter *iter ); + void BuildBranch( wxGtkTreeModelNode *branch ); + +private: + wxGtkTreeModelNode *m_root; + wxDataViewModel *m_wx_model; + GtkWxTreeModel *m_gtk_model; + wxDataViewCtrl *m_owner; +}; + + +//----------------------------------------------------------------------------- +// wxGtkTreeModelNode +//----------------------------------------------------------------------------- + +int LINKAGEMODE wxGtkTreeModelNodeCmp( void *id1, void *id2 ); + +WX_DEFINE_ARRAY_PTR( wxGtkTreeModelNode*, wxGtkTreeModelNodes ); +WX_DEFINE_SORTED_ARRAY( void* , wxGtkTreeModelChildren ); + +class wxGtkTreeModelNode +{ +public: + wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item, + wxDataViewCtrlInternal *internal ) + { + m_parent = parent; + m_item = item; + m_internal = internal; + g_model = internal->GetDataViewModel(); + m_children = new wxGtkTreeModelChildren( wxGtkTreeModelNodeCmp ); + } + + ~wxGtkTreeModelNode() + { + g_model = m_internal->GetDataViewModel(); + size_t count = m_children->GetCount(); + size_t i; + for (i = 0; i < count; i++) + { + wxGtkTreeModelNode *child = m_nodes.Item( i ); + delete child; + } + delete m_children; + } + + unsigned int AddNode( wxGtkTreeModelNode* child ) + { + g_model = m_internal->GetDataViewModel(); + m_nodes.Add( child ); + return m_children->Add( child->GetItem().GetID() ); + } + + unsigned int AddLeave( void* id ) + { + g_model = m_internal->GetDataViewModel(); + return m_children->Add( id ); + } + + void DeleteChild( void* id ) + { + g_model = m_internal->GetDataViewModel(); + size_t pos; + size_t count = m_children->GetCount(); + for (pos = 0; pos < count; pos++) + { + if (m_children->Item( pos ) == id) + { + m_children->RemoveAt( pos ); + break; + } + } + count = m_nodes.GetCount(); + for (pos = 0; pos < count; pos++) + { + wxGtkTreeModelNode *node = m_nodes.Item( pos ); + if (node->GetItem().GetID() == id) + { + m_nodes.RemoveAt( pos ); + delete node; + break; + } + } + + } + + wxGtkTreeModelNode* GetParent() + { return m_parent; } + wxGtkTreeModelNodes &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; +}; + + +int LINKAGEMODE wxGtkTreeModelNodeCmp( void* id1, void* id2 ) +{ + return g_model->Compare( id1, id2 ); +} //----------------------------------------------------------------------------- // data @@ -50,159 +212,196 @@ 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 GtkTreePath *wxgtk_tree_model_get_path_safe (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) { - 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 + }; - list_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkWxListStore", - &list_store_info, (GTypeFlags)0 ); + static const GInterfaceInfo sortable_iface_info = + { + (GInterfaceInitFunc) wxgtk_tree_model_sortable_init, + NULL, + NULL + }; - g_type_add_interface_static (list_store_type, - GTK_TYPE_TREE_MODEL, - &tree_model_info); + tree_model_type = g_type_register_static (G_TYPE_OBJECT, "GtkWxTreeModel", + &tree_model_info, (GTypeFlags)0 ); + + 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,44 +409,37 @@ 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->GetColumnCount(); + 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->GetColumnType( (unsigned int) index ); + wxString wxtype = wxtree_model->internal->GetDataViewModel()->GetColumnType( (unsigned int) index ); if (wxtype == wxT("string")) gtype = G_TYPE_STRING; @@ -260,61 +452,58 @@ wxgtk_list_store_get_column_type (GtkTreeModel *tree_model, } 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->GetRowCount()) - return FALSE; + return wxtree_model->internal->get_iter( iter, path ); +} - iter->stamp = list_store->stamp; - // user_data is just the index - iter->user_data = (gpointer) i; +static GtkTreePath * +wxgtk_tree_model_get_path (GtkTreeModel *tree_model, + GtkTreeIter *iter) +{ + GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), NULL); + g_return_val_if_fail (iter->stamp == GTK_WX_TREE_MODEL (wxtree_model)->stamp, NULL); - return TRUE; + return wxtree_model->internal->get_path( iter ); } static GtkTreePath * -wxgtk_list_store_get_path (GtkTreeModel *tree_model, - GtkTreeIter *iter) +wxgtk_tree_model_get_path_safe (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_safe( 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; + 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, - wxPtrToUInt(iter->user_data) ); + wxDataViewItem item( (void*) iter->user_data ); + model->GetValue( variant, item, (unsigned int) column ); - // FIXME: we should support different encodings here - g_value_set_string( value, wxGTK_CONV_SYS(variant.GetString()) ); + g_value_set_string( value, variant.GetString().utf8_str() ); } else { @@ -323,95 +512,144 @@ wxgtk_list_store_get_value (GtkTreeModel *tree_model, } 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; - - g_return_val_if_fail (list_store->stamp == iter->stamp, FALSE); - - int n = (wxUIntPtr) iter->user_data; + 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); - if (n == -1) - return FALSE; - - if (n >= (int) list_store->model->GetRowCount()-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; - - // this is a list, nodes have no children - if (parent) - return FALSE; - - iter->stamp = list_store->stamp; - iter->user_data = (gpointer) -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 == parent->stamp, FALSE); - 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->GetRowCount(); - - 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->GetRowCount()) - return FALSE; +/* sortable */ +gboolean wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortable, + gint *sort_column_id, + GtkSortType *order) +{ + GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable; - iter->stamp = list_store->stamp; - iter->user_data = (gpointer) n; + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE); + if (sort_column_id) + *sort_column_id = tree_model->internal->GetDataViewModel()->GetSortingColumn(); + + if (order) + { + bool ascending = tree_model->internal->GetDataViewModel()->GetSortOrderAscending(); + if (ascending) + *order = GTK_SORT_ASCENDING; + else + *order = GTK_SORT_DESCENDING; + } + return TRUE; } -static gboolean -wxgtk_list_store_iter_parent (GtkTreeModel *tree_model, - GtkTreeIter *iter, - GtkTreeIter *child) +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) ); + + bool ascending = TRUE; + if (order != GTK_SORT_ASCENDING) + ascending = FALSE; + + if ((sort_column_id == (gint) tree_model->internal->GetDataViewModel()->GetSortingColumn()) && + (ascending == tree_model->internal->GetDataViewModel()->GetSortOrderAscending())) + return; + + tree_model->internal->GetDataViewModel()->SetSortingColumn( sort_column_id ); + + tree_model->internal->GetDataViewModel()->SetSortOrderAscending( ascending ); + + gtk_tree_sortable_sort_column_changed (sortable); + + tree_model->internal->GetDataViewModel()->Resort(); +} + +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; } @@ -588,13 +826,13 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing( // wxRect renderrect( rect.x, rect.y, rect.width, rect.height ); wxRect renderrect( cell_area->x, cell_area->y, cell_area->width, cell_area->height ); - // wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel(); - GtkTreePath *treepath = gtk_tree_path_new_from_string( path ); - unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (treepath)[0]; + GtkTreeIter iter; + cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, treepath ); + wxDataViewItem item( (void*) iter.user_data ); gtk_tree_path_free( treepath ); - cell->StartEditing( model_row, renderrect ); + cell->StartEditing( item, renderrect ); return NULL; } @@ -722,10 +960,11 @@ 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(); @@ -735,7 +974,7 @@ gtk_wx_cell_renderer_activate( bool ret = false; // activated by - if (cell->Activate( renderrect, model, model_col, model_row )) + if (cell->Activate( renderrect, model, item, model_col )) ret = true; return ret; @@ -749,16 +988,16 @@ gtk_wx_cell_renderer_activate( bool ret = false; if (button_event->button == 1) { - if (cell->LeftClick( pt, renderrect, model, model_col, model_row )) + if (cell->LeftClick( pt, renderrect, model, item, model_col )) ret = true; // TODO: query system double-click time if (button_event->time - wxrenderer->last_click < 400) - if (cell->Activate( renderrect, model, model_col, model_row )) + if (cell->Activate( renderrect, model, item, model_col )) ret = true; } if (button_event->button == 3) { - if (cell->RightClick( pt, renderrect, model, model_col, model_row )) + if (cell->RightClick( pt, renderrect, model, item, model_col )) ret = true; } @@ -771,28 +1010,26 @@ gtk_wx_cell_renderer_activate( } // --------------------------------------------------------- -// wxGtkDataViewListModelNotifier +// wxGtkDataViewModelNotifier // --------------------------------------------------------- -class wxGtkDataViewListModelNotifier: public wxDataViewListModelNotifier +class wxGtkDataViewModelNotifier: public wxDataViewModelNotifier { public: - wxGtkDataViewListModelNotifier( GtkWxListStore* gtk_store, - wxDataViewListModel *wx_model, - wxDataViewCtrl* ctrl ); - ~wxGtkDataViewListModelNotifier(); - - 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; }; @@ -800,88 +1037,78 @@ public: // 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; } -wxGtkDataViewListModelNotifier::~wxGtkDataViewListModelNotifier() +wxGtkDataViewModelNotifier::~wxGtkDataViewModelNotifier() { m_wx_model = NULL; - m_gtk_store = NULL; + m_wxgtk_model = NULL; } -bool wxGtkDataViewListModelNotifier::RowAppended() +bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) { - unsigned int pos = m_wx_model->GetRowCount()-1; + m_owner->GtkGetInternal()->ItemAdded( parent, item ); GtkTreeIter iter; - iter.stamp = m_gtk_store->stamp; - iter.user_data = (gpointer) pos; + 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) pos); - 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::RowPrepended() +bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &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_safe( + GTK_TREE_MODEL(m_wxgtk_model), &iter ); + gtk_tree_model_row_deleted( + GTK_TREE_MODEL(m_wxgtk_model), path ); gtk_tree_path_free (path); + m_owner->GtkGetInternal()->ItemDeleted( parent, item ); + return true; } -bool wxGtkDataViewListModelNotifier::RowInserted( unsigned int before ) +void wxGtkDataViewModelNotifier::Resort() { - GtkTreeIter iter; - iter.stamp = m_gtk_store->stamp; - iter.user_data = (gpointer) before; - - 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); - gtk_tree_path_free (path); - - return true; -} - -bool wxGtkDataViewListModelNotifier::RowDeleted( unsigned int row ) -{ - 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 unsigned int index; @@ -894,8 +1121,11 @@ bool wxGtkDataViewListModelNotifier::ValueChanged( unsigned int model_col, unsig 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, gcolumn, &cell_area ); gtk_tree_path_free( path ); @@ -908,30 +1138,22 @@ bool wxGtkDataViewListModelNotifier::ValueChanged( unsigned int model_col, unsig // Redraw gtk_widget_queue_draw_area( GTK_WIDGET(widget), cell_area.x - xdiff, ydiff + cell_area.y, cell_area.width, cell_area.height ); + + m_owner->GtkGetInternal()->ValueChanged( item, model_col ); + + return true; } } - return true; + return false; } -bool wxGtkDataViewListModelNotifier::RowsReordered( unsigned int *new_order ) +bool wxGtkDataViewModelNotifier::Cleared() { - // Assume sizeof(unsigned int)= == sizeof(gint) - - 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); - - // This adds GTK+'s missing MVC logic for RowsReordered - GtkTreeView *widget = GTK_TREE_VIEW(m_owner->m_treeview); - // Doesn't work yet... - gtk_widget_queue_draw( GTK_WIDGET(widget) ); - - return true; -} + // TODO: delete everything -bool wxGtkDataViewListModelNotifier::Cleared() -{ + m_owner->GtkGetInternal()->Cleared(); + return false; } @@ -1084,16 +1306,18 @@ static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer, 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) @@ -1256,16 +1480,18 @@ 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) @@ -1496,12 +1722,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 ); @@ -1515,10 +1741,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() @@ -1532,8 +1758,8 @@ 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(); } @@ -1576,15 +1802,15 @@ wxSize wxDataViewDateRenderer::GetSize() const 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(); @@ -1604,7 +1830,7 @@ gtk_dataview_header_button_press_callback( GtkWidget *widget, wxDataViewColumn *column ) { if (gdk_event->type != GDK_BUTTON_PRESS) - return TRUE; + return FALSE; if (gdk_event->button == 1) { @@ -1612,10 +1838,11 @@ gtk_dataview_header_button_press_callback( GtkWidget *widget, wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() ); event.SetDataViewColumn( column ); event.SetModel( dv->GetModel() ); - dv->GetEventHandler()->ProcessEvent( event ); + if (dv->GetEventHandler()->ProcessEvent( event )) + return TRUE; } - return TRUE; + return FALSE; } extern "C" { @@ -1633,15 +1860,15 @@ 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 = wxPtrToUInt(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"), @@ -1650,8 +1877,9 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, cell->SetValue( value ); +#if 0 wxListItemAttr attr; - list_store->model->GetAttr( attr, cell->GetOwner()->GetModelColumn(), model_row ); + tree_model->model->GetAttr( attr, cell->GetOwner()->GetModelColumn(), model_row ); if (attr.HasBackgroundColour()) { @@ -1672,6 +1900,8 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, g_object_set_property( G_OBJECT(renderer), "cell-background-set", &gvalue ); g_value_unset( &gvalue ); } +#endif + } IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase) @@ -1853,13 +2083,17 @@ wxAlignment wxDataViewColumn::GetAlignment() const void wxDataViewColumn::SetSortable( bool sortable ) { GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - gtk_tree_view_column_set_sort_indicator( column, sortable ); + + if (sortable) + gtk_tree_view_column_set_sort_column_id( column, GetModelColumn() ); + else + gtk_tree_view_column_set_sort_column_id( column, -1 ); } bool wxDataViewColumn::IsSortable() const { GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - return gtk_tree_view_column_get_sort_indicator( column ); + return (gtk_tree_view_column_get_sort_column_id( column ) != -1); } bool wxDataViewColumn::IsResizeable() const @@ -1912,6 +2146,558 @@ void wxDataViewColumn::SetWidth( int width ) } +//----------------------------------------------------------------------------- +// wxGtkTreeModelNode +//----------------------------------------------------------------------------- + +void wxGtkTreeModelNode::Resort() +{ + g_model = m_internal->GetDataViewModel(); + + size_t child_count = GetChildCount(); + if (child_count == 0) + return; + + size_t node_count = GetNodesCount(); + + if (child_count == 1) + { + if (node_count == 1) + { + wxGtkTreeModelNode *node = m_nodes.Item( 0 ); + node->Resort(); + } + return; + } + + wxGtkTreeModelChildren *new_array = new wxGtkTreeModelChildren( wxGtkTreeModelNodeCmp ); + + size_t pos; + for (pos = 0; pos < child_count; pos++) + new_array->Add( m_children->Item( pos ) ); + + gint *new_order = new gint[child_count]; + + for (pos = 0; pos < child_count; pos++) + { + void *id = new_array->Item( pos ); + size_t old_pos; + for (old_pos = 0; old_pos < child_count; old_pos++) + { + if (id == m_children->Item(old_pos)) + { + new_order[pos] = old_pos; + break; + } + } + } + +// for (pos = 0; pos < count; pos++) +// m_children->Clear(); + delete m_children; + + m_children = new_array; + + GtkTreeModel *gtk_tree_model = GTK_TREE_MODEL( m_internal->GetGtkModel() ); + + GtkTreePath *path = gtk_tree_path_new (); + wxGtkTreeModelNode *parent = GetParent(); + void *id = GetItem().GetID(); + + while (parent) + { + int pos = parent->GetChildren().Index( id ); + gtk_tree_path_prepend_index( path, pos ); + id = parent->GetItem().GetID(); + parent = parent->GetParent(); + } + + GtkTreeIter iter; + iter.user_data = id; + iter.stamp = m_internal->GetGtkModel()->stamp; + gtk_tree_model_rows_reordered( gtk_tree_model, path, &iter, new_order ); + + gtk_tree_path_free (path); + + delete [] new_order; + + for (pos = 0; pos < node_count; pos++) + { + wxGtkTreeModelNode *node = m_nodes.Item( pos ); + node->Resort(); + } +} + +//----------------------------------------------------------------------------- +// wxDataViewCtrlInternal +//----------------------------------------------------------------------------- + +wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, + wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model ) +{ + m_owner = owner; + m_wx_model = wx_model; + m_gtk_model = gtk_model; + m_root = NULL; + InitTree(); +} + +wxDataViewCtrlInternal::~wxDataViewCtrlInternal() +{ + g_object_unref( m_gtk_model ); +} + +void wxDataViewCtrlInternal::InitTree() +{ + wxDataViewItem item; + m_root = new wxGtkTreeModelNode( NULL, item, this ); + + BuildBranch( m_root ); +} + +void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node ) +{ + if (node->GetChildCount() == 0) + { + wxDataViewItem child = m_wx_model->GetFirstChild( node->GetItem() ); + while (child.IsOk()) + { + if (m_wx_model->IsContainer( child )) + node->AddNode( new wxGtkTreeModelNode( node, child, this ) ); + else + node->AddLeave( child.GetID() ); + + // Don't send any events here + + child = m_wx_model->GetNextSibling( child ); + } + } +} + +void wxDataViewCtrlInternal::Resort() +{ + m_root->Resort(); +} + +bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) +{ + wxGtkTreeModelNode *parent_node = FindNode( parent ); + if (m_wx_model->IsContainer( item )) + parent_node->AddNode( new wxGtkTreeModelNode( parent_node, item, this ) ); + else + parent_node->AddLeave( item.GetID() ); + + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_ADDED, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetModel( m_owner->GetModel() ); + event.SetItem( item ); + m_owner->GetEventHandler()->ProcessEvent( event ); + + return true; +} + +bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) +{ + wxGtkTreeModelNode *parent_node = FindNode( parent ); + parent_node->DeleteChild( item.GetID() ); + + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_DELETED, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetModel( m_owner->GetModel() ); + event.SetItem( item ); + m_owner->GetEventHandler()->ProcessEvent( event ); + + return true; +} + +bool wxDataViewCtrlInternal::ItemChanged( const wxDataViewItem &item ) +{ + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_CHANGED, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetModel( m_owner->GetModel() ); + event.SetItem( item ); + m_owner->GetEventHandler()->ProcessEvent( event ); + + return true; +} + +bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned int col ) +{ + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetModel( m_owner->GetModel() ); + event.SetColumn( col ); + event.SetItem( item ); + m_owner->GetEventHandler()->ProcessEvent( event ); + + return true; +} + +bool wxDataViewCtrlInternal::Cleared() +{ + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetModel( m_owner->GetModel() ); + m_owner->GetEventHandler()->ProcessEvent( event ); + + return true; +} + +gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path ) +{ + g_model = m_wx_model; + + int depth = gtk_tree_path_get_depth( path ); + + wxGtkTreeModelNode *node = m_root; + + int i; + for (i = 0; i < depth; i++) + { + BuildBranch( node ); + + gint pos = gtk_tree_path_get_indices (path)[i]; + if (pos < 0) return FALSE; + if ((size_t)pos >= node->GetChildCount()) return FALSE; + + void* id = node->GetChildren().Item( (size_t) pos ); + + if (i == depth-1) + { + iter->stamp = m_gtk_model->stamp; + iter->user_data = id; + return TRUE; + } + + size_t count = node->GetNodes().GetCount(); + size_t pos2; + for (pos2 = 0; pos2 < count; pos2++) + { + wxGtkTreeModelNode *child_node = node->GetNodes().Item( pos2 ); + if (child_node->GetItem().GetID() == id) + { + node = child_node; + break; + } + } + } + + return FALSE; +} + +GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter ) +{ + g_model = m_wx_model; + + GtkTreePath *retval = gtk_tree_path_new (); + void *id = iter->user_data; + + wxGtkTreeModelNode *node = FindParentNode( iter ); + while (node) + { + int pos = node->GetChildren().Index( id ); + gtk_tree_path_prepend_index( retval, pos ); + + id = node->GetItem().GetID(); + node = node->GetParent(); + } + + return retval; +} + +GtkTreePath *wxDataViewCtrlInternal::get_path_safe( GtkTreeIter *iter ) +{ + g_model = m_wx_model; + + GtkTreePath *retval = gtk_tree_path_new (); + void *id = iter->user_data; + + wxGtkTreeModelNode *node = FindParentNode( iter ); + while (node) + { + size_t pos; + for (pos = 0; pos < node->GetChildren().GetCount(); pos++) + { + if (id == node->GetChildren().Item( pos )) + { + gtk_tree_path_prepend_index( retval, (int) pos ); + continue; + } + } + + id = node->GetItem().GetID(); + node = node->GetParent(); + } + + return retval; +} + +gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter ) +{ + g_model = m_wx_model; + + wxGtkTreeModelNode *parent = FindParentNode( iter ); + if( parent == NULL ) + return FALSE; + + unsigned int pos = parent->GetChildren().Index( iter->user_data ); + + if (pos == parent->GetChildCount()-1) + return FALSE; + + iter->stamp = m_gtk_model->stamp; + iter->user_data = parent->GetChildren().Item( pos+1 ); + + return TRUE; +} + +gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *parent ) +{ + g_model = m_wx_model; + + wxDataViewItem item( (void*) parent->user_data ); + + if (!m_wx_model->IsContainer( item )) + return FALSE; + + wxGtkTreeModelNode *parent_node = FindNode( parent ); + BuildBranch( parent_node ); + + if (parent_node->GetChildCount() == 0) + return FALSE; + + iter->stamp = m_gtk_model->stamp; + iter->user_data = (gpointer) parent_node->GetChildren().Item( 0 ); + + return TRUE; +} + +gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter ) +{ + g_model = m_wx_model; + + wxDataViewItem item( (void*) iter->user_data ); + bool is_container = m_wx_model->IsContainer( item ); + + if (!is_container) + return FALSE; + + wxGtkTreeModelNode *node = FindNode( iter ); + BuildBranch( node ); + + return (node->GetChildCount() > 0); +} + +gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter ) +{ + g_model = m_wx_model; + + wxDataViewItem item( (void*) iter->user_data ); + + if (!m_wx_model->IsContainer( item )) + return 0; + + wxGtkTreeModelNode *parent_node = FindNode( iter ); + BuildBranch( parent_node ); + + // wxPrintf( "iter_n_children %d\n", parent_node->GetChildCount() ); + + return parent_node->GetChildCount(); +} + +gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n ) +{ + g_model = m_wx_model; + + void* id = NULL; + if (parent) id = (void*) parent->user_data; + wxDataViewItem item( id ); + + if (!m_wx_model->IsContainer( item )) + return FALSE; + + wxGtkTreeModelNode *parent_node = FindNode( parent ); + BuildBranch( parent_node ); + + // wxPrintf( "iter_nth_child %d\n", n ); + + iter->stamp = m_gtk_model->stamp; + iter->user_data = parent_node->GetChildren().Item( n ); + + return TRUE; +} + +gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *child ) +{ + g_model = m_wx_model; + + wxGtkTreeModelNode *node = FindParentNode( child ); + if (!node) + return FALSE; + + iter->stamp = m_gtk_model->stamp; + iter->user_data = (gpointer) node->GetItem().GetID(); + + return TRUE; +} + +static wxGtkTreeModelNode* +wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item ) +{ + if( model == NULL ) + return NULL; + + ItemList list; + list.DeleteContents( true ); + wxDataViewItem it( item ); + while( it.IsOk() ) + { + wxDataViewItem * pItem = new wxDataViewItem( it ); + list.Insert( pItem ); + it = model->GetParent( it ); + } + + wxGtkTreeModelNode * node = treeNode; + for( ItemList::compatibility_iterator n = list.GetFirst(); n; n = n->GetNext() ) + { + if( node && node->GetNodes().GetCount() != 0 ) + { + int len = node->GetNodes().GetCount(); + wxGtkTreeModelNodes nodes = node->GetNodes(); + int j = 0; + for( ; j < len; j ++) + { + if( nodes[j]->GetItem() == *(n->GetData())) + { + node = nodes[j]; + break; + } + } + + if( j == len ) + { + return NULL; + } + } + else + return NULL; + } + return node; + +} + +wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( GtkTreeIter *iter ) +{ + if (!iter) + return m_root; + + wxDataViewItem item( (void*) iter->user_data ); + if (!item.IsOk()) + return m_root; + + wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item ); + + if (!result) + { + wxPrintf( "Not found %d\n", (int) iter->user_data ); + char *crash = NULL; + *crash = 0; + } + + return result; +} + +wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( const wxDataViewItem &item ) +{ + if (!item.IsOk()) + return m_root; + + wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item ); + + if (!result) + { + wxPrintf( "Not found %d\n", (int) item.GetID() ); + char *crash = NULL; + *crash = 0; + } + + return result; +} + +static wxGtkTreeModelNode* +wxDataViewCtrlInternal_FindParentNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item ) +{ + if( model == NULL ) + return NULL; + + ItemList list; + list.DeleteContents( true ); + if( !item.IsOk() ) + return NULL; + + wxDataViewItem it( model->GetParent( item ) ); + while( it.IsOk() ) + { + wxDataViewItem * pItem = new wxDataViewItem( it ); + list.Insert( pItem ); + it = model->GetParent( it ); + } + + wxGtkTreeModelNode * node = treeNode; + for( ItemList::compatibility_iterator n = list.GetFirst(); n; n = n->GetNext() ) + { + if( node && node->GetNodes().GetCount() != 0 ) + { + int len = node->GetNodes().GetCount(); + wxGtkTreeModelNodes nodes = node->GetNodes(); + int j = 0; + for( ; j < len; j ++) + { + if( nodes[j]->GetItem() == *(n->GetData())) + { + node = nodes[j]; + break; + } + } + + if( j == len ) + { + return NULL; + } + } + else + return NULL; + } + //Examine whether the node is item's parent node + int len = node->GetChildCount(); + for( int i = 0; i < len ; i ++ ) + { + if( node->GetChildren().Item( i ) == item.GetID() ) + return node; + } + return NULL; +} + +wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( GtkTreeIter *iter ) +{ + if (!iter) + return NULL; + + wxDataViewItem item( (void*) iter->user_data ); + if (!item.IsOk()) + return NULL; + + return wxDataViewCtrlInternal_FindParentNode( m_wx_model, m_root, item ); +} + +wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( const wxDataViewItem &item ) +{ + if (!item.IsOk()) + return NULL; + + return wxDataViewCtrlInternal_FindParentNode( m_wx_model, m_root, item ); +} + //----------------------------------------------------------------------------- // wxDataViewCtrl signal callbacks //----------------------------------------------------------------------------- @@ -1922,8 +2708,8 @@ wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCt if (!GTK_WIDGET_REALIZED(dv->m_widget)) return; - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ROW_SELECTED, dv->GetId() ); - event.SetRow( dv->GetSelection() ); + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_SELECTED, dv->GetId() ); + // TODO: item event.SetModel( dv->GetModel() ); dv->GetEventHandler()->ProcessEvent( event ); } @@ -1932,9 +2718,12 @@ static void wxdataview_row_activated_callback( GtkTreeView* treeview, GtkTreePath *path, GtkTreeViewColumn *column, wxDataViewCtrl *dv ) { - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ROW_ACTIVATED, dv->GetId() ); - unsigned int row = (unsigned int)gtk_tree_path_get_indices (path)[0]; - event.SetRow( row ); + 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 ); } @@ -1964,8 +2753,7 @@ void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation *alloc, wxDataViewCtrl *win ) { - - wxWindowList::Node *node = win->GetChildren().GetFirst(); + wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst(); while (node) { wxWindow *child = node->GetData(); @@ -1996,6 +2784,8 @@ wxDataViewCtrl::~wxDataViewCtrl() // remove the model from the GtkTreeView before it gets destroyed by the // wxDataViewCtrlBase's dtor gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), NULL ); + + delete m_internal; } void wxDataViewCtrl::Init() @@ -2091,20 +2881,23 @@ void wxDataViewCtrl::OnInternalIdle() } } -bool wxDataViewCtrl::AssociateModel( wxDataViewListModel *model ) +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, this ); + m_notifier = new wxGtkDataViewModelNotifier( gtk_model, model, this ); model->AddNotifier( m_notifier ); - gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_store) ); - g_object_unref( gtk_store ); + gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_model) ); + + // unref in wxDataViewCtrlInternal + // g_object_unref( gtk_model ); return true; } @@ -2121,202 +2914,46 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) return true; } -void wxDataViewCtrl::GtkDisableSelectionEvents() -{ - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - g_signal_connect_after (selection, "changed", - G_CALLBACK (wxdataview_selection_changed_callback), this); -} - -void wxDataViewCtrl::GtkEnableSelectionEvents() -{ - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - g_signal_handlers_disconnect_by_func( selection, - (gpointer) (wxdataview_selection_changed_callback), this); -} - -void wxDataViewCtrl::SetSelection( int row ) +wxDataViewItem wxDataViewCtrl::GetSelection() { - GtkDisableSelectionEvents(); - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - - if (row < 0) + + if (m_windowStyle & wxDV_MULTIPLE) { - gtk_tree_selection_unselect_all( selection ); } else { - 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 ); + GtkTreeIter iter; + if (gtk_tree_selection_get_selected( selection, NULL, &iter )) + { + wxDataViewItem item( (void*) iter.user_data ); + return item; + } } - - GtkEnableSelectionEvents(); + + return wxDataViewItem(0); } -void wxDataViewCtrl::Unselect( unsigned int row ) +void wxDataViewCtrl::DoSetExpanderColumn() { - GtkDisableSelectionEvents(); - - 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 ); - - gtk_tree_selection_unselect_path( selection, path ); - - gtk_tree_path_free( path ); - - GtkEnableSelectionEvents(); } -void wxDataViewCtrl::SetSelectionRange( unsigned int from, unsigned int to ) +void wxDataViewCtrl::DoSetIndent() { - GtkDisableSelectionEvents(); - - if (from > to) - { - unsigned int tmp = from; - from = to; - to = tmp; - } - - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - - GtkTreePath *path_from = gtk_tree_path_new (); - gtk_tree_path_append_index( path_from, from ); - GtkTreePath *path_to = gtk_tree_path_new (); - gtk_tree_path_append_index( path_to, to ); - - gtk_tree_selection_select_range( selection, path_from, path_to ); - - gtk_tree_path_free( path_to ); - gtk_tree_path_free( path_from ); - - GtkEnableSelectionEvents(); } -void wxDataViewCtrl::SetSelections( const wxArrayInt& aSelections) -{ - GtkDisableSelectionEvents(); - - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - - unsigned int i; - for (i = 0; i < aSelections.GetCount(); i++) - { - GtkTreePath *path = gtk_tree_path_new (); - gtk_tree_path_append_index( path, aSelections[i] ); - - gtk_tree_selection_select_path( selection, path ); - - gtk_tree_path_free( path ); - } - - GtkEnableSelectionEvents(); -} - -bool wxDataViewCtrl::IsSelected( unsigned int row ) const -{ - 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 ); - - gtk_tree_path_free( path ); - - return ret; -} - -int wxDataViewCtrl::GetSelection() const +void wxDataViewCtrl::GtkDisableSelectionEvents() { 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 ); - - // do something - if (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]; - - // delete list - g_list_foreach( list, (GFunc) gtk_tree_path_free, NULL ); - g_list_free( list ); - - return (int) row; - } - } - else - { - - GtkTreeModel *model; - GtkTreeIter iter; - gboolean has_selection = gtk_tree_selection_get_selected( selection, &model, &iter ); - if (has_selection) - { - unsigned int row = (wxUIntPtr) iter.user_data; - return (int) row; - } - } - - return -1; + g_signal_connect_after (selection, "changed", + G_CALLBACK (wxdataview_selection_changed_callback), this); } -int wxDataViewCtrl::GetSelections(wxArrayInt& aSelections) const +void wxDataViewCtrl::GtkEnableSelectionEvents() { - aSelections.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 ); - } - - // delete list - g_list_foreach( list, (GFunc) gtk_tree_path_free, NULL ); - g_list_free( list ); - - return count; - } - else - { - GtkTreeModel *model; - GtkTreeIter iter; - gboolean has_selection = gtk_tree_selection_get_selected( selection, &model, &iter ); - if (has_selection) - { - unsigned int row = (wxUIntPtr) iter.user_data; - aSelections.Add( (int) row ); - return 1; - } - } - - return 0; + g_signal_handlers_disconnect_by_func( selection, + (gpointer) (wxdataview_selection_changed_callback), this); } // static