X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d0d78133612ffdcc4ac498db54813fc38c64a90..f2959820a5286e4b1595bb9c89de30fa69d6fc6a:/src/gtk/dataview.cpp diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 3228e441f2..c58858a7ff 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -2,7 +2,6 @@ // Name: src/gtk/dataview.cpp // Purpose: wxDataViewCtrl GTK+2 implementation // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -25,13 +24,29 @@ #endif #include "wx/stockitem.h" -#include "wx/calctrl.h" #include "wx/popupwin.h" #include "wx/listimpl.cpp" -#include "wx/gtk/private.h" #include "wx/gtk/dc.h" +#ifndef __WXGTK3__ #include "wx/gtk/dcclient.h" +#endif + +#include +#include "wx/gtk/private.h" +#include "wx/gtk/private/event.h" +#include "wx/gtk/private/gdkconv.h" +#include "wx/gtk/private/gtk2-compat.h" +#include "wx/gtk/private/list.h" +using namespace wxGTKImpl; + +class wxGtkDataViewModelNotifier; + +#ifdef __WXGTK3__ + #define wxConstGdkRect const GdkRectangle +#else + #define wxConstGdkRect GdkRectangle +#endif //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -44,6 +59,170 @@ extern "C" { typedef struct _GtkWxTreeModel GtkWxTreeModel; } +// ---------------------------------------------------------------------------- +// wxGtkTreePath: self-destroying GtkTreePath +// ---------------------------------------------------------------------------- + +// Usually this object is initialized with the associated GtkTreePath +// immediately when it's constructed but it can also be changed later either by +// using Assign() or by getting the pointer to the internally stored pointer +// value using ByRef(). The latter should be avoided but is very convenient +// when using GTK functions with GtkTreePath output parameters. +class wxGtkTreePath +{ +public: + // Ctor takes ownership of the given path and will free it if non-NULL. + wxGtkTreePath(GtkTreePath *path = NULL) : m_path(path) { } + + // Creates a tree path for the given string path. + wxGtkTreePath(const gchar *strpath) + : m_path(gtk_tree_path_new_from_string(strpath)) + { + } + + // Set the stored pointer if not done by ctor. + void Assign(GtkTreePath *path) + { + wxASSERT_MSG( !m_path, "shouldn't be already initialized" ); + + m_path = path; + } + + // Return the pointer to the internally stored pointer. This should only be + // used to initialize the object by passing it to some GTK function. + GtkTreePath **ByRef() + { + wxASSERT_MSG( !m_path, "shouldn't be already initialized" ); + + return &m_path; + } + + + operator GtkTreePath *() const { return m_path; } + + ~wxGtkTreePath() { if ( m_path ) gtk_tree_path_free(m_path); } + +private: + GtkTreePath *m_path; + + wxDECLARE_NO_COPY_CLASS(wxGtkTreePath); +}; + +// ---------------------------------------------------------------------------- +// wxGtkTreePathList: self-destroying list of GtkTreePath objects. +// ---------------------------------------------------------------------------- + +class wxGtkTreePathList : public wxGtkList +{ +public: + // Ctor takes ownership of the list. + explicit wxGtkTreePathList(GList* list) + : wxGtkList(list) + { + } + + ~wxGtkTreePathList() + { + // Delete the list contents, wxGtkList will delete the list itself. + g_list_foreach(m_list, (GFunc)gtk_tree_path_free, NULL); + } +}; + +// ---------------------------------------------------------------------------- +// wxGtkTreeSelectionLock: prevent selection from changing during the +// lifetime of this object +// ---------------------------------------------------------------------------- + +// Implementation note: it could be expected that setting the selection +// function in this class ctor and resetting it back to the old value in its +// dtor would work. However currently gtk_tree_selection_get_select_function() +// can't be passed NULL (see https://bugzilla.gnome.org/show_bug.cgi?id=626276) +// so we can't do this. Instead, we always use the selection function (which +// imposes extra overhead, albeit minimal one, on all selection operations) and +// just set/reset the flag telling it whether it should allow or forbid the +// selection. +// +// Also notice that currently only a single object of this class may exist at +// any given moment. It's just simpler like this and we don't need anything +// more for now. + +extern "C" { +static +gboolean wxdataview_selection_func(GtkTreeSelection * WXUNUSED(selection), + GtkTreeModel * WXUNUSED(model), + GtkTreePath * WXUNUSED(path), + gboolean WXUNUSED(path_currently_selected), + gpointer data) +{ + return data == NULL; +} +} + +class wxGtkTreeSelectionLock +{ +public: + wxGtkTreeSelectionLock(GtkTreeSelection *selection) + : m_selection(selection) + { + wxASSERT_MSG( !ms_instance, "this class is not reentrant currently" ); + + ms_instance = this; + + CheckCurrentSelectionFunc(NULL); + + // Pass some non-NULL pointer as "data" for the callback, it doesn't + // matter what it is as long as it's non-NULL. + gtk_tree_selection_set_select_function(selection, + wxdataview_selection_func, + this, + NULL); + } + + ~wxGtkTreeSelectionLock() + { + CheckCurrentSelectionFunc(wxdataview_selection_func); + + gtk_tree_selection_set_select_function(m_selection, + wxdataview_selection_func, + NULL, + NULL); + + ms_instance = NULL; + } + +private: + void CheckCurrentSelectionFunc(GtkTreeSelectionFunc func) + { + // We can only use gtk_tree_selection_get_select_function() with 2.14+ + // so check for its availability both during compile- and run-time. +#if GTK_CHECK_VERSION(2, 14, 0) +#ifndef __WXGTK3__ + if ( gtk_check_version(2, 14, 0) != NULL ) + return; +#endif + + // If this assert is triggered, it means the code elsewhere has called + // gtk_tree_selection_set_select_function() but currently doing this + // breaks this class so the code here needs to be changed. + wxASSERT_MSG + ( + gtk_tree_selection_get_select_function(m_selection) == func, + "selection function has changed unexpectedly, review this code!" + ); +#endif // GTK+ 2.14+ + + wxUnusedVar(func); + } + + static wxGtkTreeSelectionLock *ms_instance; + + GtkTreeSelection * const m_selection; + + wxDECLARE_NO_COPY_CLASS(wxGtkTreeSelectionLock); +}; + +wxGtkTreeSelectionLock *wxGtkTreeSelectionLock::ms_instance = NULL; + //----------------------------------------------------------------------------- // wxDataViewCtrlInternal //----------------------------------------------------------------------------- @@ -51,10 +230,10 @@ typedef struct _GtkWxTreeModel GtkWxTreeModel; WX_DECLARE_LIST(wxDataViewItem, ItemList); WX_DEFINE_LIST(ItemList) -class WXDLLIMPEXP_ADV wxDataViewCtrlInternal +class wxDataViewCtrlInternal { public: - wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model ); + wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model ); ~wxDataViewCtrlInternal(); // model iface @@ -86,8 +265,10 @@ public: 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 ValueChanged( const wxDataViewItem &item, unsigned int model_column ); bool Cleared(); + bool BeforeReset(); + bool AfterReset(); void Resort(); // sorting interface @@ -100,7 +281,15 @@ public: void SetDataViewSortColumn( wxDataViewColumn *column ) { m_dataview_sort_column = column; } wxDataViewColumn *GetDataViewSortColumn() { return m_dataview_sort_column; } - bool IsSorted() { return (m_sort_column >= 0); } + bool IsSorted() const { return m_sort_column >= 0; } + + // Should we be sorted either because we have a configured sort column or + // because we have a default sort order? + bool ShouldBeSorted() const + { + return IsSorted() || GetDataViewModel()->HasDefaultCompare(); + } + // accessors wxDataViewModel* GetDataViewModel() { return m_wx_model; } @@ -108,8 +297,15 @@ public: wxDataViewCtrl* GetOwner() { return m_owner; } GtkWxTreeModel* GetGtkModel() { return m_gtk_model; } + // item can be deleted already in the model + int GetIndexOf( const wxDataViewItem &parent, const wxDataViewItem &item ); + + void OnInternalIdle(); + protected: void InitTree(); + void ScheduleRefresh(); + wxGtkTreeModelNode *FindNode( const wxDataViewItem &item ); wxGtkTreeModelNode *FindNode( GtkTreeIter *iter ); wxGtkTreeModelNode *FindParentNode( const wxDataViewItem &item ); @@ -132,6 +328,10 @@ private: GtkTargetEntry m_dropTargetTargetEntry; wxCharBuffer m_dropTargetTargetEntryTarget; wxDataObject *m_dropDataObject; + + wxGtkDataViewModelNotifier *m_notifier; + + bool m_dirty; }; @@ -142,7 +342,7 @@ private: static int LINKAGEMODE wxGtkTreeModelChildCmp( void** id1, void** id2 ) { - int ret = gs_internal->GetDataViewModel()->Compare( *id1, *id2, + int ret = gs_internal->GetDataViewModel()->Compare( wxDataViewItem(*id1), wxDataViewItem(*id2), gs_internal->GetSortColumn(), (gs_internal->GetSortOrder() == GTK_SORT_ASCENDING) ); return ret; @@ -173,7 +373,7 @@ public: } } - unsigned int AddNode( wxGtkTreeModelNode* child ) + void AddNode( wxGtkTreeModelNode* child ) { m_nodes.Add( child ); @@ -181,28 +381,58 @@ public: m_children.Add( id ); - if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare()) + if (m_internal->ShouldBeSorted()) { gs_internal = m_internal; m_children.Sort( &wxGtkTreeModelChildCmp ); - return m_children.Index( id ); } + } + + void InsertNode( wxGtkTreeModelNode* child, unsigned pos ) + { + if (m_internal->ShouldBeSorted()) + { + AddNode(child); + return; + } + + void *id = child->GetItem().GetID(); + + // Insert into m_nodes so that the order of nodes in m_nodes is the + // same as the order of their corresponding IDs in m_children: + const unsigned int count = m_nodes.GetCount(); + bool inserted = false; + for (unsigned i = 0; i < count; i++) + { + wxGtkTreeModelNode *node = m_nodes[i]; + int posInChildren = m_children.Index(node->GetItem().GetID()); + if ( (unsigned)posInChildren >= pos ) + { + m_nodes.Insert(child, i); + inserted = true; + break; + } + } + if ( !inserted ) + m_nodes.Add(child); - return m_children.GetCount()-1; + m_children.Insert( id, pos ); } - unsigned int AddLeave( void* id ) + void AddLeaf( void* id ) { - m_children.Add( id ); + InsertLeaf(id, m_children.size()); + } + + void InsertLeaf( void* id, unsigned pos ) + { + m_children.Insert( id, pos ); - if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare()) + if (m_internal->ShouldBeSorted()) { gs_internal = m_internal; m_children.Sort( &wxGtkTreeModelChildCmp ); - return m_children.Index( id ); } - - return m_children.GetCount()-1; } void DeleteChild( void* id ) @@ -223,6 +453,20 @@ public: } } + // returns position of child node for given item in children list or wxNOT_FOUND + int FindChildByItem(const wxDataViewItem& item) const + { + const void* itemId = item.GetID(); + const wxGtkTreeModelChildren& nodes = m_children; + const int len = nodes.size(); + for ( int i = 0; i < len; i++ ) + { + if ( nodes[i] == itemId ) + return i; + } + return wxNOT_FOUND; + } + wxGtkTreeModelNode* GetParent() { return m_parent; } wxGtkTreeModelNodes &GetNodes() @@ -261,15 +505,11 @@ extern "C" { #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_tree_model_get_type (void); -typedef struct _GtkWxTreeModelClass GtkWxTreeModelClass; - struct _GtkWxTreeModel { GObject parent; @@ -279,21 +519,14 @@ struct _GtkWxTreeModel wxDataViewCtrlInternal *internal; }; -struct _GtkWxTreeModelClass -{ - GObjectClass list_parent_class; -}; - 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_init (GTypeInstance* instance, void*); -static void wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface); -static void wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface); -static void wxgtk_tree_model_drag_source_init(GtkTreeDragSourceIface *iface); -static void wxgtk_tree_model_drag_dest_init (GtkTreeDragDestIface *iface); +static void wxgtk_tree_model_tree_model_init (void* g_iface, void*); +static void wxgtk_tree_model_sortable_init (void* g_iface, void*); +static void wxgtk_tree_model_drag_source_init(void* g_iface, void*); +static void wxgtk_tree_model_drag_dest_init (void* g_iface, void*); -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, @@ -335,11 +568,11 @@ static void wxgtk_tree_model_set_sort_func (GtkTreeSortable *s gint sort_column_id, GtkTreeIterCompareFunc func, gpointer data, - GtkDestroyNotify destroy); + GDestroyNotify destroy); static void wxgtk_tree_model_set_default_sort_func (GtkTreeSortable *sortable, GtkTreeIterCompareFunc func, gpointer data, - GtkDestroyNotify destroy); + GDestroyNotify destroy); static gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable *sortable); /* drag'n'drop */ @@ -357,9 +590,6 @@ static gboolean wxgtk_tree_model_row_drop_possible (GtkTreeDragDest *d GtkTreePath *dest_path, GtkSelectionData *selection_data); - -static GObjectClass *list_parent_class = NULL; - GType gtk_wx_tree_model_get_type (void) { @@ -369,41 +599,41 @@ gtk_wx_tree_model_get_type (void) { const GTypeInfo tree_model_info = { - sizeof (GtkWxTreeModelClass), + sizeof (GObjectClass), NULL, /* base_init */ NULL, /* base_finalize */ - (GClassInitFunc) wxgtk_tree_model_class_init, + NULL, NULL, /* class_finalize */ NULL, /* class_data */ sizeof (GtkWxTreeModel), 0, - (GInstanceInitFunc) wxgtk_tree_model_init, + wxgtk_tree_model_init, }; static const GInterfaceInfo tree_model_iface_info = { - (GInterfaceInitFunc) wxgtk_tree_model_tree_model_init, + wxgtk_tree_model_tree_model_init, NULL, NULL }; static const GInterfaceInfo sortable_iface_info = { - (GInterfaceInitFunc) wxgtk_tree_model_sortable_init, + wxgtk_tree_model_sortable_init, NULL, NULL }; static const GInterfaceInfo drag_source_iface_info = { - (GInterfaceInitFunc) wxgtk_tree_model_drag_source_init, + wxgtk_tree_model_drag_source_init, NULL, NULL }; static const GInterfaceInfo drag_dest_iface_info = { - (GInterfaceInitFunc) wxgtk_tree_model_drag_dest_init, + wxgtk_tree_model_drag_dest_init, NULL, NULL }; @@ -436,16 +666,9 @@ wxgtk_tree_model_new(void) } static void -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_tree_model_finalize; -} - -static void -wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface) +wxgtk_tree_model_tree_model_init(void* g_iface, void*) { + GtkTreeModelIface* iface = static_cast(g_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; @@ -461,8 +684,9 @@ wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface) } static void -wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface) +wxgtk_tree_model_sortable_init(void* g_iface, void*) { + GtkTreeSortableIface* iface = static_cast(g_iface); 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; @@ -471,34 +695,30 @@ wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface) } static void -wxgtk_tree_model_drag_source_init(GtkTreeDragSourceIface *iface) +wxgtk_tree_model_drag_source_init(void* g_iface, void*) { + GtkTreeDragSourceIface* iface = static_cast(g_iface); iface->row_draggable = wxgtk_tree_model_row_draggable; iface->drag_data_delete = wxgtk_tree_model_drag_data_delete; iface->drag_data_get = wxgtk_tree_model_drag_data_get; } static void -wxgtk_tree_model_drag_dest_init (GtkTreeDragDestIface *iface) +wxgtk_tree_model_drag_dest_init(void* g_iface, void*) { + GtkTreeDragDestIface* iface = static_cast(g_iface); iface->drag_data_received = wxgtk_tree_model_drag_data_received; iface->row_drop_possible = wxgtk_tree_model_row_drop_possible; } static void -wxgtk_tree_model_init (GtkWxTreeModel *tree_model) +wxgtk_tree_model_init(GTypeInstance* instance, void*) { + GtkWxTreeModel* tree_model = GTK_WX_TREE_MODEL(instance); 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); -} - } // extern "C" //----------------------------------------------------------------------------- @@ -539,8 +759,8 @@ wxgtk_tree_model_get_column_type (GtkTreeModel *tree_model, gtype = G_TYPE_STRING; else { - gtype = G_TYPE_STRING; - // wxFAIL_MSG( wxT("non-string columns not supported yet") ); + gtype = G_TYPE_POINTER; + // wxFAIL_MSG( wxT("non-string columns not supported for searching yet") ); } return gtype; @@ -617,7 +837,10 @@ wxgtk_tree_model_iter_children (GtkTreeModel *tree_model, { GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - g_return_val_if_fail (wxtree_model->stamp == parent->stamp, FALSE); + if (parent) + { + g_return_val_if_fail (wxtree_model->stamp == parent->stamp, FALSE); + } return wxtree_model->internal->iter_children( iter, parent ); } @@ -791,7 +1014,7 @@ wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable, if (gs_lastLeftClickHeader) { wxDataViewCtrl *dv = tree_model->internal->GetOwner(); - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, dv->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_COLUMN_SORTED, dv->GetId() ); event.SetDataViewColumn( gs_lastLeftClickHeader ); event.SetModel( dv->GetModel() ); dv->HandleWindowEvent( event ); @@ -805,7 +1028,7 @@ wxgtk_tree_model_set_sort_func (GtkTreeSortable *sortable, gint WXUNUSED(sort_column_id), GtkTreeIterCompareFunc func, gpointer WXUNUSED(data), - GtkDestroyNotify WXUNUSED(destroy)) + GDestroyNotify WXUNUSED(destroy)) { g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) ); g_return_if_fail (func != NULL); @@ -815,7 +1038,7 @@ static void wxgtk_tree_model_set_default_sort_func (GtkTreeSortable *sortable, GtkTreeIterCompareFunc func, gpointer WXUNUSED(data), - GtkDestroyNotify WXUNUSED(destroy)) + GDestroyNotify WXUNUSED(destroy)) { g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) ); g_return_if_fail (func != NULL); @@ -840,15 +1063,12 @@ extern "C" { #define GTK_TYPE_WX_CELL_RENDERER_TEXT (gtk_wx_cell_renderer_text_get_type ()) #define GTK_WX_CELL_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_RENDERER_TEXT, GtkWxCellRendererText)) -#define GTK_WX_CELL_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WX_CELL_RENDERER_TEXT, GtkWxCellRendererTextClass)) #define GTK_IS_WX_CELL_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_CELL_RENDERER_TEXT)) #define GTK_IS_WX_CELL_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_CELL_RENDERER_TEXT)) -#define GTK_WX_CELL_RENDERER_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WX_CELL_RENDERER_TEXT, GtkWxCellRendererTextClass)) GType gtk_wx_cell_renderer_text_get_type (void); typedef struct _GtkWxCellRendererText GtkWxCellRendererText; -typedef struct _GtkWxCellRendererTextClass GtkWxCellRendererTextClass; struct _GtkWxCellRendererText { @@ -857,26 +1077,18 @@ struct _GtkWxCellRendererText wxDataViewRenderer *wx_renderer; }; -struct _GtkWxCellRendererTextClass -{ - GtkCellRendererTextClass cell_parent_class; -}; - - static GtkWxCellRendererText *gtk_wx_cell_renderer_text_new (void); static void gtk_wx_cell_renderer_text_init ( - GtkWxCellRendererText *cell ); + GTypeInstance* instance, void*); static void gtk_wx_cell_renderer_text_class_init( - GtkWxCellRendererTextClass *klass ); -static void gtk_wx_cell_renderer_text_finalize ( - GObject *object ); + void* klass, void*); static GtkCellEditable *gtk_wx_cell_renderer_text_start_editing( GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, const gchar *path, - GdkRectangle *background_area, - GdkRectangle *cell_area, + wxConstGdkRect *background_area, + wxConstGdkRect *cell_area, GtkCellRendererState flags ); @@ -893,15 +1105,15 @@ gtk_wx_cell_renderer_text_get_type (void) { const GTypeInfo cell_wx_info = { - sizeof (GtkWxCellRendererTextClass), + sizeof (GtkCellRendererTextClass), NULL, /* base_init */ NULL, /* base_finalize */ - (GClassInitFunc) gtk_wx_cell_renderer_text_class_init, + gtk_wx_cell_renderer_text_class_init, NULL, /* class_finalize */ NULL, /* class_data */ sizeof (GtkWxCellRendererText), 0, /* n_preallocs */ - (GInstanceInitFunc) gtk_wx_cell_renderer_text_init, + gtk_wx_cell_renderer_text_init, }; cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER_TEXT, @@ -912,31 +1124,22 @@ gtk_wx_cell_renderer_text_get_type (void) } static void -gtk_wx_cell_renderer_text_init (GtkWxCellRendererText *cell) +gtk_wx_cell_renderer_text_init(GTypeInstance* instance, void*) { + GtkWxCellRendererText* cell = GTK_WX_CELL_RENDERER_TEXT(instance); cell->wx_renderer = NULL; } static void -gtk_wx_cell_renderer_text_class_init (GtkWxCellRendererTextClass *klass) +gtk_wx_cell_renderer_text_class_init(void* klass, void*) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass); text_cell_parent_class = (GObjectClass*) g_type_class_peek_parent (klass); - object_class->finalize = gtk_wx_cell_renderer_text_finalize; - cell_class->start_editing = gtk_wx_cell_renderer_text_start_editing; } -static void -gtk_wx_cell_renderer_text_finalize (GObject *object) -{ - /* must chain up */ - (* G_OBJECT_CLASS (text_cell_parent_class)->finalize) (object); -} - GtkWxCellRendererText* gtk_wx_cell_renderer_text_new (void) { @@ -948,25 +1151,22 @@ static GtkCellEditable *gtk_wx_cell_renderer_text_start_editing( GdkEvent *gdk_event, GtkWidget *widget, const gchar *path, - GdkRectangle *background_area, - GdkRectangle *cell_area, + wxConstGdkRect *background_area, + wxConstGdkRect *cell_area, GtkCellRendererState flags ) { GtkWxCellRendererText *wxgtk_renderer = (GtkWxCellRendererText *) gtk_renderer; wxDataViewRenderer *wx_renderer = wxgtk_renderer->wx_renderer; + wxDataViewColumn *column = wx_renderer->GetOwner(); - GtkTreePath *treepath = gtk_tree_path_new_from_string( path ); - GtkTreeIter iter; - wx_renderer->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, treepath ); - wxDataViewItem item( (void*) iter.user_data );; - gtk_tree_path_free( treepath ); + wxDataViewItem + item(column->GetOwner()->GTKPathToItem(wxGtkTreePath(path))); - wxDataViewColumn *column = wx_renderer->GetOwner(); wxDataViewCtrl *dv = column->GetOwner(); - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING, dv->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_START_EDITING, dv->GetId() ); event.SetDataViewColumn( column ); event.SetModel( dv->GetModel() ); - event.SetColumn( wx_renderer->GetOwner()->GetModelColumn() ); + event.SetColumn( column->GetModelColumn() ); event.SetItem( item ); dv->HandleWindowEvent( event ); @@ -985,15 +1185,12 @@ extern "C" { #define GTK_TYPE_WX_CELL_RENDERER (gtk_wx_cell_renderer_get_type ()) #define GTK_WX_CELL_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRenderer)) -#define GTK_WX_CELL_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRendererClass)) #define GTK_IS_WX_CELL_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_CELL_RENDERER)) #define GTK_IS_WX_CELL_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_CELL_RENDERER)) -#define GTK_WX_CELL_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRendererClass)) GType gtk_wx_cell_renderer_get_type (void); typedef struct _GtkWxCellRenderer GtkWxCellRenderer; -typedef struct _GtkWxCellRendererClass GtkWxCellRendererClass; struct _GtkWxCellRenderer { @@ -1001,58 +1198,52 @@ struct _GtkWxCellRenderer /*< private >*/ wxDataViewCustomRenderer *cell; - guint32 last_click; -}; - -struct _GtkWxCellRendererClass -{ - GtkCellRendererClass cell_parent_class; }; - static GtkCellRenderer *gtk_wx_cell_renderer_new (void); static void gtk_wx_cell_renderer_init ( - GtkWxCellRenderer *cell ); + GTypeInstance* instance, void*); static void gtk_wx_cell_renderer_class_init( - GtkWxCellRendererClass *klass ); -static void gtk_wx_cell_renderer_finalize ( - GObject *object ); + void* klass, void*); static void gtk_wx_cell_renderer_get_size ( GtkCellRenderer *cell, GtkWidget *widget, - GdkRectangle *rectangle, + wxConstGdkRect *rectangle, gint *x_offset, gint *y_offset, gint *width, gint *height ); static void gtk_wx_cell_renderer_render ( GtkCellRenderer *cell, +#ifdef __WXGTK3__ + cairo_t* cr, +#else GdkWindow *window, +#endif GtkWidget *widget, - GdkRectangle *background_area, - GdkRectangle *cell_area, + wxConstGdkRect *background_area, + wxConstGdkRect *cell_area, +#ifndef __WXGTK3__ GdkRectangle *expose_area, +#endif GtkCellRendererState flags ); static gboolean gtk_wx_cell_renderer_activate( GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, const gchar *path, - GdkRectangle *background_area, - GdkRectangle *cell_area, + wxConstGdkRect *background_area, + wxConstGdkRect *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, + wxConstGdkRect *background_area, + wxConstGdkRect *cell_area, GtkCellRendererState flags ); - -static GObjectClass *cell_parent_class = NULL; - } // extern "C" GType @@ -1064,15 +1255,15 @@ gtk_wx_cell_renderer_get_type (void) { const GTypeInfo cell_wx_info = { - sizeof (GtkWxCellRendererClass), + sizeof (GtkCellRendererClass), NULL, /* base_init */ NULL, /* base_finalize */ - (GClassInitFunc) gtk_wx_cell_renderer_class_init, + gtk_wx_cell_renderer_class_init, NULL, /* class_finalize */ NULL, /* class_data */ sizeof (GtkWxCellRenderer), 0, /* n_preallocs */ - (GInstanceInitFunc) gtk_wx_cell_renderer_init, + gtk_wx_cell_renderer_init, }; cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER, @@ -1083,35 +1274,23 @@ gtk_wx_cell_renderer_get_type (void) } static void -gtk_wx_cell_renderer_init (GtkWxCellRenderer *cell) +gtk_wx_cell_renderer_init(GTypeInstance* instance, void*) { + GtkWxCellRenderer* cell = GTK_WX_CELL_RENDERER(instance); cell->cell = NULL; - cell->last_click = 0; } static void -gtk_wx_cell_renderer_class_init (GtkWxCellRendererClass *klass) +gtk_wx_cell_renderer_class_init(void* klass, void*) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass); - cell_parent_class = (GObjectClass*) g_type_class_peek_parent (klass); - - object_class->finalize = gtk_wx_cell_renderer_finalize; - 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 -gtk_wx_cell_renderer_finalize (GObject *object) -{ - /* must chain up */ - (* G_OBJECT_CLASS (cell_parent_class)->finalize) (object); -} - GtkCellRenderer* gtk_wx_cell_renderer_new (void) { @@ -1123,8 +1302,8 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing( GdkEvent *WXUNUSED(event), GtkWidget *widget, const gchar *path, - GdkRectangle *WXUNUSED(background_area), - GdkRectangle *cell_area, + wxConstGdkRect *WXUNUSED(background_area), + wxConstGdkRect *cell_area, GtkCellRendererState WXUNUSED(flags) ) { GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer; @@ -1150,14 +1329,11 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing( // 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 ); +// wxRect renderrect(wxRectFromGDKRect(&rect)); + wxRect renderrect(wxRectFromGDKRect(cell_area)); - 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 ); + wxDataViewItem + item(cell->GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(path))); cell->StartEditing( item, renderrect ); @@ -1167,7 +1343,7 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing( static void gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer, GtkWidget *WXUNUSED(widget), - GdkRectangle *cell_area, + wxConstGdkRect *cell_area, gint *x_offset, gint *y_offset, gint *width, @@ -1178,8 +1354,21 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer, wxSize size = cell->GetSize(); - gint calc_width = (gint) renderer->xpad * 2 + size.x; - gint calc_height = (gint) renderer->ypad * 2 + size.y; + wxDataViewCtrl * const ctrl = cell->GetOwner()->GetOwner(); + + // Uniform row height, if specified, overrides the value returned by the + // renderer. + if ( !ctrl->HasFlag(wxDV_VARIABLE_LINE_HEIGHT) ) + { + const int uniformHeight = ctrl->GTKGetUniformRowHeight(); + if ( uniformHeight > 0 ) + size.y = uniformHeight; + } + + int xpad, ypad; + gtk_cell_renderer_get_padding(renderer, &xpad, &ypad); + int calc_width = xpad * 2 + size.x; + int calc_height = ypad * 2 + size.y; if (x_offset) *x_offset = 0; @@ -1188,17 +1377,17 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer, if (cell_area && size.x > 0 && size.y > 0) { + float xalign, yalign; + gtk_cell_renderer_get_alignment(renderer, &xalign, &yalign); if (x_offset) { - *x_offset = (gint)((renderer->xalign * - (cell_area->width - calc_width - 2 * renderer->xpad))); - *x_offset = MAX (*x_offset, 0) + renderer->xpad; + *x_offset = int(xalign * (cell_area->width - calc_width - 2 * xpad)); + *x_offset = MAX(*x_offset, 0) + xpad; } if (y_offset) { - *y_offset = (gint)((renderer->yalign * - (cell_area->height - calc_height - 2 * renderer->ypad))); - *y_offset = MAX (*y_offset, 0) + renderer->ypad; + *y_offset = int(yalign * (cell_area->height - calc_height - 2 * ypad)); + *y_offset = MAX(*y_offset, 0) + ypad; } } @@ -1209,67 +1398,96 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer, *height = calc_height; } +struct wxDataViewCustomRenderer::GTKRenderParams +{ +#ifdef __WXGTK3__ + cairo_t* cr; +#else + GdkWindow* window; + GdkRectangle* expose_area; +#endif + GtkWidget* widget; + wxConstGdkRect* background_area; + int flags; +}; + static void gtk_wx_cell_renderer_render (GtkCellRenderer *renderer, +#ifdef __WXGTK3__ + cairo_t* cr, +#else GdkWindow *window, +#endif GtkWidget *widget, - GdkRectangle *background_area, - GdkRectangle *cell_area, + wxConstGdkRect *background_area, + wxConstGdkRect *cell_area, +#ifndef __WXGTK3__ GdkRectangle *expose_area, +#endif GtkCellRendererState flags) { GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer; wxDataViewCustomRenderer *cell = wxrenderer->cell; - cell->window = window; - cell->widget = widget; - cell->background_area = (void*) background_area; - cell->cell_area = (void*) cell_area; - cell->expose_area = (void*) expose_area; - cell->flags = (int) flags; - - 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; - - GdkRectangle dummy; - if (gdk_rectangle_intersect (expose_area, &rect, &dummy)) + wxDataViewCustomRenderer::GTKRenderParams renderParams; +#ifdef __WXGTK3__ + renderParams.cr = cr; +#else + renderParams.window = window; + renderParams.expose_area = expose_area; +#endif + renderParams.widget = widget; + renderParams.background_area = background_area; + renderParams.flags = flags; + cell->GTKSetRenderParams(&renderParams); + + wxRect rect(wxRectFromGDKRect(cell_area)); + int xpad, ypad; + gtk_cell_renderer_get_padding(renderer, &xpad, &ypad); + rect = rect.Deflate(xpad, ypad); + + wxDC* dc = cell->GetDC(); +#ifdef __WXGTK3__ + wxGraphicsContext* context = dc->GetGraphicsContext(); + void* nativeContext = NULL; + if (context) + nativeContext = context->GetNativeContext(); + if (cr != nativeContext) { - wxRect renderrect( rect.x, rect.y, rect.width, rect.height ); - wxWindowDC* dc = (wxWindowDC*) cell->GetDC(); - wxWindowDCImpl *impl = (wxWindowDCImpl *) dc->GetImpl(); - - // Reinitialize wxWindowDC's GDK window if drawing occurs into a different - // window such as a DnD drop window. - if (window != impl->m_gdkwindow) - { - impl->Destroy(); - impl->m_gdkwindow = window; - impl->SetUpDC(); - } + cairo_reference(cr); + dc->SetGraphicsContext(wxGraphicsContext::CreateFromNative(cr)); + } +#else + wxWindowDCImpl *impl = (wxWindowDCImpl *) dc->GetImpl(); - int state = 0; - if (flags & GTK_CELL_RENDERER_SELECTED) - state |= wxDATAVIEW_CELL_SELECTED; - if (flags & GTK_CELL_RENDERER_PRELIT) - state |= wxDATAVIEW_CELL_PRELIT; - if (flags & GTK_CELL_RENDERER_INSENSITIVE) - state |= wxDATAVIEW_CELL_INSENSITIVE; - if (flags & GTK_CELL_RENDERER_INSENSITIVE) - state |= wxDATAVIEW_CELL_INSENSITIVE; - if (flags & GTK_CELL_RENDERER_FOCUSED) - state |= wxDATAVIEW_CELL_FOCUSED; - cell->Render( renderrect, dc, state ); + // Reinitialize wxWindowDC's GDK window if drawing occurs into a different + // window such as a DnD drop window. + if (window != impl->m_gdkwindow) + { + impl->Destroy(); + impl->m_gdkwindow = window; + impl->SetUpDC(); } +#endif + + int state = 0; + if (flags & GTK_CELL_RENDERER_SELECTED) + state |= wxDATAVIEW_CELL_SELECTED; + if (flags & GTK_CELL_RENDERER_PRELIT) + state |= wxDATAVIEW_CELL_PRELIT; + if (flags & GTK_CELL_RENDERER_INSENSITIVE) + state |= wxDATAVIEW_CELL_INSENSITIVE; + if (flags & GTK_CELL_RENDERER_INSENSITIVE) + state |= wxDATAVIEW_CELL_INSENSITIVE; + if (flags & GTK_CELL_RENDERER_FOCUSED) + state |= wxDATAVIEW_CELL_FOCUSED; + cell->WXCallRender( rect, dc, state ); + + cell->GTKSetRenderParams(NULL); +#ifdef __WXGTK3__ + dc->SetGraphicsContext(NULL); +#endif } static gboolean @@ -1278,8 +1496,8 @@ gtk_wx_cell_renderer_activate( GdkEvent *event, GtkWidget *widget, const gchar *path, - GdkRectangle *WXUNUSED(background_area), - GdkRectangle *cell_area, + wxConstGdkRect *WXUNUSED(background_area), + wxConstGdkRect *cell_area, GtkCellRendererState WXUNUSED(flags) ) { GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer; @@ -1294,53 +1512,41 @@ gtk_wx_cell_renderer_activate( 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 ); + int xpad, ypad; + gtk_cell_renderer_get_padding(renderer, &xpad, &ypad); + rect.width -= xpad * 2; + rect.height -= ypad * 2; - wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel(); + wxRect renderrect(wxRectFromGDKRect(&rect)); - GtkTreePath *treepath = gtk_tree_path_new_from_string( path ); + wxDataViewCtrl * const ctrl = cell->GetOwner()->GetOwner(); + wxDataViewModel *model = ctrl->GetModel(); - GtkTreeIter iter; - cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, treepath ); - wxDataViewItem item( iter.user_data ); - gtk_tree_path_free( treepath ); + wxDataViewItem item(ctrl->GTKPathToItem(wxGtkTreePath(path))); unsigned int model_col = cell->GetOwner()->GetModelColumn(); - if (!event) + if ( !event ) { - bool ret = false; - // activated by - if (cell->Activate( renderrect, model, item, model_col )) - ret = true; - - return ret; + return cell->ActivateCell(renderrect, model, item, model_col, NULL); } - else if (event->type == GDK_BUTTON_PRESS) + else if ( event->type == GDK_BUTTON_PRESS ) { - GdkEventButton *button_event = (GdkEventButton*) event; - wxPoint pt( ((int) button_event->x) - renderrect.x, - ((int) button_event->y) - renderrect.y ); - - bool ret = false; - if (button_event->button == 1) + GdkEventButton *button_event = (GdkEventButton*)event; + if ( button_event->button == 1 ) { - 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, item, model_col )) - ret = true; - } - wxrenderer->last_click = button_event->time; + wxMouseEvent mouse_event(wxEVT_LEFT_DOWN); + InitMouseEvent(ctrl, mouse_event, button_event); + + mouse_event.m_x -= renderrect.x; + mouse_event.m_y -= renderrect.y; - return ret; + return cell->ActivateCell(renderrect, model, item, model_col, &mouse_event); + } } + wxLogDebug("unexpected event type in gtk_wx_cell_renderer_activate()"); return false; } @@ -1351,24 +1557,23 @@ gtk_wx_cell_renderer_activate( class wxGtkDataViewModelNotifier: public wxDataViewModelNotifier { public: - wxGtkDataViewModelNotifier( GtkWxTreeModel *wxgtk_model, - wxDataViewModel *wx_model, - wxDataViewCtrl *ctrl ); + wxGtkDataViewModelNotifier( wxDataViewModel *wx_model, wxDataViewCtrlInternal *internal ); ~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 ValueChanged( const wxDataViewItem &item, unsigned int model_column ); virtual bool Cleared(); virtual void Resort(); + virtual bool BeforeReset(); + virtual bool AfterReset(); - void SetGtkModel( GtkWxTreeModel *model ) { m_wxgtk_model = model; } + void UpdateLastCount(); private: - GtkWxTreeModel *m_wxgtk_model; - wxDataViewModel *m_wx_model; - wxDataViewCtrl *m_owner; + wxDataViewModel *m_wx_model; + wxDataViewCtrlInternal *m_internal; }; // --------------------------------------------------------- @@ -1376,108 +1581,146 @@ private: // --------------------------------------------------------- wxGtkDataViewModelNotifier::wxGtkDataViewModelNotifier( - GtkWxTreeModel* wxgtk_model, wxDataViewModel *wx_model, - wxDataViewCtrl *ctrl ) + wxDataViewModel *wx_model, wxDataViewCtrlInternal *internal ) { - m_wxgtk_model = wxgtk_model; m_wx_model = wx_model; - m_owner = ctrl; + m_internal = internal; } wxGtkDataViewModelNotifier::~wxGtkDataViewModelNotifier() { m_wx_model = NULL; - m_wxgtk_model = NULL; + m_internal = NULL; } bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) { - m_owner->GtkGetInternal()->ItemAdded( parent, item ); + m_internal->ItemAdded( parent, item ); + GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel(); GtkTreeIter iter; - iter.stamp = m_wxgtk_model->stamp; - iter.user_data = (gpointer) item.GetID(); + iter.stamp = wxgtk_model->stamp; + iter.user_data = item.GetID(); - GtkTreePath *path = wxgtk_tree_model_get_path( - GTK_TREE_MODEL(m_wxgtk_model), &iter ); + wxGtkTreePath path(wxgtk_tree_model_get_path( + GTK_TREE_MODEL(wxgtk_model), &iter )); gtk_tree_model_row_inserted( - GTK_TREE_MODEL(m_wxgtk_model), path, &iter); - gtk_tree_path_free (path); + GTK_TREE_MODEL(wxgtk_model), path, &iter); return true; } bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) { + GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel(); +#if 0 + // using _get_path for a deleted item cannot be + // a good idea GtkTreeIter iter; - iter.stamp = m_wxgtk_model->stamp; + iter.stamp = wxgtk_model->stamp; iter.user_data = (gpointer) item.GetID(); + wxGtkTreePath path(wxgtk_tree_model_get_path( + GTK_TREE_MODEL(wxgtk_model), &iter )); +#else + // so get the path from the parent + GtkTreeIter parentIter; + parentIter.stamp = wxgtk_model->stamp; + parentIter.user_data = (gpointer) parent.GetID(); + wxGtkTreePath parentPath(wxgtk_tree_model_get_path( + GTK_TREE_MODEL(wxgtk_model), &parentIter )); + + // and add the final index ourselves + wxGtkTreePath path(gtk_tree_path_copy(parentPath)); + int index = m_internal->GetIndexOf( parent, item ); + gtk_tree_path_append_index( path, index ); +#endif - 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); + GTK_TREE_MODEL(wxgtk_model), path ); + + m_internal->ItemDeleted( parent, item ); - m_owner->GtkGetInternal()->ItemDeleted( parent, item ); + // Did we remove the last child, causing 'parent' to become a leaf? + if ( !m_wx_model->IsContainer(parent) ) + { + gtk_tree_model_row_has_child_toggled + ( + GTK_TREE_MODEL(wxgtk_model), + parentPath, + &parentIter + ); + } return true; } void wxGtkDataViewModelNotifier::Resort() { - m_owner->GtkGetInternal()->Resort(); + m_internal->Resort(); } bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item ) { + GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel(); + GtkTreeIter iter; - iter.stamp = m_wxgtk_model->stamp; + iter.stamp = wxgtk_model->stamp; iter.user_data = (gpointer) item.GetID(); - GtkTreePath *path = wxgtk_tree_model_get_path( - GTK_TREE_MODEL(m_wxgtk_model), &iter ); + wxGtkTreePath path(wxgtk_tree_model_get_path( + GTK_TREE_MODEL(wxgtk_model), &iter )); gtk_tree_model_row_changed( - GTK_TREE_MODEL(m_wxgtk_model), path, &iter ); - gtk_tree_path_free (path); + GTK_TREE_MODEL(wxgtk_model), path, &iter ); - m_owner->GtkGetInternal()->ItemChanged( item ); + m_internal->ItemChanged( item ); return true; } -bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsigned int model_col ) +bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsigned int model_column ) { + GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel(); + wxDataViewCtrl *ctrl = m_internal->GetOwner(); + // This adds GTK+'s missing MVC logic for ValueChanged unsigned int index; - for (index = 0; index < m_owner->GetColumnCount(); index++) + for (index = 0; index < ctrl->GetColumnCount(); index++) { - wxDataViewColumn *column = m_owner->GetColumn( index ); - if (column->GetModelColumn() == model_col) + wxDataViewColumn *column = ctrl->GetColumn( index ); + if (column->GetModelColumn() == model_column) { - GtkTreeView *widget = GTK_TREE_VIEW(m_owner->m_treeview); + GtkTreeView *widget = GTK_TREE_VIEW(ctrl->GtkGetTreeView()); GtkTreeViewColumn *gcolumn = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()); - // Get cell area - 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 ); - - 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 - xdiff, ydiff + cell_area.y, cell_area.width, cell_area.height ); + // Don't attempt to refresh not yet realized tree, it is useless + // and results in GTK errors. + if ( gtk_widget_get_realized(ctrl->GtkGetTreeView()) ) + { + // Get cell area + GtkTreeIter iter; + iter.stamp = wxgtk_model->stamp; + iter.user_data = (gpointer) item.GetID(); + wxGtkTreePath path(wxgtk_tree_model_get_path( + GTK_TREE_MODEL(wxgtk_model), &iter )); + GdkRectangle cell_area; + gtk_tree_view_get_cell_area( widget, path, gcolumn, &cell_area ); +#ifdef __WXGTK3__ + GtkAdjustment* hadjust = gtk_scrollable_get_hadjustment(GTK_SCROLLABLE(widget)); +#else + GtkAdjustment* hadjust = gtk_tree_view_get_hadjustment( widget ); +#endif + double d = gtk_adjustment_get_value( hadjust ); + int xdiff = (int) d; + + GtkAllocation a; + gtk_widget_get_allocation(GTK_WIDGET(gtk_tree_view_column_get_button(gcolumn)), &a); + int ydiff = a.height; + // 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 ); + m_internal->ValueChanged( item, model_column ); return true; } @@ -1486,9 +1729,45 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig return false; } +bool wxGtkDataViewModelNotifier::BeforeReset() +{ + GtkWidget *treeview = m_internal->GetOwner()->GtkGetTreeView(); + gtk_tree_view_set_model( GTK_TREE_VIEW(treeview), NULL ); + + return true; +} + +bool wxGtkDataViewModelNotifier::AfterReset() +{ + GtkWidget *treeview = m_internal->GetOwner()->GtkGetTreeView(); + GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel(); + + m_internal->Cleared(); + + gtk_tree_view_set_model( GTK_TREE_VIEW(treeview), GTK_TREE_MODEL(wxgtk_model) ); + + return true; +} + bool wxGtkDataViewModelNotifier::Cleared() { - m_owner->GtkGetInternal()->Cleared(); + GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel(); + + // There is no call to tell the model that everything + // has been deleted so call row_deleted() for every + // child of root... + + int count = m_internal->iter_n_children( NULL ); // number of children of root + + GtkTreePath *path = gtk_tree_path_new_first(); // points to root + + int i; + for (i = 0; i < count; i++) + gtk_tree_model_row_deleted( GTK_TREE_MODEL(wxgtk_model), path ); + + gtk_tree_path_free( path ); + + m_internal->Cleared(); return true; } @@ -1505,7 +1784,7 @@ wxgtk_cell_editable_editing_done( GtkCellEditable *WXUNUSED(editable), { wxDataViewColumn *column = wxrenderer->GetOwner(); wxDataViewCtrl *dv = column->GetOwner(); - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, dv->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_EDITING_DONE, dv->GetId() ); event.SetDataViewColumn( column ); event.SetModel( dv->GetModel() ); wxDataViewItem item( s_user_data ); @@ -1522,22 +1801,18 @@ wxgtk_renderer_editing_started( GtkCellRenderer *WXUNUSED(cell), GtkCellEditable wxDataViewColumn *column = wxrenderer->GetOwner(); wxDataViewCtrl *dv = column->GetOwner(); - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, dv->GetId() ); + wxDataViewEvent event( wxEVT_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 ); + wxDataViewItem item(dv->GTKPathToItem(wxGtkTreePath(path))); event.SetItem( item ); dv->HandleWindowEvent( event ); if (GTK_IS_CELL_EDITABLE(editable)) { - s_user_data = iter.user_data; + s_user_data = item.GetID(); - g_signal_connect (GTK_CELL_EDITABLE (editable), "editing_done", + g_signal_connect (editable, "editing_done", G_CALLBACK (wxgtk_cell_editable_editing_done), (gpointer) wxrenderer ); @@ -1552,16 +1827,24 @@ wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewC wxDataViewRendererBase( varianttype, mode, align ) { m_renderer = NULL; + m_mode = mode; + + // we haven't changed them yet + m_usingDefaultAttrs = true; // NOTE: SetMode() and SetAlignment() needs to be called in the renderer's ctor, // after the m_renderer pointer has been initialized } +void wxDataViewRenderer::GtkPackIntoColumn(GtkTreeViewColumn *column) +{ + gtk_tree_view_column_pack_end( column, m_renderer, TRUE /* expand */); +} + void wxDataViewRenderer::GtkInitHandlers() { - if (!gtk_check_version(2,6,0)) { - g_signal_connect (GTK_CELL_RENDERER(m_renderer), "editing_started", + g_signal_connect (m_renderer, "editing_started", G_CALLBACK (wxgtk_renderer_editing_started), this); } @@ -1589,6 +1872,8 @@ void wxDataViewRenderer::SetMode( wxDataViewCellMode mode ) return; } + m_mode = mode; + // This value is most often ignored in GtkTreeView GValue gvalue = { 0, }; g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() ); @@ -1628,7 +1913,7 @@ wxDataViewCellMode wxDataViewRenderer::GetMode() const return ret; } -void wxDataViewRenderer::GtkUpdateAlignment() +void wxDataViewRenderer::GtkApplyAlignment(GtkCellRenderer *renderer) { int align = m_alignment; @@ -1654,7 +1939,7 @@ void wxDataViewRenderer::GtkUpdateAlignment() 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_object_set_property( G_OBJECT(renderer), "xalign", &gvalue ); g_value_unset( &gvalue ); // vertical alignment: @@ -1668,7 +1953,7 @@ void wxDataViewRenderer::GtkUpdateAlignment() 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_object_set_property( G_OBJECT(renderer), "yalign", &gvalue2 ); g_value_unset( &gvalue2 ); } @@ -1683,39 +1968,173 @@ int wxDataViewRenderer::GetAlignment() const return m_alignment; } -// --------------------------------------------------------- -// wxDataViewTextRenderer -// --------------------------------------------------------- +void wxDataViewRenderer::EnableEllipsize(wxEllipsizeMode mode) +{ + GtkCellRendererText * const rend = GtkGetTextRenderer(); + if ( !rend ) + return; -extern "C" { -static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer, - gchar *arg1, gchar *arg2, gpointer user_data ); + // we use the same values in wxEllipsizeMode as PangoEllipsizeMode so we + // can just cast between them + GValue gvalue = { 0, }; + g_value_init( &gvalue, PANGO_TYPE_ELLIPSIZE_MODE ); + g_value_set_enum( &gvalue, static_cast(mode) ); + g_object_set_property( G_OBJECT(rend), "ellipsize", &gvalue ); + g_value_unset( &gvalue ); } -static void wxGtkTextRendererEditedCallback( GtkCellRendererText *WXUNUSED(renderer), - gchar *arg1, gchar *arg2, gpointer user_data ) +wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const { - wxDataViewRenderer *cell = (wxDataViewRenderer*) user_data; - - wxString tmp = wxGTK_CONV_BACK_FONT(arg2, cell->GetOwner()->GetOwner()->GetFont()); - wxVariant value = tmp; - if (!cell->Validate( value )) - return; + GtkCellRendererText * const rend = GtkGetTextRenderer(); + if ( !rend ) + return wxELLIPSIZE_NONE; - wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel(); + GValue gvalue = { 0, }; + g_value_init( &gvalue, PANGO_TYPE_ELLIPSIZE_MODE ); + g_object_get_property( G_OBJECT(rend), "ellipsize", &gvalue ); + wxEllipsizeMode + mode = static_cast(g_value_get_enum( &gvalue )); + g_value_unset( &gvalue ); - GtkTreePath *path = gtk_tree_path_new_from_string( arg1 ); - GtkTreeIter iter; - cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, path ); - wxDataViewItem item( (void*) iter.user_data );; - gtk_tree_path_free( path ); + return mode; +} - unsigned int model_col = cell->GetOwner()->GetModelColumn(); +void +wxDataViewRenderer::GtkOnTextEdited(const char *itempath, const wxString& str) +{ + wxVariant value(str); + if (!Validate( value )) + return; + + wxDataViewItem + item(GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(itempath))); + + GtkOnCellChanged(value, item, GetOwner()->GetModelColumn()); +} + +void +wxDataViewRenderer::GtkOnCellChanged(const wxVariant& value, + const wxDataViewItem& item, + unsigned col) +{ + wxDataViewModel *model = GetOwner()->GetOwner()->GetModel(); + model->ChangeValue( value, item, col ); +} + +// --------------------------------------------------------- +// wxDataViewTextRenderer +// --------------------------------------------------------- + +extern "C" +{ + +static void wxGtkTextRendererEditedCallback( GtkCellRendererText *WXUNUSED(renderer), + gchar *arg1, gchar *arg2, gpointer user_data ) +{ + wxDataViewRenderer *cell = (wxDataViewRenderer*) user_data; + + cell->GtkOnTextEdited(arg1, wxGTK_CONV_BACK_FONT( + arg2, cell->GetOwner()->GetOwner()->GetFont())); +} + +} + +namespace +{ + +// helper function used by wxDataViewTextRenderer and +// wxDataViewCustomRenderer::RenderText(): it applies the attributes to the +// given text renderer and returns true if anything was done +bool GtkApplyAttr(GtkCellRendererText *renderer, const wxDataViewItemAttr& attr) +{ + bool usingDefaultAttrs = true; + if (attr.HasColour()) + { + const GdkColor * const gcol = attr.GetColour().GetColor(); + + GValue gvalue = { 0, }; + g_value_init( &gvalue, GDK_TYPE_COLOR ); + g_value_set_boxed( &gvalue, gcol ); + g_object_set_property( G_OBJECT(renderer), "foreground_gdk", &gvalue ); + g_value_unset( &gvalue ); + + usingDefaultAttrs = false; + } + else + { + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_BOOLEAN ); + g_value_set_boolean( &gvalue, FALSE ); + g_object_set_property( G_OBJECT(renderer), "foreground-set", &gvalue ); + g_value_unset( &gvalue ); + } + + if (attr.GetItalic()) + { + GValue gvalue = { 0, }; + g_value_init( &gvalue, PANGO_TYPE_STYLE ); + g_value_set_enum( &gvalue, PANGO_STYLE_ITALIC ); + g_object_set_property( G_OBJECT(renderer), "style", &gvalue ); + g_value_unset( &gvalue ); + + usingDefaultAttrs = false; + } + else + { + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_BOOLEAN ); + g_value_set_boolean( &gvalue, FALSE ); + g_object_set_property( G_OBJECT(renderer), "style-set", &gvalue ); + g_value_unset( &gvalue ); + } + + + if (attr.GetBold()) + { + GValue gvalue = { 0, }; + g_value_init( &gvalue, PANGO_TYPE_WEIGHT ); + g_value_set_enum( &gvalue, PANGO_WEIGHT_BOLD ); + g_object_set_property( G_OBJECT(renderer), "weight", &gvalue ); + g_value_unset( &gvalue ); + + usingDefaultAttrs = false; + } + else + { + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_BOOLEAN ); + g_value_set_boolean( &gvalue, FALSE ); + g_object_set_property( G_OBJECT(renderer), "weight-set", &gvalue ); + g_value_unset( &gvalue ); + } + +#if 0 + 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 - model->SetValue( value, item, model_col ); - model->ValueChanged( item, model_col ); + return !usingDefaultAttrs; } +} // anonymous namespace + IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer) wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode, @@ -1743,29 +2162,25 @@ wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxD SetAlignment(align); } -bool wxDataViewTextRenderer::SetValue( const wxVariant &value ) +bool wxDataViewTextRenderer::SetTextValue(const wxString& str) { - wxString tmp = value; - GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_STRING ); - g_value_set_string( &gvalue, wxGTK_CONV_FONT( tmp, GetOwner()->GetOwner()->GetFont() ) ); + g_value_set_string( &gvalue, wxGTK_CONV_FONT( str, GetOwner()->GetOwner()->GetFont() ) ); g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); g_value_unset( &gvalue ); return true; } -bool wxDataViewTextRenderer::GetValue( wxVariant &value ) const +bool wxDataViewTextRenderer::GetTextValue(wxString& str) 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_FONT( g_value_get_string( &gvalue ), const_cast(this)->GetOwner()->GetOwner()->GetFont() ); + str = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ), const_cast(this)->GetOwner()->GetOwner()->GetFont() ); g_value_unset( &gvalue ); - value = tmp; - return true; } @@ -1773,8 +2188,10 @@ void wxDataViewTextRenderer::SetAlignment( int align ) { wxDataViewRenderer::SetAlignment(align); +#ifndef __WXGTK3__ if (gtk_check_version(2,10,0)) return; +#endif // horizontal alignment: PangoAlignment pangoAlign = PANGO_ALIGN_LEFT; @@ -1790,17 +2207,42 @@ void wxDataViewTextRenderer::SetAlignment( int align ) g_value_unset( &gvalue ); } +bool wxDataViewTextRenderer::GtkSetAttr(const wxDataViewItemAttr& attr) +{ + return GtkApplyAttr(GtkGetTextRenderer(), attr); +} + +GtkCellRendererText *wxDataViewTextRenderer::GtkGetTextRenderer() const +{ + return GTK_CELL_RENDERER_TEXT(m_renderer); +} + // --------------------------------------------------------- // wxDataViewBitmapRenderer // --------------------------------------------------------- +namespace +{ + +// set "pixbuf" property on the given renderer +void SetPixbufProp(GtkCellRenderer *renderer, GdkPixbuf *pixbuf) +{ + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_OBJECT ); + g_value_set_object( &gvalue, pixbuf ); + g_object_set_property( G_OBJECT(renderer), "pixbuf", &gvalue ); + g_value_unset( &gvalue ); +} + +} // anonymous namespace + IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer) wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode, int align ) : wxDataViewRenderer( varianttype, mode, align ) { - m_renderer = (GtkCellRenderer*) gtk_cell_renderer_pixbuf_new(); + m_renderer = gtk_cell_renderer_pixbuf_new(); SetMode(mode); SetAlignment(align); @@ -1813,38 +2255,23 @@ 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; + // GetPixbuf() may create a Pixbuf representation in the wxBitmap + // object (and it will stay there and remain owned by wxBitmap) + SetPixbufProp(m_renderer, bitmap.GetPixbuf()); } - - if (value.GetType() == wxT("wxIcon")) + else 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(); + wxIcon icon; + icon << value; - 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; + SetPixbufProp(m_renderer, icon.GetPixbuf()); + } + else + { + return false; } - return false; + return true; } bool wxDataViewBitmapRenderer::GetValue( wxVariant &WXUNUSED(value) ) const @@ -1870,27 +2297,21 @@ static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer, GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_BOOLEAN ); g_object_get_property( G_OBJECT(renderer), "active", &gvalue ); - bool tmp = g_value_get_boolean( &gvalue ); - g_value_unset( &gvalue ); // invert it - tmp = !tmp; + wxVariant value = !g_value_get_boolean( &gvalue ); + g_value_unset( &gvalue ); - wxVariant value = tmp; if (!cell->Validate( value )) return; - wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel(); + wxDataViewCtrl * const ctrl = cell->GetOwner()->GetOwner(); + wxDataViewModel *model = ctrl->GetModel(); - GtkTreePath *gtk_path = gtk_tree_path_new_from_string( path ); - GtkTreeIter iter; - cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, gtk_path ); - wxDataViewItem item( (void*) iter.user_data );; - gtk_tree_path_free( gtk_path ); + wxDataViewItem item(ctrl->GTKPathToItem(wxGtkTreePath(path))); unsigned int model_col = cell->GetOwner()->GetModelColumn(); - model->SetValue( value, item, model_col ); - model->ValueChanged( item, model_col ); + model->ChangeValue( value, item, model_col ); } IMPLEMENT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer) @@ -1937,11 +2358,9 @@ bool wxDataViewToggleRenderer::GetValue( wxVariant &value ) const GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_BOOLEAN ); g_object_get_property( G_OBJECT(m_renderer), "active", &gvalue ); - bool tmp = g_value_get_boolean( &gvalue ); + value = g_value_get_boolean( &gvalue ) != 0; g_value_unset( &gvalue ); - value = tmp; - return true; } @@ -1949,6 +2368,7 @@ bool wxDataViewToggleRenderer::GetValue( wxVariant &value ) const // wxDataViewCustomRenderer // --------------------------------------------------------- +#ifndef __WXGTK3__ class wxDataViewCtrlDCImpl: public wxWindowDCImpl { public: @@ -1963,7 +2383,7 @@ public: m_context = window->GTKGetPangoDefaultContext(); m_layout = pango_layout_new( m_context ); - m_fontdesc = pango_font_description_copy( widget->style->font_desc ); + m_fontdesc = pango_font_description_copy(gtk_widget_get_style(widget)->font_desc); m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget ); @@ -1979,7 +2399,7 @@ public: wxWindowDC( new wxDataViewCtrlDCImpl( this, window ) ) { } }; - +#endif // --------------------------------------------------------- // wxDataViewCustomRenderer @@ -1988,12 +2408,14 @@ public: IMPLEMENT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer) wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, - wxDataViewCellMode mode, int align, - bool no_init ) : - wxDataViewRenderer( varianttype, mode, align ) + wxDataViewCellMode mode, + int align, + bool no_init ) + : wxDataViewCustomRendererBase( varianttype, mode, align ) { m_dc = NULL; m_text_renderer = NULL; + m_renderParams = NULL; if (no_init) m_renderer = NULL; @@ -2001,40 +2423,60 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, Init(mode, align); } -void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, - wxRect WXUNUSED(cell), wxDC *WXUNUSED(dc), int WXUNUSED(state) ) +void wxDataViewCustomRenderer::GtkInitTextRenderer() { -#if 0 - wxDataViewCtrl *view = GetOwner()->GetOwner(); - wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ? - wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) : - view->GetForegroundColour(); - dc->SetTextForeground(col); - dc->DrawText( text, cell.x + xoffset, cell.y + ((cell.height - dc->GetCharHeight()) / 2)); -#else - if (!m_text_renderer) - m_text_renderer = gtk_cell_renderer_text_new(); + m_text_renderer = GTK_CELL_RENDERER_TEXT(gtk_cell_renderer_text_new()); + g_object_ref_sink(m_text_renderer); + + GtkApplyAlignment(GTK_CELL_RENDERER(m_text_renderer)); +} + +GtkCellRendererText *wxDataViewCustomRenderer::GtkGetTextRenderer() const +{ + if ( !m_text_renderer ) + { + // we create it on demand so need to do it even from a const function + const_cast(this)->GtkInitTextRenderer(); + } + + return m_text_renderer; +} + +void wxDataViewCustomRenderer::RenderText( const wxString &text, + int xoffset, + wxRect cell, + wxDC *WXUNUSED(dc), + int WXUNUSED(state) ) +{ + + GtkCellRendererText * const textRenderer = GtkGetTextRenderer(); GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_STRING ); g_value_set_string( &gvalue, wxGTK_CONV_FONT( text, GetOwner()->GetOwner()->GetFont() ) ); - g_object_set_property( G_OBJECT(m_text_renderer), "text", &gvalue ); + g_object_set_property( G_OBJECT(textRenderer), "text", &gvalue ); g_value_unset( &gvalue ); - ((GdkRectangle*) cell_area)->x += xoffset; - ((GdkRectangle*) cell_area)->width -= xoffset; + GtkApplyAttr(textRenderer, GetAttr()); - gtk_cell_renderer_render( m_text_renderer, - window, - widget, - (GdkRectangle*) background_area, - (GdkRectangle*) cell_area, - (GdkRectangle*) expose_area, - (GtkCellRendererState) flags ); + GdkRectangle cell_area; + wxRectToGDKRect(cell, cell_area); + cell_area.x += xoffset; + cell_area.width -= xoffset; - ((GdkRectangle*) cell_area)->x -= xoffset; - ((GdkRectangle*) cell_area)->width += xoffset; + gtk_cell_renderer_render( GTK_CELL_RENDERER(textRenderer), +#ifdef __WXGTK3__ + m_renderParams->cr, +#else + m_renderParams->window, #endif + m_renderParams->widget, + m_renderParams->background_area, + &cell_area, +#ifndef __WXGTK3__ + m_renderParams->expose_area, +#endif + GtkCellRendererState(m_renderParams->flags)); } bool wxDataViewCustomRenderer::Init(wxDataViewCellMode mode, int align) @@ -2058,18 +2500,25 @@ wxDataViewCustomRenderer::~wxDataViewCustomRenderer() delete m_dc; if (m_text_renderer) - gtk_object_sink( GTK_OBJECT(m_text_renderer) ); + g_object_unref(m_text_renderer); } wxDC *wxDataViewCustomRenderer::GetDC() { if (m_dc == NULL) { +#ifdef __WXGTK3__ + wxASSERT(m_renderParams); + cairo_t* cr = m_renderParams->cr; + wxASSERT(cr && cairo_status(cr) == 0); + m_dc = new wxGTKCairoDC(cr); +#else if (GetOwner() == NULL) return NULL; if (GetOwner()->GetOwner() == NULL) return NULL; m_dc = new wxDataViewCtrlDC( GetOwner()->GetOwner() ); +#endif } return m_dc; @@ -2087,27 +2536,23 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label, { m_label = label; m_value = 0; + m_renderer = (GtkCellRenderer*) gtk_cell_renderer_progress_new(); -#ifdef __WXGTK26__ - if (!gtk_check_version(2,6,0)) - { - m_renderer = (GtkCellRenderer*) gtk_cell_renderer_progress_new(); - - GValue gvalue = { 0, }; - g_value_init( &gvalue, G_TYPE_STRING ); - - g_value_set_string( &gvalue, wxGTK_CONV_FONT( m_label, GetOwner()->GetOwner()->GetFont() ) ); - g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); - g_value_unset( &gvalue ); + SetMode(mode); + SetAlignment(align); - SetMode(mode); - SetAlignment(align); - } +#if !wxUSE_UNICODE + // We can't initialize the renderer just yet because we don't have the + // pointer to the column that uses this renderer yet and so attempt to + // dereference GetOwner() to get the font that is used as a source of + // encoding in multibyte-to-Unicode conversion in GTKSetLabel() in + // non-Unicode builds would crash. So simply remember to do it later. + if ( !m_label.empty() ) + m_needsToSetLabel = true; else -#endif +#endif // !wxUSE_UNICODE { - // Use custom cell code - wxDataViewCustomRenderer::Init(mode, align); + GTKSetLabel(); } } @@ -2115,26 +2560,41 @@ wxDataViewProgressRenderer::~wxDataViewProgressRenderer() { } -bool wxDataViewProgressRenderer::SetValue( const wxVariant &value ) +void wxDataViewProgressRenderer::GTKSetLabel() { -#ifdef __WXGTK26__ - if (!gtk_check_version(2,6,0)) - { - gint tmp = (long) value; - GValue gvalue = { 0, }; - g_value_init( &gvalue, G_TYPE_INT ); - g_value_set_int( &gvalue, tmp ); - g_object_set_property( G_OBJECT(m_renderer), "value", &gvalue ); - g_value_unset( &gvalue ); - } + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_STRING ); + + // Take care to not use GetOwner() here if the label is empty, we can be + // called from ctor when GetOwner() is still NULL in this case. + wxScopedCharBuffer buf; + if ( m_label.empty() ) + buf = wxScopedCharBuffer::CreateNonOwned(""); else -#endif - { - m_value = (long) value; + buf = wxGTK_CONV_FONT(m_label, GetOwner()->GetOwner()->GetFont()); - if (m_value < 0) m_value = 0; - if (m_value > 100) m_value = 100; - } + g_value_set_string( &gvalue, buf); + g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); + g_value_unset( &gvalue ); + +#if !wxUSE_UNICODE + m_needsToSetLabel = false; +#endif // !wxUSE_UNICODE +} + +bool wxDataViewProgressRenderer::SetValue( const wxVariant &value ) +{ +#if !wxUSE_UNICODE + if ( m_needsToSetLabel ) + GTKSetLabel(); +#endif // !wxUSE_UNICODE + + gint tmp = (long) value; + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_INT ); + g_value_set_int( &gvalue, tmp ); + g_object_set_property( G_OBJECT(m_renderer), "value", &gvalue ); + g_value_unset( &gvalue ); return true; } @@ -2173,42 +2633,30 @@ wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString &choices wxDataViewCellMode mode, int alignment ) : wxDataViewCustomRenderer( "string", mode, alignment, true ) { - m_choices = choices; - -#ifdef __WXGTK26__ - if (!gtk_check_version(2,6,0)) + m_choices = choices; + m_renderer = (GtkCellRenderer*) gtk_cell_renderer_combo_new(); + GtkListStore *store = gtk_list_store_new( 1, G_TYPE_STRING ); + for (size_t n = 0; n < m_choices.GetCount(); n++) { - m_renderer = (GtkCellRenderer*) gtk_cell_renderer_combo_new(); - - GtkListStore *store = gtk_list_store_new( 1, G_TYPE_STRING ); - for (size_t n = 0; n < m_choices.GetCount(); n++) - { - gtk_list_store_insert_with_values( - store, NULL, n, 0, - static_cast(m_choices[n].utf8_str()), -1 ); - } + gtk_list_store_insert_with_values( + store, NULL, n, 0, + static_cast(m_choices[n].utf8_str()), -1 ); + } - g_object_set (m_renderer, - "model", store, - "text-column", 0, - "has-entry", FALSE, - NULL); + g_object_set (m_renderer, + "model", store, + "text-column", 0, + "has-entry", FALSE, + NULL); - bool editable = (mode & wxDATAVIEW_CELL_EDITABLE); - g_object_set (m_renderer, "editable", editable, NULL); + bool editable = (mode & wxDATAVIEW_CELL_EDITABLE) != 0; + g_object_set (m_renderer, "editable", editable, NULL); - SetAlignment(alignment); + SetAlignment(alignment); - g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this ); + g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this ); - GtkInitHandlers(); - } - else -#endif - { - // Use custom cell code - wxDataViewCustomRenderer::Init(mode, alignment); - } + GtkInitHandlers(); } bool wxDataViewChoiceRenderer::Render( wxRect rect, wxDC *dc, int state ) @@ -2224,42 +2672,26 @@ wxSize wxDataViewChoiceRenderer::GetSize() const bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value ) { - -#ifdef __WXGTK26__ - if (!gtk_check_version(2,6,0)) - { - GValue gvalue = { 0, }; - g_value_init( &gvalue, G_TYPE_STRING ); - g_value_set_string( &gvalue, wxGTK_CONV_FONT( value.GetString(), GetOwner()->GetOwner()->GetFont() ) ); - g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); - g_value_unset( &gvalue ); - } - else -#endif - m_data = value.GetString(); + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_STRING ); + g_value_set_string(&gvalue, + wxGTK_CONV_FONT(value.GetString(), + GetOwner()->GetOwner()->GetFont())); + g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); + g_value_unset( &gvalue ); return true; } bool wxDataViewChoiceRenderer::GetValue( wxVariant &value ) const { -#ifdef __WXGTK26__ - if (!gtk_check_version(2,6,0)) - { - GValue gvalue = { 0, }; - g_value_init( &gvalue, G_TYPE_STRING ); - g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue ); - wxString temp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ), - const_cast(this)->GetOwner()->GetOwner()->GetFont() ); - g_value_unset( &gvalue ); - value = temp; - - //wxPrintf( "temp %s\n", temp ); - // TODO: remove this code - } - else -#endif - value = m_data; + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_STRING ); + g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue ); + wxString temp = wxGTK_CONV_BACK_FONT(g_value_get_string(&gvalue), + GetOwner()->GetOwner()->GetFont()); + g_value_unset( &gvalue ); + value = temp; return true; } @@ -2268,8 +2700,10 @@ void wxDataViewChoiceRenderer::SetAlignment( int align ) { wxDataViewCustomRenderer::SetAlignment(align); +#ifndef __WXGTK3__ if (gtk_check_version(2,10,0)) return; +#endif // horizontal alignment: PangoAlignment pangoAlign = PANGO_ALIGN_LEFT; @@ -2285,178 +2719,110 @@ void wxDataViewChoiceRenderer::SetAlignment( int align ) g_value_unset( &gvalue ); } -// --------------------------------------------------------- -// wxDataViewDateRenderer -// --------------------------------------------------------- - -class wxDataViewDateRendererPopupTransient: public wxPopupTransientWindow -{ -public: - wxDataViewDateRendererPopupTransient( wxWindow* parent, wxDateTime *value, - wxDataViewModel *model, const wxDataViewItem &item, unsigned int col ) : - wxPopupTransientWindow( parent, wxBORDER_SIMPLE ) - { - m_model = model; - m_item = item; - m_col = col; - m_cal = new wxCalendarCtrl( this, -1, *value ); - wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL ); - sizer->Add( m_cal, 1, wxGROW ); - SetSizer( sizer ); - sizer->Fit( this ); - } - - virtual void OnDismiss() - { - } - - void OnCalendar( wxCalendarEvent &event ); - - wxCalendarCtrl *m_cal; - wxDataViewModel *m_model; - wxDataViewItem m_item; - unsigned int m_col; - -private: - DECLARE_EVENT_TABLE() -}; - -BEGIN_EVENT_TABLE(wxDataViewDateRendererPopupTransient,wxPopupTransientWindow) - EVT_CALENDAR( -1, wxDataViewDateRendererPopupTransient::OnCalendar ) -END_EVENT_TABLE() - -void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event ) -{ - wxDateTime date = event.GetDate(); - wxVariant value = date; - m_model->SetValue( value, m_item, m_col ); - m_model->ValueChanged( m_item, m_col ); - DismissAndNotify(); -} - -IMPLEMENT_CLASS(wxDataViewDateRenderer, wxDataViewCustomRenderer) +// ---------------------------------------------------------------------------- +// wxDataViewChoiceByIndexRenderer +// ---------------------------------------------------------------------------- -wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype, - wxDataViewCellMode mode, int align ) : - wxDataViewCustomRenderer( varianttype, mode, align ) +wxDataViewChoiceByIndexRenderer::wxDataViewChoiceByIndexRenderer( const wxArrayString &choices, + wxDataViewCellMode mode, int alignment ) : + wxDataViewChoiceRenderer( choices, mode, alignment ) { - SetMode(mode); - SetAlignment(align); } -bool wxDataViewDateRenderer::SetValue( const wxVariant &value ) +void wxDataViewChoiceByIndexRenderer::GtkOnTextEdited(const char *itempath, const wxString& str) { - m_date = value.GetDateTime(); + wxVariant value( (long) GetChoices().Index( str ) ); - return true; -} + if (!Validate( value )) + return; -bool wxDataViewDateRenderer::GetValue( wxVariant &WXUNUSED(value) ) const -{ - return false; -} + wxDataViewItem + item(GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(itempath))); -bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state ) -{ - dc->SetFont( GetOwner()->GetOwner()->GetFont() ); - wxString tmp = m_date.FormatDate(); - RenderText( tmp, 0, cell, dc, state ); - return true; + GtkOnCellChanged(value, item, GetOwner()->GetModelColumn()); } -wxSize wxDataViewDateRenderer::GetSize() const +bool wxDataViewChoiceByIndexRenderer::SetValue( const wxVariant &value ) { - wxString tmp = m_date.FormatDate(); - wxCoord x,y,d; - GetView()->GetTextExtent( tmp, &x, &y, &d ); - return wxSize(x,y+d); + wxVariant string_value = GetChoice( value.GetLong() ); + return wxDataViewChoiceRenderer::SetValue( string_value ); } -bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *model, - const wxDataViewItem &item, unsigned int col ) +bool wxDataViewChoiceByIndexRenderer::GetValue( wxVariant &value ) const { - wxVariant variant; - model->GetValue( variant, item, col ); - wxDateTime value = variant.GetDateTime(); - - wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient( - GetOwner()->GetOwner()->GetParent(), &value, model, item, col ); - wxPoint pos = wxGetMousePosition(); - popup->Move( pos ); - popup->Layout(); - popup->Popup( popup->m_cal ); + wxVariant string_value; + if (!wxDataViewChoiceRenderer::GetValue( string_value )) + return false; + value = (long) GetChoices().Index( string_value.GetString() ); return true; } - // --------------------------------------------------------- // wxDataViewIconTextRenderer // --------------------------------------------------------- IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer) -wxDataViewIconTextRenderer::wxDataViewIconTextRenderer( - const wxString &varianttype, wxDataViewCellMode mode, int align ) : - wxDataViewCustomRenderer( varianttype, mode, align ) +wxDataViewIconTextRenderer::wxDataViewIconTextRenderer + ( + const wxString &varianttype, + wxDataViewCellMode mode, + int align + ) + : wxDataViewTextRenderer(varianttype, mode, align) { - SetMode(mode); - SetAlignment(align); + m_rendererIcon = gtk_cell_renderer_pixbuf_new(); } wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer() { } -bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value ) +void wxDataViewIconTextRenderer::GtkPackIntoColumn(GtkTreeViewColumn *column) { - m_value << value; - return true; -} + // add the icon renderer first + gtk_tree_view_column_pack_start(column, m_rendererIcon, FALSE /* !expand */); -bool wxDataViewIconTextRenderer::GetValue( wxVariant &WXUNUSED(value) ) const -{ - return false; + // add the text renderer too + wxDataViewRenderer::GtkPackIntoColumn(column); } -bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state ) +bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value ) { - const wxIcon &icon = m_value.GetIcon(); - int offset = 0; - if (icon.IsOk()) - { - int yoffset = wxMax( 0, (cell.height - icon.GetHeight()) / 2 ); - dc->DrawIcon( icon, cell.x, cell.y + yoffset ); - offset = icon.GetWidth() + 4; - } + m_value << value; + + SetTextValue(m_value.GetText()); - RenderText( m_value.GetText(), offset, cell, dc, state ); + const wxIcon& icon = m_value.GetIcon(); + SetPixbufProp(m_rendererIcon, icon.IsOk() ? icon.GetPixbuf() : NULL); return true; } -wxSize wxDataViewIconTextRenderer::GetSize() const +bool wxDataViewIconTextRenderer::GetValue(wxVariant& value) const { - wxSize size; - if (m_value.GetIcon().IsOk()) - size.x = 4 + m_value.GetIcon().GetWidth(); - wxCoord x,y,d; - GetView()->GetTextExtent( m_value.GetText(), &x, &y, &d ); - size.x += x; - size.y = y+d; - return size; -} + wxString str; + if ( !GetTextValue(str) ) + return false; -wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl( - wxWindow *WXUNUSED(parent), wxRect WXUNUSED(labelRect), const wxVariant &WXUNUSED(value) ) -{ - return NULL; + // user doesn't have any way to edit the icon so leave it unchanged + value << wxDataViewIconText(str, m_value.GetIcon()); + + return true; } -bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( - wxControl* WXUNUSED(editor), wxVariant &WXUNUSED(value) ) +void +wxDataViewIconTextRenderer::GtkOnCellChanged(const wxVariant& value, + const wxDataViewItem& item, + unsigned col) { - return false; + // we receive just the text part of our value as it's the only one which + // can be edited, but we need the full wxDataViewIconText value for the + // model + wxVariant valueIconText; + valueIconText << wxDataViewIconText(value.GetString(), m_value.GetIcon()); + wxDataViewTextRenderer::GtkOnCellChanged(valueIconText, item, col); } // --------------------------------------------------------- @@ -2477,7 +2843,7 @@ gtk_dataview_header_button_press_callback( GtkWidget *WXUNUSED(widget), gs_lastLeftClickHeader = column; wxDataViewCtrl *dv = column->GetOwner(); - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() ); event.SetDataViewColumn( column ); event.SetModel( dv->GetModel() ); if (dv->HandleWindowEvent( event )) @@ -2487,7 +2853,7 @@ gtk_dataview_header_button_press_callback( GtkWidget *WXUNUSED(widget), if (gdk_event->button == 3) { wxDataViewCtrl *dv = column->GetOwner(); - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, dv->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, dv->GetId() ); event.SetDataViewColumn( column ); event.SetModel( dv->GetModel() ); if (dv->HandleWindowEvent( event )) @@ -2497,14 +2863,8 @@ gtk_dataview_header_button_press_callback( GtkWidget *WXUNUSED(widget), return FALSE; } -extern "C" { -static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, - GtkCellRenderer *cell, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data ); -} - +extern "C" +{ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column), GtkCellRenderer *renderer, @@ -2523,37 +2883,25 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column), if (!wx_model->IsVirtualListModel()) { - - if (wx_model->IsContainer( item )) - { - if (wx_model->HasContainerColumns( item ) || (cell->GetOwner()->GetModelColumn() == 0)) + gboolean visible; + if (wx_model->IsContainer( item )) { - GValue gvalue = { 0, }; - g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_value_set_boolean( &gvalue, TRUE ); - g_object_set_property( G_OBJECT(renderer), "visible", &gvalue ); - g_value_unset( &gvalue ); + visible = wx_model->HasContainerColumns( item ) || + (cell->GetOwner()->GetModelColumn() == 0); } else { - GValue gvalue = { 0, }; - g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_value_set_boolean( &gvalue, FALSE ); - g_object_set_property( G_OBJECT(renderer), "visible", &gvalue ); - g_value_unset( &gvalue ); - - return; + visible = true; } - } - else - { + GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_value_set_boolean( &gvalue, TRUE ); + g_value_set_boolean( &gvalue, visible ); g_object_set_property( G_OBJECT(renderer), "visible", &gvalue ); g_value_unset( &gvalue ); - } + if ( !visible ) + return; } wxVariant value; @@ -2563,93 +2911,48 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column), { wxLogError( wxT("Wrong type, required: %s but: %s"), value.GetType().c_str(), - cell->GetVariantType().c_str() ); - } - - cell->SetValue( value ); - - wxDataViewItemAttr attr; - if (wx_model->GetAttr( item, cell->GetOwner()->GetModelColumn(), attr )) - { - if (attr.HasColour()) - { - const GdkColor * const gcol = attr.GetColour().GetColor(); - - GValue gvalue = { 0, }; - g_value_init( &gvalue, GDK_TYPE_COLOR ); - g_value_set_boxed( &gvalue, gcol ); - g_object_set_property( G_OBJECT(renderer), "foreground_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), "foreground-set", &gvalue ); - g_value_unset( &gvalue ); - } - - if (attr.GetItalic()) - { - GValue gvalue = { 0, }; - g_value_init( &gvalue, PANGO_TYPE_STYLE ); - g_value_set_enum( &gvalue, PANGO_STYLE_ITALIC ); - g_object_set_property( G_OBJECT(renderer), "style", &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), "style-set", &gvalue ); - g_value_unset( &gvalue ); - } + cell->GetVariantType().c_str() ); + } + cell->SetValue( value ); - if (attr.GetBold()) - { - GValue gvalue = { 0, }; - g_value_init( &gvalue, PANGO_TYPE_WEIGHT ); - g_value_set_enum( &gvalue, PANGO_WEIGHT_BOLD ); - g_object_set_property( G_OBJECT(renderer), "weight", &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), "weight-set", &gvalue ); - g_value_unset( &gvalue ); - } - } + // deal with disabled items + bool enabled = wx_model->IsEnabled( item, cell->GetOwner()->GetModelColumn() ); -#if 0 - if (attr.HasBackgroundColour()) - { - wxColour colour = attr.GetBackgroundColour(); - const GdkColor * const gcol = colour.GetColor(); + // a) this sets the appearance to disabled grey + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_BOOLEAN ); + g_value_set_boolean( &gvalue, enabled ); + g_object_set_property( G_OBJECT(renderer), "sensitive", &gvalue ); + g_value_unset( &gvalue ); - 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 ); - } + // b) this actually disables the control/renderer + if (enabled) + cell->SetMode( cell->GtkGetMode() ); else + cell->SetMode( wxDATAVIEW_CELL_INERT ); + + + // deal with attributes: if the renderer doesn't support them at all, we + // don't even need to query the model for them + if ( !cell->GtkSupportsAttrs() ) + return; + + // it can support attributes so check if this item has any + wxDataViewItemAttr attr; + if ( wx_model->GetAttr( item, cell->GetOwner()->GetModelColumn(), attr ) + || !cell->GtkIsUsingDefaultAttrs() ) { - 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 ); + bool usingDefaultAttrs = !cell->GtkSetAttr(attr); + cell->GtkSetUsingDefaultAttrs(usingDefaultAttrs); } -#endif - + // else: no custom attributes specified and we're already using the default + // ones -- nothing to do + } +} // extern "C" + #include WX_DEFINE_LIST(wxDataViewColumnList) @@ -2677,7 +2980,6 @@ void wxDataViewColumn::Init(wxAlignment align, int flags, int width) { m_isConnected = false; - GtkCellRenderer *renderer = (GtkCellRenderer *) GetRenderer()->GetGtkHandle(); GtkTreeViewColumn *column = gtk_tree_view_column_new(); m_column = (GtkWidget*) column; @@ -2687,7 +2989,7 @@ void wxDataViewColumn::Init(wxAlignment align, int flags, int width) SetWidth( width ); // Create container for icon and label - GtkWidget *box = gtk_hbox_new( FALSE, 1 ); + GtkWidget* box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1); gtk_widget_show( box ); // gtk_container_set_border_width((GtkContainer*)box, 2); m_image = gtk_image_new(); @@ -2696,10 +2998,13 @@ void wxDataViewColumn::Init(wxAlignment align, int flags, int width) gtk_box_pack_end( GTK_BOX(box), GTK_WIDGET(m_label), FALSE, FALSE, 1 ); gtk_tree_view_column_set_widget( column, box ); - gtk_tree_view_column_pack_end( column, renderer, TRUE ); + wxDataViewRenderer * const colRenderer = GetRenderer(); + GtkCellRenderer * const cellRenderer = colRenderer->GetGtkHandle(); - gtk_tree_view_column_set_cell_data_func( column, renderer, - wxGtkTreeCellDataFunc, (gpointer) GetRenderer(), NULL ); + colRenderer->GtkPackIntoColumn(column); + + gtk_tree_view_column_set_cell_data_func( column, cellRenderer, + wxGtkTreeCellDataFunc, (gpointer) colRenderer, NULL ); } void wxDataViewColumn::OnInternalIdle() @@ -2707,14 +3012,18 @@ void wxDataViewColumn::OnInternalIdle() if (m_isConnected) return; - if (GTK_WIDGET_REALIZED(GetOwner()->m_treeview)) + if (gtk_widget_get_realized(GetOwner()->m_treeview)) { GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - if (column->button) + GtkWidget* button = gtk_tree_view_column_get_button(column); + if (button) { - g_signal_connect(column->button, "button_press_event", + g_signal_connect(button, "button_press_event", G_CALLBACK (gtk_dataview_header_button_press_callback), this); + // otherwise the event will be blocked by GTK+ + gtk_tree_view_column_set_clickable( column, TRUE ); + m_isConnected = true; } } @@ -2752,24 +3061,11 @@ void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap ) { wxDataViewColumnBase::SetBitmap( bitmap ); - if (bitmap.Ok()) + if (bitmap.IsOk()) { GtkImage *gtk_image = GTK_IMAGE(m_image); - GdkBitmap *mask = NULL; - if (bitmap.GetMask()) - mask = bitmap.GetMask()->GetBitmap(); - - 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_image_set_from_pixbuf(GTK_IMAGE(gtk_image), bitmap.GetPixbuf()); gtk_widget_show( m_image ); } else @@ -2783,9 +3079,9 @@ void wxDataViewColumn::SetHidden( bool hidden ) gtk_tree_view_column_set_visible( GTK_TREE_VIEW_COLUMN(m_column), !hidden ); } -void wxDataViewColumn::SetResizeable( bool resizeable ) +void wxDataViewColumn::SetResizeable( bool resizable ) { - gtk_tree_view_column_set_resizable( GTK_TREE_VIEW_COLUMN(m_column), resizeable ); + gtk_tree_view_column_set_resizable( GTK_TREE_VIEW_COLUMN(m_column), resizable ); } void wxDataViewColumn::SetAlignment( wxAlignment align ) @@ -2836,27 +3132,19 @@ void wxDataViewColumn::SetSortable( bool sortable ) bool wxDataViewColumn::IsSortable() const { GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - return gtk_tree_view_column_get_clickable( column ); -} - -void wxDataViewColumn::SetAsSortKey( bool WXUNUSED(sort) ) -{ - // it might not make sense to have this function in wxHeaderColumn at - // all in fact, changing of the sort order should only be done using the - // associated control API - wxFAIL_MSG( "not implemented" ); + return gtk_tree_view_column_get_clickable( column ) != 0; } bool wxDataViewColumn::IsSortKey() 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_indicator( column ) != 0; } bool wxDataViewColumn::IsResizeable() const { GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - return gtk_tree_view_column_get_resizable( column ); + return gtk_tree_view_column_get_resizable( column ) != 0; } bool wxDataViewColumn::IsHidden() const @@ -2901,23 +3189,20 @@ int wxDataViewColumn::GetWidth() const void wxDataViewColumn::SetWidth( int width ) { - if (width < 0) + if ( width == wxCOL_WIDTH_AUTOSIZE ) { -#if 1 - gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_FIXED ); - - // TODO find a better calculation - gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), wxDVC_DEFAULT_WIDTH ); -#else - // this is unpractical for large numbers of items and disables - // user resizing, which is totally unexpected + // NB: this disables user resizing gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_AUTOSIZE ); -#endif } else { - gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_FIXED ); + if ( width == wxCOL_WIDTH_DEFAULT ) + { + // TODO find a better calculation + width = wxDVC_DEFAULT_WIDTH; + } + gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_FIXED ); gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), width ); } } @@ -2929,7 +3214,7 @@ void wxDataViewColumn::SetReorderable( bool reorderable ) bool wxDataViewColumn::IsReorderable() const { - return gtk_tree_view_column_get_reorderable( GTK_TREE_VIEW_COLUMN(m_column) ); + return gtk_tree_view_column_get_reorderable( GTK_TREE_VIEW_COLUMN(m_column) ) != 0; } //----------------------------------------------------------------------------- @@ -2959,7 +3244,7 @@ int wxGtkTreeModelChildWithPosCmp( const void* data1, const void* data2, const v static int LINKAGEMODE wxGtkTreeModelChildPtrCmp( void*** data1, void*** data2 ) { - return gs_internal->GetDataViewModel()->Compare( **data1, **data2, + return gs_internal->GetDataViewModel()->Compare( wxDataViewItem(**data1), wxDataViewItem(**data2), gs_internal->GetSortColumn(), (gs_internal->GetSortOrder() == GTK_SORT_ASCENDING) ); } @@ -3061,11 +3346,8 @@ void wxGtkTreeModelNode::Resort() 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); + gtk_tree_model_rows_reordered( gtk_tree_model, + wxGtkTreePath(m_internal->get_path(&iter)), &iter, new_order ); delete [] new_order; @@ -3081,12 +3363,11 @@ void wxGtkTreeModelNode::Resort() // wxDataViewCtrlInternal //----------------------------------------------------------------------------- -wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, - wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model ) +wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_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; @@ -3095,18 +3376,51 @@ wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, m_dragDataObject = NULL; m_dropDataObject = NULL; + m_dirty = false; + + m_gtk_model = wxgtk_tree_model_new(); + m_gtk_model->internal = this; + + m_notifier = new wxGtkDataViewModelNotifier( wx_model, this ); + + wx_model->AddNotifier( m_notifier ); + + // g_object_unref( gtk_model ); ??? + if (!m_wx_model->IsVirtualListModel()) InitTree(); + + gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->GtkGetTreeView()), GTK_TREE_MODEL(m_gtk_model) ); } wxDataViewCtrlInternal::~wxDataViewCtrlInternal() { + m_wx_model->RemoveNotifier( m_notifier ); + + // remove the model from the GtkTreeView before it gets destroyed + gtk_tree_view_set_model( GTK_TREE_VIEW( m_owner->GtkGetTreeView() ), NULL ); + g_object_unref( m_gtk_model ); delete m_dragDataObject; delete m_dropDataObject; } +void wxDataViewCtrlInternal::ScheduleRefresh() +{ + m_dirty = true; +} + +void wxDataViewCtrlInternal::OnInternalIdle() +{ + if (m_dirty) + { + GtkWidget *widget = m_owner->GtkGetTreeView(); + gtk_widget_queue_draw( widget ); + m_dirty = false; + } +} + void wxDataViewCtrlInternal::InitTree() { wxDataViewItem item; @@ -3121,6 +3435,7 @@ void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node ) { wxDataViewItemArray children; unsigned int count = m_wx_model->GetChildren( node->GetItem(), children ); + unsigned int pos; for (pos = 0; pos < count; pos++) { @@ -3129,7 +3444,7 @@ void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node ) if (m_wx_model->IsContainer( child )) node->AddNode( new wxGtkTreeModelNode( node, child, this ) ); else - node->AddLeave( child.GetID() ); + node->AddLeaf( child.GetID() ); // Don't send any events here } @@ -3172,15 +3487,19 @@ gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag GtkTreePath *path ) { delete m_dragDataObject; + m_dragDataObject = NULL; - GtkTreeIter iter; - if (!get_iter( &iter, path )) return FALSE; - wxDataViewItem item( (void*) iter.user_data ); + wxDataViewItem item(GetOwner()->GTKPathToItem(path)); + if ( !item ) + return FALSE; - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() ); event.SetEventObject( m_owner ); event.SetItem( item ); event.SetModel( m_wx_model ); + gint x, y; + gtk_widget_get_pointer(m_owner->GtkGetTreeView(), &x, &y); + event.SetPosition(x, y); if (!m_owner->HandleWindowEvent( event )) return FALSE; @@ -3206,25 +3525,26 @@ wxDataViewCtrlInternal::drag_data_delete(GtkTreeDragSource *WXUNUSED(drag_source gboolean wxDataViewCtrlInternal::drag_data_get( GtkTreeDragSource *WXUNUSED(drag_source), GtkTreePath *path, GtkSelectionData *selection_data ) { - GtkTreeIter iter; - if (!get_iter( &iter, path )) return FALSE; - wxDataViewItem item( (void*) iter.user_data ); + wxDataViewItem item(GetOwner()->GTKPathToItem(path)); + if ( !item ) + return FALSE; - if (!m_dragDataObject->IsSupported( selection_data->target )) + GdkAtom target = gtk_selection_data_get_target(selection_data); + if (!m_dragDataObject->IsSupported(target)) return FALSE; - size_t size = m_dragDataObject->GetDataSize( selection_data->target ); + size_t size = m_dragDataObject->GetDataSize(target); if (size == 0) return FALSE; void *buf = malloc( size ); gboolean res = FALSE; - if (m_dragDataObject->GetDataHere( selection_data->target, buf )) + if (m_dragDataObject->GetDataHere(target, buf)) { res = TRUE; - gtk_selection_data_set( selection_data, selection_data->target, + gtk_selection_data_set(selection_data, target, 8, (const guchar*) buf, size ); } @@ -3238,17 +3558,17 @@ wxDataViewCtrlInternal::drag_data_received(GtkTreeDragDest *WXUNUSED(drag_dest), GtkTreePath *path, GtkSelectionData *selection_data) { - GtkTreeIter iter; - if (!get_iter( &iter, path )) return FALSE; - wxDataViewItem item( (void*) iter.user_data ); + wxDataViewItem item(GetOwner()->GTKPathToItem(path)); + if ( !item ) + return FALSE; - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, m_owner->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP, m_owner->GetId() ); event.SetEventObject( m_owner ); event.SetItem( item ); event.SetModel( m_wx_model ); - event.SetDataFormat( selection_data->target ); - event.SetDataSize( selection_data->length ); - event.SetDataBuffer( selection_data->data ); + event.SetDataFormat(gtk_selection_data_get_target(selection_data)); + event.SetDataSize(gtk_selection_data_get_length(selection_data)); + event.SetDataBuffer(const_cast(gtk_selection_data_get_data(selection_data))); if (!m_owner->HandleWindowEvent( event )) return FALSE; @@ -3263,15 +3583,16 @@ wxDataViewCtrlInternal::row_drop_possible(GtkTreeDragDest *WXUNUSED(drag_dest), GtkTreePath *path, GtkSelectionData *selection_data) { - GtkTreeIter iter; - if (!get_iter( &iter, path )) return FALSE; - wxDataViewItem item( (void*) iter.user_data ); + wxDataViewItem item(GetOwner()->GTKPathToItem(path)); + if ( !item ) + return FALSE; - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); event.SetEventObject( m_owner ); event.SetItem( item ); event.SetModel( m_wx_model ); - event.SetDataFormat( selection_data->target ); + event.SetDataFormat(gtk_selection_data_get_target(selection_data)); + event.SetDataSize(gtk_selection_data_get_length(selection_data)); if (!m_owner->HandleWindowEvent( event )) return FALSE; @@ -3285,16 +3606,16 @@ wxDataViewCtrlInternal::row_drop_possible(GtkTreeDragDest *WXUNUSED(drag_dest), bool wxDataViewCtrlInternal::Cleared() { - GtkWidget* tree_widget = GetOwner()->GtkGetTreeView(); - gtk_tree_view_set_model( GTK_TREE_VIEW(tree_widget), NULL ); - gtk_tree_view_set_model( GTK_TREE_VIEW(tree_widget), GTK_TREE_MODEL(m_gtk_model) ); - if (m_root) { delete m_root; - InitTree(); + m_root = NULL; } + InitTree(); + + ScheduleRefresh(); + return true; } @@ -3302,6 +3623,8 @@ void wxDataViewCtrlInternal::Resort() { if (!m_wx_model->IsVirtualListModel()) m_root->Resort(); + + ScheduleRefresh(); } bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) @@ -3309,15 +3632,63 @@ bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDa if (!m_wx_model->IsVirtualListModel()) { wxGtkTreeModelNode *parent_node = FindNode( parent ); - wxASSERT_MSG(parent_node, + wxCHECK_MSG(parent_node, false, "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel"); + wxDataViewItemArray modelSiblings; + m_wx_model->GetChildren(parent, modelSiblings); + const int modelSiblingsSize = modelSiblings.size(); + + int posInModel = modelSiblings.Index(item, /*fromEnd=*/true); + wxCHECK_MSG( posInModel != wxNOT_FOUND, false, "adding non-existent item?" ); + + const wxGtkTreeModelChildren& nodeSiblings = parent_node->GetChildren(); + const int nodeSiblingsSize = nodeSiblings.size(); + + int nodePos = 0; + + if ( posInModel == modelSiblingsSize - 1 ) + { + nodePos = nodeSiblingsSize; + } + else if ( modelSiblingsSize == nodeSiblingsSize + 1 ) + { + // This is the simple case when our node tree already matches the + // model and only this one item is missing. + nodePos = posInModel; + } + else + { + // It's possible that a larger discrepancy between the model and + // our realization exists. This can happen e.g. when adding a bunch + // of items to the model and then calling ItemsAdded() just once + // afterwards. In this case, we must find the right position by + // looking at sibling items. + + // append to the end if we won't find a better position: + nodePos = nodeSiblingsSize; + + for ( int nextItemPos = posInModel + 1; + nextItemPos < modelSiblingsSize; + nextItemPos++ ) + { + int nextNodePos = parent_node->FindChildByItem(modelSiblings[nextItemPos]); + if ( nextNodePos != wxNOT_FOUND ) + { + nodePos = nextNodePos; + break; + } + } + } + if (m_wx_model->IsContainer( item )) - parent_node->AddNode( new wxGtkTreeModelNode( parent_node, item, this ) ); + parent_node->InsertNode( new wxGtkTreeModelNode( parent_node, item, this ), nodePos ); else - parent_node->AddLeave( item.GetID() ); + parent_node->InsertLeaf( item.GetID(), nodePos ); } + ScheduleRefresh(); + return true; } @@ -3332,12 +3703,14 @@ bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wx parent_node->DeleteChild( item.GetID() ); } + ScheduleRefresh(); + return true; } bool wxDataViewCtrlInternal::ItemChanged( const wxDataViewItem &item ) { - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, m_owner->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, m_owner->GetId() ); event.SetEventObject( m_owner ); event.SetModel( m_owner->GetModel() ); event.SetItem( item ); @@ -3346,13 +3719,13 @@ bool wxDataViewCtrlInternal::ItemChanged( const wxDataViewItem &item ) return true; } -bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned int col ) +bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned int view_column ) { - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, m_owner->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, m_owner->GetId() ); event.SetEventObject( m_owner ); event.SetModel( m_owner->GetModel() ); - event.SetColumn( col ); - event.SetDataViewColumn( GetOwner()->GetColumn(col) ); + event.SetColumn( view_column ); + event.SetDataViewColumn( GetOwner()->GetColumn(view_column) ); event.SetItem( item ); m_owner->HandleWindowEvent( event ); @@ -3363,10 +3736,15 @@ bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned GtkTreeModelFlags wxDataViewCtrlInternal::get_flags() { - if (m_wx_model->IsVirtualListModel()) - return GTK_TREE_MODEL_LIST_ONLY; - else - return GTK_TREE_MODEL_ITERS_PERSIST; + int flags = 0; + + if ( m_wx_model->IsListModel() ) + flags |= GTK_TREE_MODEL_LIST_ONLY; + + if ( !m_wx_model->IsVirtualListModel() ) + flags |= GTK_TREE_MODEL_ITERS_PERSIST; + + return GtkTreeModelFlags(flags); } gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path ) @@ -3383,7 +3761,7 @@ gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path iter->stamp = m_gtk_model->stamp; // user_data is just the index +1 - iter->user_data = (gpointer) (i+1); + iter->user_data = wxUIntToPtr(i+1); return TRUE; } @@ -3430,10 +3808,17 @@ gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter ) { + // When this is called from ItemDeleted(), the item is already + // deleted in the model. + GtkTreePath *retval = gtk_tree_path_new (); if (m_wx_model->IsVirtualListModel()) { + // iter is root, add nothing + if (!iter->user_data) + return retval; + // user_data is just the index +1 int i = ( (wxUIntPtr) iter->user_data ) -1; gtk_tree_path_append_index (retval, i); @@ -3479,7 +3864,7 @@ gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter ) } // user_data is just the index +1 (+2 because we need the next) - iter->user_data = (gpointer) (n+2); + iter->user_data = wxUIntToPtr(n+2); } else { @@ -3527,7 +3912,10 @@ gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter * return TRUE; } - wxDataViewItem item( (void*) parent->user_data ); + + wxDataViewItem item; + if (parent) + item = wxDataViewItem( (void*) parent->user_data ); if (!m_wx_model->IsContainer( item )) return FALSE; @@ -3630,7 +4018,7 @@ gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter iter->stamp = m_gtk_model->stamp; // user_data is just the index +1 - iter->user_data = (gpointer) (n+1); + iter->user_data = wxUIntToPtr(n+1); return TRUE; } @@ -3675,6 +4063,28 @@ gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *ch } } +// item can be deleted already in the model +int wxDataViewCtrlInternal::GetIndexOf( const wxDataViewItem &parent, const wxDataViewItem &item ) +{ + if (m_wx_model->IsVirtualListModel()) + { + return wxPtrToUInt(item.GetID()) - 1; + } + else + { + wxGtkTreeModelNode *parent_node = FindNode( parent ); + wxGtkTreeModelChildren &children = parent_node->GetChildren(); + size_t j; + for (j = 0; j < children.GetCount(); j++) + { + if (children[j] == item.GetID()) + return j; + } + } + return -1; +} + + static wxGtkTreeModelNode* wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item ) { @@ -3698,7 +4108,7 @@ wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *tr if( node && node->GetNodes().GetCount() != 0 ) { int len = node->GetNodes().GetCount(); - wxGtkTreeModelNodes nodes = node->GetNodes(); + wxGtkTreeModelNodes &nodes = node->GetNodes(); int j = 0; for( ; j < len; j ++) { @@ -3846,10 +4256,10 @@ wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( const wxDataViewItem static void wxdataview_selection_changed_callback( GtkTreeSelection* WXUNUSED(selection), wxDataViewCtrl *dv ) { - if (!GTK_WIDGET_REALIZED(dv->m_widget)) + if (!gtk_widget_get_realized(dv->m_widget)) return; - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, dv->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_SELECTION_CHANGED, dv->GetId() ); event.SetItem( dv->GetSelection() ); event.SetModel( dv->GetModel() ); dv->HandleWindowEvent( event ); @@ -3859,11 +4269,9 @@ static void wxdataview_row_activated_callback( GtkTreeView* WXUNUSED(treeview), GtkTreePath *path, GtkTreeViewColumn *WXUNUSED(column), wxDataViewCtrl *dv ) { - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, dv->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_ACTIVATED, dv->GetId() ); - GtkTreeIter iter; - dv->GtkGetInternal()->get_iter( &iter, path ); - wxDataViewItem item( (void*) iter.user_data );; + wxDataViewItem item(dv->GTKPathToItem(path)); event.SetItem( item ); event.SetModel( dv->GetModel() ); dv->HandleWindowEvent( event ); @@ -3873,7 +4281,7 @@ static gboolean wxdataview_test_expand_row_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter, GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv ) { - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, dv->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_EXPANDING, dv->GetId() ); wxDataViewItem item( (void*) iter->user_data );; event.SetItem( item ); @@ -3887,7 +4295,7 @@ static void wxdataview_row_expanded_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter, GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv ) { - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, dv->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_EXPANDED, dv->GetId() ); wxDataViewItem item( (void*) iter->user_data );; event.SetItem( item ); @@ -3899,7 +4307,7 @@ static gboolean wxdataview_test_collapse_row_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter, GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv ) { - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, dv->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_COLLAPSING, dv->GetId() ); wxDataViewItem item( (void*) iter->user_data );; event.SetItem( item ); @@ -3913,7 +4321,7 @@ static void wxdataview_row_collapsed_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter, GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv ) { - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, dv->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_COLLAPSED, dv->GetId() ); wxDataViewItem item( (void*) iter->user_data );; event.SetItem( item ); @@ -3930,7 +4338,7 @@ void wxDataViewCtrl::AddChildGTK(wxWindowGTK* child) GtkWidget* treeview = GtkGetTreeView(); // Insert widget in GtkTreeView - if (GTK_WIDGET_REALIZED(treeview)) + if (gtk_widget_get_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 ); @@ -3947,7 +4355,7 @@ void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget), wxWindow *child = node->GetData(); GtkRequisition req; - gtk_widget_size_request( child->m_widget, &req ); + gtk_widget_get_preferred_size(child->m_widget, NULL, &req); GtkAllocation alloc; alloc.x = child->m_x; @@ -3970,24 +4378,25 @@ gtk_dataview_motion_notify_callback( GtkWidget *WXUNUSED(widget), GdkEventMotion *gdk_event, wxDataViewCtrl *dv ) { + int x = gdk_event->x; + int y = gdk_event->y; if (gdk_event->is_hint) { - int x = 0; - int y = 0; - GdkModifierType state; - gdk_window_get_pointer(gdk_event->window, &x, &y, &state); - gdk_event->x = x; - gdk_event->y = y; +#ifdef __WXGTK3__ + gdk_window_get_device_position(gdk_event->window, gdk_event->device, &x, &y, NULL); +#else + gdk_window_get_pointer(gdk_event->window, &x, &y, NULL); +#endif } - GtkTreePath *path = NULL; + wxGtkTreePath path; GtkTreeViewColumn *column = NULL; gint cell_x = 0; gint cell_y = 0; if (gtk_tree_view_get_path_at_pos( GTK_TREE_VIEW(dv->GtkGetTreeView()), - (int) gdk_event->x, (int) gdk_event->y, - &path, + x, y, + path.ByRef(), &column, &cell_x, &cell_y)) @@ -3996,8 +4405,6 @@ gtk_dataview_motion_notify_callback( GtkWidget *WXUNUSED(widget), { GtkTreeIter iter; dv->GtkGetInternal()->get_iter( &iter, path ); - - gtk_tree_path_free( path ); } } @@ -4016,32 +4423,25 @@ gtk_dataview_button_press_callback( GtkWidget *WXUNUSED(widget), { if ((gdk_event->button == 3) && (gdk_event->type == GDK_BUTTON_PRESS)) { - GtkTreePath *path = NULL; + wxGtkTreePath path; GtkTreeViewColumn *column = NULL; gint cell_x = 0; gint cell_y = 0; - if (gtk_tree_view_get_path_at_pos( + gtk_tree_view_get_path_at_pos + ( GTK_TREE_VIEW(dv->GtkGetTreeView()), (int) gdk_event->x, (int) gdk_event->y, - &path, + path.ByRef(), &column, &cell_x, - &cell_y)) - { - if (path) - { - GtkTreeIter iter; - dv->GtkGetInternal()->get_iter( &iter, path ); - - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, dv->GetId() ); - wxDataViewItem item( (void*) iter.user_data );; - event.SetItem( item ); - event.SetModel( dv->GetModel() ); - bool ret = dv->HandleWindowEvent( event ); - gtk_tree_path_free( path ); - return ret; - } - } + &cell_y + ); + + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, dv->GetId() ); + if (path) + event.SetItem(dv->GTKPathToItem(path)); + event.SetModel( dv->GetModel() ); + return dv->HandleWindowEvent( event ); } return FALSE; @@ -4051,34 +4451,52 @@ IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase) wxDataViewCtrl::~wxDataViewCtrl() { - if (m_notifier) - GetModel()->RemoveNotifier( m_notifier ); + // Stop editing before destroying the control to remove any event handlers + // which are added when editing started: if we didn't do this, the base + // class dtor would assert as it checks for any leftover handlers. + if ( m_treeview ) + { + GtkTreeViewColumn *col; + gtk_tree_view_get_cursor(GTK_TREE_VIEW(m_treeview), NULL, &col); - m_cols.Clear(); + wxDataViewColumn * const wxcol = FromGTKColumn(col); + if ( wxcol ) + { + // This won't do anything if we're not editing it + wxcol->GetRenderer()->CancelEditing(); + } - // 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 ); + GTKDisconnect(m_treeview); + GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(m_treeview)); + if (selection) + GTKDisconnect(selection); + } + + m_cols.Clear(); delete m_internal; } void wxDataViewCtrl::Init() { - m_notifier = NULL; + m_treeview = NULL; m_internal = NULL; m_cols.DeleteContents( true ); + + m_uniformRowHeight = -1; } -bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxValidator& validator ) +bool wxDataViewCtrl::Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) { - Init(); - if (!PreCreation( parent, pos, size ) || - !CreateBase( parent, id, pos, size, style, validator )) + !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") ); return false; @@ -4092,16 +4510,13 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, m_treeview = gtk_tree_view_new(); gtk_container_add (GTK_CONTAINER (m_widget), m_treeview); + m_focusWidget = GTK_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)) - { - bool fixed = (style & wxDV_VARIABLE_LINE_HEIGHT) == 0; - gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed ); - } -#endif + bool fixed = (style & wxDV_VARIABLE_LINE_HEIGHT) == 0; + gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed ); if (style & wxDV_MULTIPLE) { @@ -4112,7 +4527,9 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, gtk_tree_view_set_headers_visible( GTK_TREE_VIEW(m_treeview), (style & wxDV_NO_HEADER) == 0 ); #ifdef __WXGTK210__ +#ifndef __WXGTK3__ if (!gtk_check_version(2,10,0)) +#endif { GtkTreeViewGridLines grid = GTK_TREE_VIEW_GRID_LINES_NONE; @@ -4165,10 +4582,20 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, return true; } +wxDataViewItem wxDataViewCtrl::GTKPathToItem(GtkTreePath *path) const +{ + GtkTreeIter iter; + return wxDataViewItem(path && m_internal->get_iter(&iter, path) + ? iter.user_data + : NULL); +} + void wxDataViewCtrl::OnInternalIdle() { wxWindow::OnInternalIdle(); + m_internal->OnInternalIdle(); + unsigned int cols = GetColumnCount(); unsigned int i; for (i = 0; i < cols; i++) @@ -4176,42 +4603,29 @@ void wxDataViewCtrl::OnInternalIdle() wxDataViewColumn *col = GetColumn( i ); col->OnInternalIdle(); } + + if (m_ensureVisibleDefered.IsOk()) + { + ExpandAncestors(m_ensureVisibleDefered); + GtkTreeIter iter; + iter.user_data = (gpointer) m_ensureVisibleDefered.GetID(); + wxGtkTreePath path(m_internal->get_path( &iter )); + gtk_tree_view_scroll_to_cell( GTK_TREE_VIEW(m_treeview), path, NULL, false, 0.0, 0.0 ); + m_ensureVisibleDefered = wxDataViewItem(0); + } } bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) { - if (GetModel()) - { - delete m_internal; - m_internal = NULL; - - delete m_notifier; - m_notifier = NULL; - } + wxDELETE(m_internal); if (!wxDataViewCtrlBase::AssociateModel( model )) return false; -#ifdef __WXGTK26__ - if (!gtk_check_version(2,6,0)) - { - bool fixed = (((GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) == 0) || (model->IsVirtualListModel())); - gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed ); - } -#endif - - GtkWxTreeModel *gtk_model = wxgtk_tree_model_new(); - m_internal = new wxDataViewCtrlInternal( this, model, gtk_model ); - gtk_model->internal = m_internal; - - m_notifier = new wxGtkDataViewModelNotifier( gtk_model, model, this ); - - model->AddNotifier( m_notifier ); + bool fixed = (((GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) == 0) || (model->IsVirtualListModel())); + gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed ); - gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_model) ); - - // unref in wxDataViewCtrlInternal - // g_object_unref( gtk_model ); + m_internal = new wxDataViewCtrlInternal( this, model ); return true; } @@ -4233,14 +4647,11 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) m_cols.Append( col ); -#ifdef __WXGTK26__ - if (!gtk_check_version(2,6,0)) + if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) != + GTK_TREE_VIEW_COLUMN_FIXED) { - if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) != - GTK_TREE_VIEW_COLUMN_FIXED) - gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE ); + gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE ); } -#endif gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ); @@ -4255,14 +4666,11 @@ bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col ) m_cols.Insert( col ); -#ifdef __WXGTK26__ - if (!gtk_check_version(2,6,0)) + if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) != + GTK_TREE_VIEW_COLUMN_FIXED) { - if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) != - GTK_TREE_VIEW_COLUMN_FIXED) - gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE ); + gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE ); } -#endif gtk_tree_view_insert_column( GTK_TREE_VIEW(m_treeview), GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()), 0 ); @@ -4277,14 +4685,11 @@ bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col ) m_cols.Insert( pos, col ); -#ifdef __WXGTK26__ - if (!gtk_check_version(2,6,0)) + if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) != + GTK_TREE_VIEW_COLUMN_FIXED) { - if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) != - GTK_TREE_VIEW_COLUMN_FIXED) - gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE ); + gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE ); } -#endif gtk_tree_view_insert_column( GTK_TREE_VIEW(m_treeview), GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()), pos ); @@ -4297,10 +4702,9 @@ unsigned int wxDataViewCtrl::GetColumnCount() const return m_cols.GetCount(); } -wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const +wxDataViewColumn* wxDataViewCtrl::FromGTKColumn(GtkTreeViewColumn *gtk_col) const { - GtkTreeViewColumn *gtk_col = gtk_tree_view_get_column( GTK_TREE_VIEW(m_treeview), pos ); - if (!gtk_col) + if ( !gtk_col ) return NULL; wxDataViewColumnList::const_iterator iter; @@ -4313,9 +4717,18 @@ wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const } } + wxFAIL_MSG( "No matching column?" ); + return NULL; } +wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const +{ + GtkTreeViewColumn *gtk_col = gtk_tree_view_get_column( GTK_TREE_VIEW(m_treeview), pos ); + + return FromGTKColumn(gtk_col); +} + bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) { gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview), @@ -4343,15 +4756,11 @@ bool wxDataViewCtrl::ClearColumns() int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const { - GtkTreeViewColumn *gtk_column = GTK_TREE_VIEW_COLUMN(column->GetConstGtkHandle()); - - GList *list = gtk_tree_view_get_columns( GTK_TREE_VIEW(m_treeview) ); + GtkTreeViewColumn *gtk_column = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()); - gint pos = g_list_index( list, (gconstpointer) gtk_column ); + wxGtkList list(gtk_tree_view_get_columns(GTK_TREE_VIEW(m_treeview))); - g_list_free( list ); - - return pos; + return g_list_index( list, (gconstpointer) gtk_column ); } wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const @@ -4363,65 +4772,108 @@ void wxDataViewCtrl::Expand( const wxDataViewItem & item ) { GtkTreeIter iter; iter.user_data = item.GetID(); - GtkTreePath *path = m_internal->get_path( &iter ); + wxGtkTreePath path(m_internal->get_path( &iter )); gtk_tree_view_expand_row( GTK_TREE_VIEW(m_treeview), path, false ); - gtk_tree_path_free( path ); } void wxDataViewCtrl::Collapse( const wxDataViewItem & item ) { GtkTreeIter iter; iter.user_data = item.GetID(); - GtkTreePath *path = m_internal->get_path( &iter ); + wxGtkTreePath path(m_internal->get_path( &iter )); gtk_tree_view_collapse_row( GTK_TREE_VIEW(m_treeview), path ); - gtk_tree_path_free( path ); } bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const { GtkTreeIter iter; iter.user_data = item.GetID(); - GtkTreePath *path = m_internal->get_path( &iter ); - bool res = gtk_tree_view_row_expanded( GTK_TREE_VIEW(m_treeview), path ); - gtk_tree_path_free( path ); + wxGtkTreePath path(m_internal->get_path( &iter )); + return gtk_tree_view_row_expanded( GTK_TREE_VIEW(m_treeview), path ) != 0; +} - return res; +wxDataViewItem wxDataViewCtrl::DoGetCurrentItem() const +{ + // The tree doesn't have any current item if it hadn't been created yet but + // it's arguably not an error to call this function in this case so just + // return an invalid item without asserting. + if ( !m_treeview ) + return wxDataViewItem(); + + wxGtkTreePath path; + gtk_tree_view_get_cursor(GTK_TREE_VIEW(m_treeview), path.ByRef(), NULL); + + return GTKPathToItem(path); } -wxDataViewItem wxDataViewCtrl::GetSelection() const +void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item) { - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); + wxCHECK_RET( m_treeview, + "Current item can't be set before creating the control." ); - if (m_windowStyle & wxDV_MULTIPLE) - { - // Report the first one - GtkTreeModel *model; - GList *list = gtk_tree_selection_get_selected_rows( selection, &model ); + // We need to make sure the model knows about this item or the path would + // be invalid and gtk_tree_view_set_cursor() would silently do nothing. + ExpandAncestors(item); - if (list) - { - GtkTreePath *path = (GtkTreePath*) list->data; - GtkTreeIter iter; - m_internal->get_iter( &iter, path ); + // We also need to preserve the existing selection from changing. + // Unfortunately the only way to do it seems to use our own selection + // function and forbid any selection changes during set cursor call. + wxGtkTreeSelectionLock + lock(gtk_tree_view_get_selection(GTK_TREE_VIEW(m_treeview))); - // delete list - g_list_foreach( list, (GFunc) gtk_tree_path_free, NULL ); - g_list_free( list ); + // Do move the cursor now. + GtkTreeIter iter; + iter.user_data = item.GetID(); + wxGtkTreePath path(m_internal->get_path( &iter )); - return wxDataViewItem( (void*) iter.user_data ); - } - } - else - { - GtkTreeIter iter; - if (gtk_tree_selection_get_selected( selection, NULL, &iter )) - { - wxDataViewItem item( (void*) iter.user_data ); - return item; - } - } + gtk_tree_view_set_cursor(GTK_TREE_VIEW(m_treeview), path, NULL, FALSE); +} + +wxDataViewColumn *wxDataViewCtrl::GetCurrentColumn() const +{ + // The tree doesn't have any current item if it hadn't been created yet but + // it's arguably not an error to call this function in this case so just + // return NULL without asserting. + if ( !m_treeview ) + return NULL; + + GtkTreeViewColumn *col; + gtk_tree_view_get_cursor(GTK_TREE_VIEW(m_treeview), NULL, &col); + return FromGTKColumn(col); +} + +void wxDataViewCtrl::EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) +{ + wxCHECK_RET( m_treeview, + "Current item can't be set before creating the control." ); + wxCHECK_RET( item.IsOk(), "invalid item" ); + wxCHECK_RET( column, "no column provided" ); - return wxDataViewItem(0); + // We need to make sure the model knows about this item or the path would + // be invalid and gtk_tree_view_set_cursor() would silently do nothing. + ExpandAncestors(item); + + GtkTreeViewColumn *gcolumn = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()); + + // We also need to preserve the existing selection from changing. + // Unfortunately the only way to do it seems to use our own selection + // function and forbid any selection changes during set cursor call. + wxGtkTreeSelectionLock + lock(gtk_tree_view_get_selection(GTK_TREE_VIEW(m_treeview))); + + // Do move the cursor now. + GtkTreeIter iter; + iter.user_data = item.GetID(); + wxGtkTreePath path(m_internal->get_path( &iter )); + + gtk_tree_view_set_cursor(GTK_TREE_VIEW(m_treeview), path, gcolumn, TRUE); +} + +int wxDataViewCtrl::GetSelectedItemsCount() const +{ + GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); + + return gtk_tree_selection_count_selected_rows(selection); } int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const @@ -4432,41 +4884,25 @@ int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const if (HasFlag(wxDV_MULTIPLE)) { GtkTreeModel *model; - GList *list = gtk_tree_selection_get_selected_rows( selection, &model ); + wxGtkTreePathList list(gtk_tree_selection_get_selected_rows(selection, &model)); - int count = 0; - while (list) + for ( GList* current = list; current; current = g_list_next(current) ) { - GtkTreePath *path = (GtkTreePath*) list->data; + GtkTreePath *path = (GtkTreePath*) current->data; - GtkTreeIter iter; - m_internal->get_iter( &iter, path ); - - sel.Add( wxDataViewItem( (void*) iter.user_data ) ); - - list = g_list_next( list ); - count++; + sel.Add(GTKPathToItem(path)); } - - // 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) + if (gtk_tree_selection_get_selected( selection, NULL, &iter )) { - sel.Add( wxDataViewItem( (void*) iter.user_data) ); - return 1; + sel.Add( wxDataViewItem(iter.user_data) ); } } - return 0; + return sel.size(); } void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) @@ -4538,7 +4974,7 @@ bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const iter.stamp = m_internal->GetGtkModel()->stamp; iter.user_data = (gpointer) item.GetID(); - return gtk_tree_selection_iter_is_selected( selection, &iter ); + return gtk_tree_selection_iter_is_selected( selection, &iter ) != 0; } void wxDataViewCtrl::SelectAll() @@ -4566,21 +5002,64 @@ void wxDataViewCtrl::UnselectAll() void wxDataViewCtrl::EnsureVisible(const wxDataViewItem& item, const wxDataViewColumn *WXUNUSED(column)) { + m_ensureVisibleDefered = item; ExpandAncestors(item); GtkTreeIter iter; iter.user_data = (gpointer) item.GetID(); - GtkTreePath *path = m_internal->get_path( &iter ); + wxGtkTreePath 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& WXUNUSED(point), +void wxDataViewCtrl::HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn *& column) const { + // gtk_tree_view_get_dest_row_at_pos() is the right one. But it does not tell the column. + // gtk_tree_view_get_path_at_pos() is the wrong function. It doesn't mind the header but returns column. + // See http://mail.gnome.org/archives/gtkmm-list/2005-January/msg00080.html + // So we have to use both of them. item = wxDataViewItem(0); column = NULL; + wxGtkTreePath path, pathScratch; + GtkTreeViewColumn* GtkColumn = NULL; + GtkTreeViewDropPosition pos = GTK_TREE_VIEW_DROP_INTO_OR_AFTER; + gint cell_x = 0; + gint cell_y = 0; + + // cannot directly call GtkGetTreeView(), HitTest is const and so is this pointer + wxDataViewCtrl* self = const_cast(this); // ugly workaround, self is NOT const + GtkTreeView* treeView = GTK_TREE_VIEW(self->GtkGetTreeView()); + + // is there possibly a better suited function to get the column? + gtk_tree_view_get_path_at_pos( // and this is the wrong call but it delivers the column + treeView, + (int) point.x, (int) point.y, + pathScratch.ByRef(), + &GtkColumn, // here we get the GtkColumn + &cell_x, + &cell_y ); + + if ( GtkColumn != NULL ) + { + // we got GTK column + // the right call now which takes the header into account + gtk_tree_view_get_dest_row_at_pos( treeView, (int) point.x, (int) point.y, path.ByRef(), &pos); + + if (path) + item = wxDataViewItem(GTKPathToItem(path)); + // else we got a GTK column but the position is not over an item, e.g. below last item + for ( unsigned int i=0, cols=GetColumnCount(); iGetGtkHandle()) == GtkColumn ) + { + column = col; // here we get the wx column + break; + } + } + } + // else no column and thus no item, both null } wxRect @@ -4590,6 +5069,12 @@ wxDataViewCtrl::GetItemRect(const wxDataViewItem& WXUNUSED(item), return wxRect(); } +bool wxDataViewCtrl::SetRowHeight(int rowHeight) +{ + m_uniformRowHeight = rowHeight; + return true; +} + void wxDataViewCtrl::DoSetExpanderColumn() { gtk_tree_view_set_expander_column( GTK_TREE_VIEW(m_treeview), @@ -4622,13 +5107,13 @@ void wxDataViewCtrl::GtkEnableSelectionEvents() wxVisualAttributes wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new); + return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new()); } void wxDataViewCtrl::DoApplyWidgetStyle(GtkRcStyle *style) { wxDataViewCtrlBase::DoApplyWidgetStyle(style); - gtk_widget_modify_style(m_treeview, style); + GTKApplyStyle(m_treeview, style); } #endif // !wxUSE_GENERICDATAVIEWCTRL