X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a76c2f3715f6a1d343f0716f7924db33077843e1..732d8c74f805e35cd398711fcd3969c4c668e259:/src/gtk/dataview.cpp diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 157038541f..9d842d79e3 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -20,32 +20,23 @@ #include "wx/log.h" #include "wx/dcclient.h" #include "wx/sizer.h" + #include "wx/settings.h" + #include "wx/crt.h" #endif #include "wx/stockitem.h" #include "wx/calctrl.h" #include "wx/popupwin.h" -#include "wx/icon.h" -#include "wx/list.h" #include "wx/listimpl.cpp" -#include "wx/settings.h" #include "wx/gtk/private.h" -#include "wx/gtk/win_gtk.h" - -#include -#include -#include -#include - -#include +#include "wx/gtk/dc.h" +#include "wx/gtk/dcclient.h" //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -class wxDataViewCtrlInternal; - -wxDataViewCtrlInternal *g_internal = NULL; +static wxDataViewCtrlInternal *gs_internal = NULL; class wxGtkTreeModelNode; @@ -60,12 +51,14 @@ typedef struct _GtkWxTreeModel GtkWxTreeModel; WX_DECLARE_LIST(wxDataViewItem, ItemList); WX_DEFINE_LIST(ItemList) -class wxDataViewCtrlInternal +class WXDLLIMPEXP_ADV wxDataViewCtrlInternal { public: - wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model, GtkWxTreeModel *owner ); + wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model ); ~wxDataViewCtrlInternal(); - + + // model iface + GtkTreeModelFlags get_flags(); gboolean get_iter( GtkTreeIter *iter, GtkTreePath *path ); GtkTreePath *get_path( GtkTreeIter *iter); gboolean iter_next( GtkTreeIter *iter ); @@ -74,30 +67,47 @@ public: gint iter_n_children( GtkTreeIter *iter ); gboolean iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n ); gboolean iter_parent( GtkTreeIter *iter, GtkTreeIter *child ); - - wxDataViewModel* GetDataViewModel() { return m_wx_model; } - wxDataViewCtrl* GetOwner() { return m_owner; } - GtkWxTreeModel* GetGtkModel() { return m_gtk_model; } + // dnd iface + + bool EnableDragSource( const wxDataFormat &format ); + bool EnableDropTarget( const wxDataFormat &format ); + + gboolean row_draggable( GtkTreeDragSource *drag_source, GtkTreePath *path ); + gboolean drag_data_delete( GtkTreeDragSource *drag_source, GtkTreePath* path ); + gboolean drag_data_get( GtkTreeDragSource *drag_source, GtkTreePath *path, + GtkSelectionData *selection_data ); + gboolean drag_data_received( GtkTreeDragDest *drag_dest, GtkTreePath *dest, + GtkSelectionData *selection_data ); + gboolean row_drop_possible( GtkTreeDragDest *drag_dest, GtkTreePath *dest_path, + GtkSelectionData *selection_data ); + + // notifactions from wxDataViewModel bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ); bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ); bool ItemChanged( const wxDataViewItem &item ); bool ValueChanged( const wxDataViewItem &item, unsigned int col ); bool Cleared(); void Resort(); - + + // sorting interface void SetSortOrder( GtkSortType sort_order ) { m_sort_order = sort_order; } - GtkSortType GetSortOrder() { return m_sort_order; } + GtkSortType GetSortOrder() const { return m_sort_order; } void SetSortColumn( int column ) { m_sort_column = column; } - int GetSortColumn() { return m_sort_column; } - + int GetSortColumn() const { return m_sort_column; } + void SetDataViewSortColumn( wxDataViewColumn *column ) { m_dataview_sort_column = column; } wxDataViewColumn *GetDataViewSortColumn() { return m_dataview_sort_column; } - + bool IsSorted() { return (m_sort_column >= 0); } - - + + // accessors + wxDataViewModel* GetDataViewModel() { return m_wx_model; } + const wxDataViewModel* GetDataViewModel() const { return m_wx_model; } + wxDataViewCtrl* GetOwner() { return m_owner; } + GtkWxTreeModel* GetGtkModel() { return m_gtk_model; } + protected: void InitTree(); wxGtkTreeModelNode *FindNode( const wxDataViewItem &item ); @@ -105,7 +115,7 @@ protected: wxGtkTreeModelNode *FindParentNode( const wxDataViewItem &item ); wxGtkTreeModelNode *FindParentNode( GtkTreeIter *iter ); void BuildBranch( wxGtkTreeModelNode *branch ); - + private: wxGtkTreeModelNode *m_root; wxDataViewModel *m_wx_model; @@ -114,6 +124,14 @@ private: GtkSortType m_sort_order; wxDataViewColumn *m_dataview_sort_column; int m_sort_column; + + GtkTargetEntry m_dragSourceTargetEntry; + wxCharBuffer m_dragSourceTargetEntryTarget; + wxDataObject *m_dragDataObject; + + GtkTargetEntry m_dropTargetTargetEntry; + wxCharBuffer m_dropTargetTargetEntryTarget; + wxDataObject *m_dropDataObject; }; @@ -121,11 +139,12 @@ private: // wxGtkTreeModelNode //----------------------------------------------------------------------------- +static int LINKAGEMODE wxGtkTreeModelChildCmp( void** id1, void** id2 ) { - int ret = g_internal->GetDataViewModel()->Compare( *id1, *id2, - g_internal->GetSortColumn(), (g_internal->GetSortOrder() == GTK_SORT_ASCENDING) ); - + int ret = gs_internal->GetDataViewModel()->Compare( *id1, *id2, + gs_internal->GetSortColumn(), (gs_internal->GetSortOrder() == GTK_SORT_ASCENDING) ); + return ret; } @@ -136,16 +155,16 @@ class wxGtkTreeModelNode { public: wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item, - wxDataViewCtrlInternal *internal ) - { - m_parent = parent; + wxDataViewCtrlInternal *internal ) + { + m_parent = parent; m_item = item; m_internal = internal; } - + ~wxGtkTreeModelNode() - { - size_t count = m_children.GetCount(); + { + size_t count = m_nodes.GetCount(); size_t i; for (i = 0; i < count; i++) { @@ -154,46 +173,46 @@ public: } } - unsigned int AddNode( wxGtkTreeModelNode* child ) - { + unsigned int AddNode( wxGtkTreeModelNode* child ) + { m_nodes.Add( child ); - + void *id = child->GetItem().GetID(); - + m_children.Add( id ); if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare()) { - g_internal = m_internal; + gs_internal = m_internal; m_children.Sort( &wxGtkTreeModelChildCmp ); return m_children.Index( id ); } return m_children.GetCount()-1; } - + unsigned int AddLeave( void* id ) { m_children.Add( id ); if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare()) { - g_internal = m_internal; + gs_internal = m_internal; m_children.Sort( &wxGtkTreeModelChildCmp ); return m_children.Index( id ); } return m_children.GetCount()-1; } - + void DeleteChild( void* id ) { m_children.Remove( id ); - + unsigned int count = m_nodes.GetCount(); unsigned int pos; for (pos = 0; pos < count; pos++) - { + { wxGtkTreeModelNode *node = m_nodes.Item( pos ); if (node->GetItem().GetID() == id) { @@ -202,29 +221,28 @@ public: break; } } - } - - wxGtkTreeModelNode* GetParent() + + wxGtkTreeModelNode* GetParent() { return m_parent; } - wxGtkTreeModelNodes &GetNodes() + wxGtkTreeModelNodes &GetNodes() { return m_nodes; } - wxGtkTreeModelChildren &GetChildren() + wxGtkTreeModelChildren &GetChildren() { return m_children; } - - unsigned int GetChildCount() { return m_children.GetCount(); } - unsigned int GetNodesCount() { return m_nodes.GetCount(); } + + unsigned int GetChildCount() const { return m_children.GetCount(); } + unsigned int GetNodesCount() const { return m_nodes.GetCount(); } wxDataViewItem &GetItem() { return m_item; } wxDataViewCtrlInternal *GetInternal() { return m_internal; } - + void Resort(); - + private: wxGtkTreeModelNode *m_parent; wxGtkTreeModelNodes m_nodes; wxGtkTreeModelChildren m_children; - wxDataViewItem m_item; + wxDataViewItem m_item; wxDataViewCtrlInternal *m_internal; }; @@ -269,8 +287,12 @@ struct _GtkWxTreeModelClass static GtkWxTreeModel *wxgtk_tree_model_new (void); static void wxgtk_tree_model_init (GtkWxTreeModel *tree_model); static void wxgtk_tree_model_class_init (GtkWxTreeModelClass *klass); -static void wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface); -static void wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface); + +static void wxgtk_tree_model_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_finalize (GObject *object); static GtkTreeModelFlags wxgtk_tree_model_get_flags (GtkTreeModel *tree_model); static gint wxgtk_tree_model_get_n_columns (GtkTreeModel *tree_model); @@ -304,22 +326,36 @@ static gboolean wxgtk_tree_model_iter_parent (GtkTreeModel *tree_mo /* sortable */ static gboolean wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortable, - gint *sort_column_id, - GtkSortType *order); + gint *sort_column_id, + GtkSortType *order); static void wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable, - gint sort_column_id, - GtkSortType order); + gint sort_column_id, + GtkSortType order); static void wxgtk_tree_model_set_sort_func (GtkTreeSortable *sortable, - gint sort_column_id, - GtkTreeIterCompareFunc func, - gpointer data, - GtkDestroyNotify destroy); + gint sort_column_id, + GtkTreeIterCompareFunc func, + gpointer data, + GtkDestroyNotify destroy); static void wxgtk_tree_model_set_default_sort_func (GtkTreeSortable *sortable, - GtkTreeIterCompareFunc func, - gpointer data, - GtkDestroyNotify destroy); + GtkTreeIterCompareFunc func, + gpointer data, + GtkDestroyNotify destroy); static gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable *sortable); +/* drag'n'drop */ +static gboolean wxgtk_tree_model_row_draggable (GtkTreeDragSource *drag_source, + GtkTreePath *path); +static gboolean wxgtk_tree_model_drag_data_delete (GtkTreeDragSource *drag_source, + GtkTreePath *path); +static gboolean wxgtk_tree_model_drag_data_get (GtkTreeDragSource *drag_source, + GtkTreePath *path, + GtkSelectionData *selection_data); +static gboolean wxgtk_tree_model_drag_data_received (GtkTreeDragDest *drag_dest, + GtkTreePath *dest, + GtkSelectionData *selection_data); +static gboolean wxgtk_tree_model_row_drop_possible (GtkTreeDragDest *drag_dest, + GtkTreePath *dest_path, + GtkSelectionData *selection_data); static GObjectClass *list_parent_class = NULL; @@ -358,6 +394,20 @@ gtk_wx_tree_model_get_type (void) NULL }; + static const GInterfaceInfo drag_source_iface_info = + { + (GInterfaceInitFunc) wxgtk_tree_model_drag_source_init, + NULL, + NULL + }; + + static const GInterfaceInfo drag_dest_iface_info = + { + (GInterfaceInitFunc) wxgtk_tree_model_drag_dest_init, + NULL, + NULL + }; + tree_model_type = g_type_register_static (G_TYPE_OBJECT, "GtkWxTreeModel", &tree_model_info, (GTypeFlags)0 ); @@ -367,6 +417,12 @@ gtk_wx_tree_model_get_type (void) g_type_add_interface_static (tree_model_type, GTK_TYPE_TREE_SORTABLE, &sortable_iface_info); + g_type_add_interface_static (tree_model_type, + GTK_TYPE_TREE_DRAG_DEST, + &drag_dest_iface_info); + g_type_add_interface_static (tree_model_type, + GTK_TYPE_TREE_DRAG_SOURCE, + &drag_source_iface_info); } return tree_model_type; @@ -414,6 +470,21 @@ wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface) iface->has_default_sort_func = wxgtk_tree_model_has_default_sort_func; } +static void +wxgtk_tree_model_drag_source_init(GtkTreeDragSourceIface *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) +{ + 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) { @@ -438,9 +509,10 @@ wxgtk_tree_model_finalize (GObject *object) static GtkTreeModelFlags wxgtk_tree_model_get_flags (GtkTreeModel *tree_model) { - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (tree_model), (GtkTreeModelFlags)0 ); + GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), (GtkTreeModelFlags)0 ); - return GTK_TREE_MODEL_ITERS_PERSIST; + return wxtree_model->internal->get_flags(); } static gint @@ -528,6 +600,11 @@ wxgtk_tree_model_iter_next (GtkTreeModel *tree_model, GtkTreeIter *iter) { GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; + + //if (wxtree_model->stamp != iter->stamp) + // wxPrintf( "crash\n" ); + // TODO: remove this code + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE); @@ -563,7 +640,9 @@ wxgtk_tree_model_iter_n_children (GtkTreeModel *tree_model, { GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - g_return_val_if_fail (wxtree_model->stamp == iter->stamp, 0); + + if (iter != NULL) + g_return_val_if_fail (wxtree_model->stamp == iter->stamp, 0); return wxtree_model->internal->iter_n_children( iter ); } @@ -588,99 +667,321 @@ wxgtk_tree_model_iter_parent (GtkTreeModel *tree_model, GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); g_return_val_if_fail (wxtree_model->stamp == child->stamp, FALSE); - + return wxtree_model->internal->iter_parent( iter, child ); } -/* sortable */ -gboolean wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortable, - gint *sort_column_id, - GtkSortType *order) +/* drag'n'drop iface */ +static gboolean +wxgtk_tree_model_row_draggable (GtkTreeDragSource *drag_source, + GtkTreePath *path) { - GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable; + GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source; + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); + + return wxtree_model->internal->row_draggable( drag_source, path ); +} + +static gboolean +wxgtk_tree_model_drag_data_delete (GtkTreeDragSource *drag_source, + GtkTreePath *path) +{ + GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source; + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); + + return wxtree_model->internal->drag_data_delete( drag_source, path ); +} + +static gboolean +wxgtk_tree_model_drag_data_get (GtkTreeDragSource *drag_source, + GtkTreePath *path, + GtkSelectionData *selection_data) +{ + GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source; + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); + +#if 0 + wxPrintf( "drag_get_data\n"); + + wxGtkString atom_selection(gdk_atom_name(selection_data->selection)); + wxPrintf( "selection %s\n", wxString::FromAscii(atom_selection) ); + + wxGtkString atom_target(gdk_atom_name(selection_data->target)); + wxPrintf( "target %s\n", wxString::FromAscii(atom_target) ); + + wxGtkString atom_type(gdk_atom_name(selection_data->type)); + wxPrintf( "type %s\n", wxString::FromAscii(atom_type) ); + + wxPrintf( "format %d\n", selection_data->format ); +#endif + + return wxtree_model->internal->drag_data_get( drag_source, path, selection_data ); +} + +static gboolean +wxgtk_tree_model_drag_data_received (GtkTreeDragDest *drag_dest, + GtkTreePath *dest, + GtkSelectionData *selection_data) +{ + GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_dest; + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); + + return wxtree_model->internal->drag_data_received( drag_dest, dest, selection_data ); +} + +static gboolean +wxgtk_tree_model_row_drop_possible (GtkTreeDragDest *drag_dest, + GtkTreePath *dest_path, + GtkSelectionData *selection_data) +{ + GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_dest; + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); + + return wxtree_model->internal->row_drop_possible( drag_dest, dest_path, selection_data ); +} + +/* sortable iface */ +static gboolean +wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortable, + gint *sort_column_id, + GtkSortType *order) +{ + GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) sortable; g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE); - if (!tree_model->internal->IsSorted()) + if (!wxtree_model->internal->IsSorted()) { if (sort_column_id) *sort_column_id = -1; - + return TRUE; } if (sort_column_id) - *sort_column_id = tree_model->internal->GetSortColumn(); - + *sort_column_id = wxtree_model->internal->GetSortColumn(); + if (order) - *order = tree_model->internal->GetSortOrder(); - + *order = wxtree_model->internal->GetSortOrder(); + return TRUE; } wxDataViewColumn *gs_lastLeftClickHeader = NULL; -void wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable, - gint sort_column_id, - GtkSortType order) +static void +wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable, + gint sort_column_id, + GtkSortType order) { GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable; g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) ); tree_model->internal->SetDataViewSortColumn( gs_lastLeftClickHeader ); - + if ((sort_column_id != (gint) tree_model->internal->GetSortColumn()) || (order != tree_model->internal->GetSortOrder())) { tree_model->internal->SetSortColumn( sort_column_id ); tree_model->internal->SetSortOrder( order ); - + gtk_tree_sortable_sort_column_changed (sortable); - + tree_model->internal->GetDataViewModel()->Resort(); } if (gs_lastLeftClickHeader) { - wxDataViewCtrl *dv = tree_model->internal->GetOwner(); + wxDataViewCtrl *dv = tree_model->internal->GetOwner(); wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, dv->GetId() ); event.SetDataViewColumn( gs_lastLeftClickHeader ); event.SetModel( dv->GetModel() ); - dv->GetEventHandler()->ProcessEvent( event ); + dv->HandleWindowEvent( event ); } - + gs_lastLeftClickHeader = NULL; } -void wxgtk_tree_model_set_sort_func (GtkTreeSortable *sortable, - gint sort_column_id, - GtkTreeIterCompareFunc func, - gpointer data, - GtkDestroyNotify destroy) +static void +wxgtk_tree_model_set_sort_func (GtkTreeSortable *sortable, + gint WXUNUSED(sort_column_id), + GtkTreeIterCompareFunc func, + gpointer WXUNUSED(data), + GtkDestroyNotify WXUNUSED(destroy)) { g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) ); g_return_if_fail (func != NULL); } -void wxgtk_tree_model_set_default_sort_func (GtkTreeSortable *sortable, - GtkTreeIterCompareFunc func, - gpointer data, - GtkDestroyNotify destroy) +static void +wxgtk_tree_model_set_default_sort_func (GtkTreeSortable *sortable, + GtkTreeIterCompareFunc func, + gpointer WXUNUSED(data), + GtkDestroyNotify WXUNUSED(destroy)) { g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) ); g_return_if_fail (func != NULL); - wxPrintf( "wxgtk_tree_model_set_default_sort_func\n" ); + //wxPrintf( "wxgtk_tree_model_set_default_sort_func\n" ); + // TODO: remove this code } -gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable *sortable) +static gboolean +wxgtk_tree_model_has_default_sort_func (GtkTreeSortable *sortable) { + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE ); + return FALSE; } //----------------------------------------------------------------------------- -// define new GTK+ class wxGtkRendererRenderer +// define new GTK+ class GtkWxRendererText +//----------------------------------------------------------------------------- + +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 +{ + GtkCellRendererText parent; + + 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 ); +static void gtk_wx_cell_renderer_text_class_init( + GtkWxCellRendererTextClass *klass ); +static void gtk_wx_cell_renderer_text_finalize ( + GObject *object ); +static GtkCellEditable *gtk_wx_cell_renderer_text_start_editing( + GtkCellRenderer *cell, + GdkEvent *event, + GtkWidget *widget, + const gchar *path, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkCellRendererState flags ); + + +static GObjectClass *text_cell_parent_class = NULL; + +} // extern "C" + +GType +gtk_wx_cell_renderer_text_get_type (void) +{ + static GType cell_wx_type = 0; + + if (!cell_wx_type) + { + const GTypeInfo cell_wx_info = + { + sizeof (GtkWxCellRendererTextClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) 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, + }; + + cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER_TEXT, + "GtkWxCellRendererText", &cell_wx_info, (GTypeFlags)0 ); + } + + return cell_wx_type; +} + +static void +gtk_wx_cell_renderer_text_init (GtkWxCellRendererText *cell) +{ + cell->wx_renderer = NULL; +} + +static void +gtk_wx_cell_renderer_text_class_init (GtkWxCellRendererTextClass *klass) +{ + 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) +{ + return (GtkWxCellRendererText*) g_object_new (GTK_TYPE_WX_CELL_RENDERER_TEXT, NULL); +} + +static GtkCellEditable *gtk_wx_cell_renderer_text_start_editing( + GtkCellRenderer *gtk_renderer, + GdkEvent *gdk_event, + GtkWidget *widget, + const gchar *path, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkCellRendererState flags ) +{ + GtkWxCellRendererText *wxgtk_renderer = (GtkWxCellRendererText *) gtk_renderer; + wxDataViewRenderer *wx_renderer = wxgtk_renderer->wx_renderer; + + 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 ); + + wxDataViewColumn *column = wx_renderer->GetOwner(); + wxDataViewCtrl *dv = column->GetOwner(); + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING, dv->GetId() ); + event.SetDataViewColumn( column ); + event.SetModel( dv->GetModel() ); + event.SetColumn( wx_renderer->GetOwner()->GetModelColumn() ); + event.SetItem( item ); + dv->HandleWindowEvent( event ); + + if (event.IsAllowed()) + return GTK_CELL_RENDERER_CLASS(text_cell_parent_class)-> + start_editing( gtk_renderer, gdk_event, widget, path, background_area, cell_area, flags ); + else + return NULL; +} + +//----------------------------------------------------------------------------- +// define new GTK+ class GtkWxCellRenderer //----------------------------------------------------------------------------- extern "C" { @@ -820,22 +1121,26 @@ gtk_wx_cell_renderer_new (void) return (GtkCellRenderer*) g_object_new (GTK_TYPE_WX_CELL_RENDERER, NULL); } - - static GtkCellEditable *gtk_wx_cell_renderer_start_editing( GtkCellRenderer *renderer, - GdkEvent *event, + GdkEvent *WXUNUSED(event), GtkWidget *widget, const gchar *path, - GdkRectangle *background_area, + GdkRectangle *WXUNUSED(background_area), GdkRectangle *cell_area, - GtkCellRendererState flags ) + GtkCellRendererState WXUNUSED(flags) ) { GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer; wxDataViewCustomRenderer *cell = wxrenderer->cell; + + // Renderer doesn't support in-place editing if (!cell->HasEditorCtrl()) return NULL; + // An in-place editing control is still around + if (cell->GetEditorCtrl()) + return NULL; + GdkRectangle rect; gtk_wx_cell_renderer_get_size (renderer, widget, cell_area, &rect.x, @@ -864,7 +1169,7 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing( static void gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer, - GtkWidget *widget, + GtkWidget *WXUNUSED(widget), GdkRectangle *cell_area, gint *x_offset, gint *y_offset, @@ -944,10 +1249,15 @@ gtk_wx_cell_renderer_render (GtkCellRenderer *renderer, { wxRect renderrect( rect.x, rect.y, rect.width, rect.height ); wxWindowDC* dc = (wxWindowDC*) cell->GetDC(); - if (dc->m_window == NULL) + 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) { - dc->m_window = window; - dc->SetUpDC(); + impl->Destroy(); + impl->m_gdkwindow = window; + impl->SetUpDC(); } int state = 0; @@ -971,9 +1281,9 @@ gtk_wx_cell_renderer_activate( GdkEvent *event, GtkWidget *widget, const gchar *path, - GdkRectangle *background_area, + GdkRectangle *WXUNUSED(background_area), GdkRectangle *cell_area, - GtkCellRendererState flags ) + GtkCellRendererState WXUNUSED(flags) ) { GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer; wxDataViewCustomRenderer *cell = wxrenderer->cell; @@ -1029,12 +1339,6 @@ gtk_wx_cell_renderer_activate( if (cell->Activate( renderrect, model, item, model_col )) ret = true; } - if (button_event->button == 3) - { - if (cell->RightClick( pt, renderrect, model, item, model_col )) - ret = true; - } - wxrenderer->last_click = button_event->time; return ret; @@ -1062,6 +1366,9 @@ public: virtual bool Cleared(); virtual void Resort(); + void SetGtkModel( GtkWxTreeModel *model ) { m_wxgtk_model = model; } + +private: GtkWxTreeModel *m_wxgtk_model; wxDataViewModel *m_wx_model; wxDataViewCtrl *m_owner; @@ -1094,9 +1401,9 @@ bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const iter.stamp = m_wxgtk_model->stamp; iter.user_data = (gpointer) item.GetID(); - GtkTreePath *path = wxgtk_tree_model_get_path( + GtkTreePath *path = wxgtk_tree_model_get_path( GTK_TREE_MODEL(m_wxgtk_model), &iter ); - gtk_tree_model_row_inserted( + gtk_tree_model_row_inserted( GTK_TREE_MODEL(m_wxgtk_model), path, &iter); gtk_tree_path_free (path); @@ -1109,14 +1416,14 @@ bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &parent, cons iter.stamp = m_wxgtk_model->stamp; iter.user_data = (gpointer) item.GetID(); - GtkTreePath *path = wxgtk_tree_model_get_path( + GtkTreePath *path = wxgtk_tree_model_get_path( GTK_TREE_MODEL(m_wxgtk_model), &iter ); gtk_tree_model_row_deleted( GTK_TREE_MODEL(m_wxgtk_model), path ); gtk_tree_path_free (path); m_owner->GtkGetInternal()->ItemDeleted( parent, item ); - + return true; } @@ -1131,14 +1438,14 @@ bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item ) iter.stamp = m_wxgtk_model->stamp; iter.user_data = (gpointer) item.GetID(); - GtkTreePath *path = wxgtk_tree_model_get_path( + GtkTreePath *path = wxgtk_tree_model_get_path( GTK_TREE_MODEL(m_wxgtk_model), &iter ); gtk_tree_model_row_changed( GTK_TREE_MODEL(m_wxgtk_model), path, &iter ); gtk_tree_path_free (path); m_owner->GtkGetInternal()->ItemChanged( item ); - + return true; } @@ -1158,7 +1465,7 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig GtkTreeIter iter; iter.stamp = m_wxgtk_model->stamp; iter.user_data = (gpointer) item.GetID(); - GtkTreePath *path = wxgtk_tree_model_get_path( + 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 ); @@ -1172,9 +1479,9 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig // Redraw gtk_widget_queue_draw_area( GTK_WIDGET(widget), cell_area.x - xdiff, ydiff + cell_area.y, cell_area.width, cell_area.height ); - + m_owner->GtkGetInternal()->ValueChanged( item, model_col ); - + return true; } } @@ -1184,10 +1491,15 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig bool wxGtkDataViewModelNotifier::Cleared() { - // TODO: delete everything + gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->m_treeview), NULL ); + // this will create a new GTK model m_owner->GtkGetInternal()->Cleared(); - + + SetGtkModel( m_owner->GtkGetInternal()->GetGtkModel() ); + + gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->m_treeview), GTK_TREE_MODEL(m_wxgtk_model) ); + return false; } @@ -1198,7 +1510,7 @@ bool wxGtkDataViewModelNotifier::Cleared() static gpointer s_user_data = NULL; static void -wxgtk_cell_editable_editing_done( GtkCellEditable *editable, +wxgtk_cell_editable_editing_done( GtkCellEditable *WXUNUSED(editable), wxDataViewRenderer *wxrenderer ) { wxDataViewColumn *column = wxrenderer->GetOwner(); @@ -1208,13 +1520,16 @@ wxgtk_cell_editable_editing_done( GtkCellEditable *editable, event.SetModel( dv->GetModel() ); wxDataViewItem item( s_user_data ); event.SetItem( item ); - dv->GetEventHandler()->ProcessEvent( event ); + dv->HandleWindowEvent( event ); } -static void -wxgtk_renderer_editing_started( GtkCellRenderer *cell, GtkCellEditable *editable, +static void +wxgtk_renderer_editing_started( GtkCellRenderer *WXUNUSED(cell), GtkCellEditable *editable, gchar *path, wxDataViewRenderer *wxrenderer ) { + if (!editable) + return; + wxDataViewColumn *column = wxrenderer->GetOwner(); wxDataViewCtrl *dv = column->GetOwner(); wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, dv->GetId() ); @@ -1226,16 +1541,16 @@ wxgtk_renderer_editing_started( GtkCellRenderer *cell, GtkCellEditable *editable gtk_tree_path_free( tree_path ); wxDataViewItem item( iter.user_data ); event.SetItem( item ); - dv->GetEventHandler()->ProcessEvent( event ); + dv->HandleWindowEvent( event ); if (GTK_IS_CELL_EDITABLE(editable)) { s_user_data = iter.user_data; - + g_signal_connect (GTK_CELL_EDITABLE (editable), "editing_done", G_CALLBACK (wxgtk_cell_editable_editing_done), (gpointer) wxrenderer ); - + } } @@ -1267,18 +1582,24 @@ void wxDataViewRenderer::SetMode( wxDataViewCellMode mode ) GtkCellRendererMode gtkMode; switch (mode) { - case wxDATAVIEW_CELL_INERT: - gtkMode = GTK_CELL_RENDERER_MODE_INERT; - break; - case wxDATAVIEW_CELL_ACTIVATABLE: - gtkMode = GTK_CELL_RENDERER_MODE_ACTIVATABLE; - break; - case wxDATAVIEW_CELL_EDITABLE: - gtkMode = GTK_CELL_RENDERER_MODE_EDITABLE; - break; - } + case wxDATAVIEW_CELL_INERT: + gtkMode = GTK_CELL_RENDERER_MODE_INERT; + break; - // This value is most often ignored in GtkTreeView + case wxDATAVIEW_CELL_ACTIVATABLE: + gtkMode = GTK_CELL_RENDERER_MODE_ACTIVATABLE; + break; + + case wxDATAVIEW_CELL_EDITABLE: + gtkMode = GTK_CELL_RENDERER_MODE_EDITABLE; + break; + + default: + wxFAIL_MSG( "unknown wxDataViewCellMode value" ); + return; + } + + // This value is most often ignored in GtkTreeView GValue gvalue = { 0, }; g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() ); g_value_set_enum( &gvalue, gtkMode ); @@ -1295,15 +1616,21 @@ wxDataViewCellMode wxDataViewRenderer::GetMode() const switch (g_value_get_enum(&gvalue)) { - case GTK_CELL_RENDERER_MODE_INERT: - ret = wxDATAVIEW_CELL_INERT; - break; - case GTK_CELL_RENDERER_MODE_ACTIVATABLE: - ret = wxDATAVIEW_CELL_ACTIVATABLE; - break; - case GTK_CELL_RENDERER_MODE_EDITABLE: - ret = wxDATAVIEW_CELL_EDITABLE; - break; + default: + wxFAIL_MSG( "unknown GtkCellRendererMode value" ); + // fall through (we have to return something) + + case GTK_CELL_RENDERER_MODE_INERT: + ret = wxDATAVIEW_CELL_INERT; + break; + + case GTK_CELL_RENDERER_MODE_ACTIVATABLE: + ret = wxDATAVIEW_CELL_ACTIVATABLE; + break; + + case GTK_CELL_RENDERER_MODE_EDITABLE: + ret = wxDATAVIEW_CELL_EDITABLE; + break; } g_value_unset( &gvalue ); @@ -1311,8 +1638,21 @@ wxDataViewCellMode wxDataViewRenderer::GetMode() const return ret; } -void wxDataViewRenderer::SetAlignment( int align ) +void wxDataViewRenderer::GtkUpdateAlignment() { + int align = m_alignment; + + // query alignment from column ? + if (align == -1) + { + // None there yet + if (GetOwner() == NULL) + return; + + align = GetOwner()->GetAlignment(); + align |= wxALIGN_CENTRE_VERTICAL; + } + // horizontal alignment: gfloat xalign = 0.0; @@ -1342,40 +1682,16 @@ void wxDataViewRenderer::SetAlignment( int align ) g_value_unset( &gvalue2 ); } -int wxDataViewRenderer::GetAlignment() const +void wxDataViewRenderer::SetAlignment( int align ) { - int ret = 0; - GValue gvalue; - - // horizontal alignment: - - g_object_get( G_OBJECT(m_renderer), "xalign", &gvalue, NULL ); - float xalign = g_value_get_float( &gvalue ); - if (xalign < 0.5) - ret |= wxALIGN_LEFT; - else if (xalign == 0.5) - ret |= wxALIGN_CENTER_HORIZONTAL; - else - ret |= wxALIGN_RIGHT; - g_value_unset( &gvalue ); - - - // vertical alignment: - - g_object_get( G_OBJECT(m_renderer), "yalign", &gvalue, NULL ); - float yalign = g_value_get_float( &gvalue ); - if (yalign < 0.5) - ret |= wxALIGN_TOP; - else if (yalign == 0.5) - ret |= wxALIGN_CENTER_VERTICAL; - else - ret |= wxALIGN_BOTTOM; - g_value_unset( &gvalue ); - - return ret; + m_alignment = align; + GtkUpdateAlignment(); } - +int wxDataViewRenderer::GetAlignment() const +{ + return m_alignment; +} // --------------------------------------------------------- // wxDataViewTextRenderer @@ -1386,10 +1702,10 @@ static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer, gchar *arg1, gchar *arg2, gpointer user_data ); } -static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer, +static void wxGtkTextRendererEditedCallback( GtkCellRendererText *WXUNUSED(renderer), gchar *arg1, gchar *arg2, gpointer user_data ) { - wxDataViewTextRenderer *cell = (wxDataViewTextRenderer*) user_data; + wxDataViewRenderer *cell = (wxDataViewRenderer*) user_data; wxString tmp = wxGTK_CONV_BACK_FONT(arg2, cell->GetOwner()->GetOwner()->GetFont()); wxVariant value = tmp; @@ -1416,7 +1732,9 @@ wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxD int align ) : wxDataViewRenderer( varianttype, mode, align ) { - m_renderer = (GtkCellRenderer*) gtk_cell_renderer_text_new(); + GtkWxCellRendererText *text_renderer = gtk_wx_cell_renderer_text_new(); + text_renderer->wx_renderer = this; + m_renderer = (GtkCellRenderer*) text_renderer; if (mode & wxDATAVIEW_CELL_EDITABLE) { @@ -1427,7 +1745,7 @@ wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxD g_value_unset( &gvalue ); g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this ); - + GtkInitHandlers(); } @@ -1441,7 +1759,7 @@ bool wxDataViewTextRenderer::SetValue( const wxVariant &value ) GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_STRING ); - g_value_set_string( &gvalue, wxGTK_CONV( tmp ) ); + g_value_set_string( &gvalue, wxGTK_CONV_FONT( tmp, GetOwner()->GetOwner()->GetFont() ) ); g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); g_value_unset( &gvalue ); @@ -1453,7 +1771,7 @@ bool wxDataViewTextRenderer::GetValue( wxVariant &value ) const GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_STRING ); g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue ); - wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &gvalue ) ); + wxString tmp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ), const_cast(this)->GetOwner()->GetOwner()->GetFont() ); g_value_unset( &gvalue ); value = tmp; @@ -1482,6 +1800,18 @@ void wxDataViewTextRenderer::SetAlignment( int align ) g_value_unset( &gvalue ); } +// --------------------------------------------------------- +// wxDataViewTextRendererAttr +// --------------------------------------------------------- + +IMPLEMENT_CLASS(wxDataViewTextRendererAttr,wxDataViewTextRenderer) + +wxDataViewTextRendererAttr::wxDataViewTextRendererAttr( const wxString &varianttype, + wxDataViewCellMode mode, int align ) : + wxDataViewTextRenderer( varianttype, mode, align ) +{ +} + // --------------------------------------------------------- // wxDataViewBitmapRenderer // --------------------------------------------------------- @@ -1539,7 +1869,7 @@ bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value ) return false; } -bool wxDataViewBitmapRenderer::GetValue( wxVariant &value ) const +bool wxDataViewBitmapRenderer::GetValue( wxVariant &WXUNUSED(value) ) const { return false; } @@ -1641,27 +1971,38 @@ bool wxDataViewToggleRenderer::GetValue( wxVariant &value ) const // wxDataViewCustomRenderer // --------------------------------------------------------- -class wxDataViewCtrlDC: public wxWindowDC +class wxDataViewCtrlDCImpl: public wxWindowDCImpl { public: - wxDataViewCtrlDC( wxDataViewCtrl *window ) - { + wxDataViewCtrlDCImpl( wxDC *owner, wxDataViewCtrl *window ) : + wxWindowDCImpl( owner ) + { GtkWidget *widget = window->m_treeview; // Set later - m_window = NULL; + m_gdkwindow = NULL; + + m_window = window; - m_context = window->GtkGetPangoDefaultContext(); + m_context = window->GTKGetPangoDefaultContext(); m_layout = pango_layout_new( m_context ); m_fontdesc = pango_font_description_copy( widget->style->font_desc ); m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget ); - // Set m_window later + // Set m_gdkwindow later // SetUpDC(); - // m_owner = window; } }; +class wxDataViewCtrlDC: public wxWindowDC +{ +public: + wxDataViewCtrlDC( wxDataViewCtrl *window ) : + wxWindowDC( new wxDataViewCtrlDCImpl( this, window ) ) + { } +}; + + // --------------------------------------------------------- // wxDataViewCustomRenderer // --------------------------------------------------------- @@ -1682,7 +2023,8 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, Init(mode, align); } -void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, wxRect cell, wxDC *dc, int state ) +void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, + wxRect WXUNUSED(cell), wxDC *WXUNUSED(dc), int WXUNUSED(state) ) { #if 0 wxDataViewCtrl *view = GetOwner()->GetOwner(); @@ -1694,16 +2036,16 @@ void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, wx #else if (!m_text_renderer) m_text_renderer = gtk_cell_renderer_text_new(); - + GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_STRING ); - g_value_set_string( &gvalue, wxGTK_CONV( text ) ); + g_value_set_string( &gvalue, wxGTK_CONV_FONT( text, GetOwner()->GetOwner()->GetFont() ) ); g_object_set_property( G_OBJECT(m_text_renderer), "text", &gvalue ); g_value_unset( &gvalue ); ((GdkRectangle*) cell_area)->x += xoffset; ((GdkRectangle*) cell_area)->width -= xoffset; - + gtk_cell_renderer_render( m_text_renderer, window, widget, @@ -1711,7 +2053,7 @@ void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, wx (GdkRectangle*) cell_area, (GdkRectangle*) expose_area, (GtkCellRendererState) flags ); - + ((GdkRectangle*) cell_area)->x -= xoffset; ((GdkRectangle*) cell_area)->width += xoffset; #endif @@ -1728,7 +2070,7 @@ bool wxDataViewCustomRenderer::Init(wxDataViewCellMode mode, int align) SetAlignment(align); GtkInitHandlers(); - + return true; } @@ -1776,7 +2118,7 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label, GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_STRING ); - g_value_set_string( &gvalue, wxGTK_CONV(m_label) ); + 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 ); @@ -1819,12 +2161,12 @@ bool wxDataViewProgressRenderer::SetValue( const wxVariant &value ) return true; } -bool wxDataViewProgressRenderer::GetValue( wxVariant &value ) const +bool wxDataViewProgressRenderer::GetValue( wxVariant &WXUNUSED(value) ) const { return false; } -bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int state ) +bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { double pct = (double)m_value / 100.0; wxRect bar = cell; @@ -1845,6 +2187,126 @@ wxSize wxDataViewProgressRenderer::GetSize() const return wxSize(40,12); } +// ------------------------------------- +// wxDataViewChoiceRenderer +// ------------------------------------- + +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_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 ); + } + + 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); + + SetAlignment(alignment); + + g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this ); + + GtkInitHandlers(); + } + else +#endif + { + // Use custom cell code + wxDataViewCustomRenderer::Init(mode, alignment); + } +} + +bool wxDataViewChoiceRenderer::Render( wxRect rect, wxDC *dc, int state ) +{ + RenderText( m_data, 0, rect, dc, state ); + return true; +} + +wxSize wxDataViewChoiceRenderer::GetSize() const +{ + return wxSize(70,20); +} + +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(); + + 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; + + return true; +} + +void wxDataViewChoiceRenderer::SetAlignment( int align ) +{ + wxDataViewCustomRenderer::SetAlignment(align); + + if (gtk_check_version(2,10,0)) + return; + + // horizontal alignment: + PangoAlignment pangoAlign = PANGO_ALIGN_LEFT; + if (align & wxALIGN_RIGHT) + pangoAlign = PANGO_ALIGN_RIGHT; + else if (align & wxALIGN_CENTER_HORIZONTAL) + pangoAlign = PANGO_ALIGN_CENTER; + + GValue gvalue = { 0, }; + g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() ); + g_value_set_enum( &gvalue, pangoAlign ); + g_object_set_property( G_OBJECT(m_renderer), "alignment", &gvalue ); + g_value_unset( &gvalue ); +} + // --------------------------------------------------------- // wxDataViewDateRenderer // --------------------------------------------------------- @@ -1911,7 +2373,7 @@ bool wxDataViewDateRenderer::SetValue( const wxVariant &value ) return true; } -bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const +bool wxDataViewDateRenderer::GetValue( wxVariant &WXUNUSED(value) ) const { return false; } @@ -1932,7 +2394,7 @@ wxSize wxDataViewDateRenderer::GetSize() const return wxSize(x,y+d); } -bool wxDataViewDateRenderer::Activate( wxRect cell, wxDataViewModel *model, +bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *model, const wxDataViewItem &item, unsigned int col ) { wxVariant variant; @@ -1950,13 +2412,13 @@ bool wxDataViewDateRenderer::Activate( wxRect cell, wxDataViewModel *model, } -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewIconTextRenderer -// --------------------------------------------------------- +// --------------------------------------------------------- IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer) -wxDataViewIconTextRenderer::wxDataViewIconTextRenderer( +wxDataViewIconTextRenderer::wxDataViewIconTextRenderer( const wxString &varianttype, wxDataViewCellMode mode, int align ) : wxDataViewCustomRenderer( varianttype, mode, align ) { @@ -1967,18 +2429,18 @@ wxDataViewIconTextRenderer::wxDataViewIconTextRenderer( wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer() { } - + bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value ) { m_value << value; return true; } -bool wxDataViewIconTextRenderer::GetValue( wxVariant &value ) const +bool wxDataViewIconTextRenderer::GetValue( wxVariant &WXUNUSED(value) ) const { return false; } - + bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state ) { const wxIcon &icon = m_value.GetIcon(); @@ -1989,7 +2451,7 @@ bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state ) dc->DrawIcon( icon, cell.x, cell.y + yoffset ); offset = icon.GetWidth() + 4; } - + RenderText( m_value.GetText(), offset, cell, dc, state ); return true; @@ -2004,15 +2466,17 @@ wxSize wxDataViewIconTextRenderer::GetSize() const GetView()->GetTextExtent( m_value.GetText(), &x, &y, &d ); size.x += x; size.y = y+d; - return size; + return size; } -wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) +wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl( + wxWindow *WXUNUSED(parent), wxRect WXUNUSED(labelRect), const wxVariant &WXUNUSED(value) ) { return NULL; } -bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ) +bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( + wxControl* WXUNUSED(editor), wxVariant &WXUNUSED(value) ) { return false; } @@ -2023,7 +2487,7 @@ bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVa static gboolean -gtk_dataview_header_button_press_callback( GtkWidget *widget, +gtk_dataview_header_button_press_callback( GtkWidget *WXUNUSED(widget), GdkEventButton *gdk_event, wxDataViewColumn *column ) { @@ -2033,12 +2497,12 @@ gtk_dataview_header_button_press_callback( GtkWidget *widget, if (gdk_event->button == 1) { gs_lastLeftClickHeader = column; - + wxDataViewCtrl *dv = column->GetOwner(); wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() ); event.SetDataViewColumn( column ); event.SetModel( dv->GetModel() ); - if (dv->GetEventHandler()->ProcessEvent( event )) + if (dv->HandleWindowEvent( event )) return FALSE; } @@ -2048,7 +2512,7 @@ gtk_dataview_header_button_press_callback( GtkWidget *widget, wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, dv->GetId() ); event.SetDataViewColumn( column ); event.SetModel( dv->GetModel() ); - if (dv->GetEventHandler()->ProcessEvent( event )) + if (dv->HandleWindowEvent( event )) return FALSE; } @@ -2064,7 +2528,7 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, } -static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, +static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column), GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, @@ -2079,6 +2543,9 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, wxDataViewModel *wx_model = tree_model->internal->GetDataViewModel(); + if (!wx_model->IsVirtualListModel()) + { + if (wx_model->IsContainer( item )) { if (wx_model->HasContainerColumns( item ) || (cell->GetOwner()->GetModelColumn() == 0)) @@ -2096,7 +2563,7 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, g_value_set_boolean( &gvalue, FALSE ); g_object_set_property( G_OBJECT(renderer), "visible", &gvalue ); g_value_unset( &gvalue ); - + return; } } @@ -2109,6 +2576,8 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, g_value_unset( &gvalue ); } + } + wxVariant value; wx_model->GetValue( value, item, cell->GetOwner()->GetModelColumn() ); @@ -2119,10 +2588,82 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, cell->SetValue( value ); -#if 0 - wxListItemAttr attr; - wx_model->GetAttr( item, attr, cell->GetOwner()->GetModelColumn() ); + if (cell->GtkHasAttributes()) + { + wxDataViewItemAttr attr; + bool colour_set = false; + bool style_set = false; + bool weight_set = false; + + if (wx_model->GetAttr( item, cell->GetOwner()->GetModelColumn(), attr )) + { + // this must be a GtkCellRendererText + wxColour colour = attr.GetColour(); + if (colour.IsOk()) + { + 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), "foreground_gdk", &gvalue ); + g_value_unset( &gvalue ); + + colour_set = true; + } + + 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 ); + + style_set = true; + } + + 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 ); + + weight_set = true; + } + } + + if (!style_set) + { + 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 (!weight_set) + { + 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 (!colour_set) + { + 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 0 if (attr.HasBackgroundColour()) { wxColour colour = attr.GetBackgroundColour(); @@ -2146,26 +2687,23 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, } -IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase) - #include WX_DEFINE_LIST(wxDataViewColumnList) wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell, unsigned int model_column, int width, - wxAlignment align, int flags ) : - wxDataViewColumnBase( title, cell, model_column, width, align, flags ) + wxAlignment align, int flags ) + : wxDataViewColumnBase( cell, model_column ) { Init( align, flags, width ); - gtk_tree_view_column_set_clickable( GTK_TREE_VIEW_COLUMN(m_column), TRUE ); SetTitle( title ); } wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell, unsigned int model_column, int width, - wxAlignment align, int flags ) : - wxDataViewColumnBase( bitmap, cell, model_column, width, align, flags ) + wxAlignment align, int flags ) + : wxDataViewColumnBase( bitmap, cell, model_column ) { Init( align, flags, width ); @@ -2183,14 +2721,17 @@ void wxDataViewColumn::Init(wxAlignment align, int flags, int width) SetFlags( flags ); SetAlignment( align ); - // NOTE: we prefer not to call SetMinWidth(wxDVC_DEFAULT_MINWIDTH); - // as GTK+ is smart and unless explicitely told, will set the minimal - // width to the title's lenght, which is a better default + SetWidth( width ); - // the GTK_TREE_VIEW_COLUMN_FIXED is required by the "fixed height" mode - // that we use for the wxDataViewCtrl - gtk_tree_view_column_set_fixed_width( column, width < 0 ? wxDVC_DEFAULT_WIDTH : width ); - gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED ); + // Create container for icon and label + GtkWidget *box = gtk_hbox_new( FALSE, 1 ); + gtk_widget_show( box ); + // gtk_container_set_border_width((GtkContainer*)box, 2); + m_image = gtk_image_new(); + gtk_box_pack_start(GTK_BOX(box), m_image, FALSE, FALSE, 1); + m_label = gtk_label_new(""); + 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 ); @@ -2198,10 +2739,6 @@ void wxDataViewColumn::Init(wxAlignment align, int flags, int width) wxGtkTreeCellDataFunc, (gpointer) GetRenderer(), NULL ); } -wxDataViewColumn::~wxDataViewColumn() -{ -} - void wxDataViewColumn::OnInternalIdle() { if (m_isConnected) @@ -2231,41 +2768,32 @@ void wxDataViewColumn::SetOwner( wxDataViewCtrl *owner ) void wxDataViewColumn::SetTitle( const wxString &title ) { - GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - - if (m_isConnected) - { - // disconnect before column->button gets recreated - g_signal_handlers_disconnect_by_func( column->button, - (GtkWidget*) gtk_dataview_header_button_press_callback, this); - - m_isConnected = false; - } - - // FIXME: can it really happen that we don't have the owner here?? wxDataViewCtrl *ctrl = GetOwner(); - gtk_tree_view_column_set_title( column, ctrl ? wxGTK_CONV_FONT(title, ctrl->GetFont()) + gtk_label_set_text( GTK_LABEL(m_label), ctrl ? wxGTK_CONV_FONT(title, ctrl->GetFont()) : wxGTK_CONV_SYS(title) ); - - gtk_tree_view_column_set_widget( column, NULL ); + if (title.empty()) + gtk_widget_hide( m_label ); + else + gtk_widget_show( m_label ); } wxString wxDataViewColumn::GetTitle() const { - const gchar *str = gtk_tree_view_column_get_title( GTK_TREE_VIEW_COLUMN(m_column) ); - return wxConvFileName->cMB2WX(str); + return wxGTK_CONV_BACK_FONT( + gtk_label_get_text( GTK_LABEL(m_label) ), + GetOwner()->GetFont() + ); } void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap ) { wxDataViewColumnBase::SetBitmap( bitmap ); - GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); if (bitmap.Ok()) { - GtkImage *gtk_image = GTK_IMAGE( gtk_image_new() ); + GtkImage *gtk_image = GTK_IMAGE(m_image); - GdkBitmap *mask = (GdkBitmap *) NULL; + GdkBitmap *mask = NULL; if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap(); @@ -2279,13 +2807,11 @@ void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap ) gtk_image_set_from_pixmap(GTK_IMAGE(gtk_image), bitmap.GetPixmap(), mask); } - gtk_widget_show( GTK_WIDGET(gtk_image) ); - - gtk_tree_view_column_set_widget( column, GTK_WIDGET(gtk_image) ); + gtk_widget_show( m_image ); } else { - gtk_tree_view_column_set_widget( column, NULL ); + gtk_widget_hide( m_image ); } } @@ -2311,6 +2837,9 @@ void wxDataViewColumn::SetAlignment( wxAlignment align ) xalign = 0.5; gtk_tree_view_column_set_alignment( column, xalign ); + + if (m_renderer && m_renderer->GetAlignment() == -1) + m_renderer->GtkUpdateAlignment(); } wxAlignment wxDataViewColumn::GetAlignment() const @@ -2328,8 +2857,8 @@ wxAlignment wxDataViewColumn::GetAlignment() const void wxDataViewColumn::SetSortable( bool sortable ) { GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - - if (sortable) + + if ( sortable ) { gtk_tree_view_column_set_sort_column_id( column, GetModelColumn() ); } @@ -2337,13 +2866,28 @@ void wxDataViewColumn::SetSortable( bool sortable ) { gtk_tree_view_column_set_sort_column_id( column, -1 ); gtk_tree_view_column_set_sort_indicator( column, FALSE ); + gtk_tree_view_column_set_clickable( column, FALSE ); } } bool wxDataViewColumn::IsSortable() const { GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - return (gtk_tree_view_column_get_sort_column_id( column ) != -1); + 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" ); +} + +bool wxDataViewColumn::IsSortKey() const +{ + GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); + return gtk_tree_view_column_get_sort_indicator( column ); } bool wxDataViewColumn::IsResizeable() const @@ -2394,14 +2938,71 @@ int wxDataViewColumn::GetWidth() const void wxDataViewColumn::SetWidth( int width ) { - gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), width ); + if (width < 0) + { +#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 + 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 ); + + gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), width ); + } +} + +void wxDataViewColumn::SetReorderable( bool reorderable ) +{ + gtk_tree_view_column_set_reorderable( GTK_TREE_VIEW_COLUMN(m_column), reorderable ); } +bool wxDataViewColumn::IsReorderable() const +{ + return gtk_tree_view_column_get_reorderable( GTK_TREE_VIEW_COLUMN(m_column) ); +} //----------------------------------------------------------------------------- // wxGtkTreeModelNode //----------------------------------------------------------------------------- +#if 0 +class wxGtkTreeModelChildWithPos +{ +public: + unsigned int pos; + void *id; +}; + +static +int wxGtkTreeModelChildWithPosCmp( const void* data1, const void* data2, const void* user_data ) +{ + const wxGtkTreeModelChildWithPos* child1 = (const wxGtkTreeModelChildWithPos*) data1; + const wxGtkTreeModelChildWithPos* child2 = (const wxGtkTreeModelChildWithPos*) data2; + const wxDataViewCtrlInternal *internal = (const wxDataViewCtrlInternal *) user_data; + int ret = internal->GetDataViewModel()->Compare( child1->id, child2->id, + internal->GetSortColumn(), (internal->GetSortOrder() == GTK_SORT_DESCENDING) ); + + return ret; +} +#else +static +int LINKAGEMODE wxGtkTreeModelChildPtrCmp( void*** data1, void*** data2 ) +{ + return gs_internal->GetDataViewModel()->Compare( **data1, **data2, + gs_internal->GetSortColumn(), (gs_internal->GetSortOrder() == GTK_SORT_ASCENDING) ); +} + +WX_DEFINE_ARRAY_PTR( void**, wxGtkTreeModelChildrenPtr ); +#endif + void wxGtkTreeModelNode::Resort() { size_t child_count = GetChildCount(); @@ -2420,13 +3021,67 @@ void wxGtkTreeModelNode::Resort() return; } + gint *new_order = new gint[child_count]; + +#if 1 + // m_children has the original *void + // ptrs points to these + wxGtkTreeModelChildrenPtr ptrs; + size_t i; + for (i = 0; i < child_count; i++) + ptrs.Add( &(m_children[i]) ); + // Sort the ptrs + gs_internal = m_internal; + ptrs.Sort( &wxGtkTreeModelChildPtrCmp ); + wxGtkTreeModelChildren temp; + void** base_ptr = &(m_children[0]); + // Transfer positions to new_order array and + // IDs to temp + for (i = 0; i < child_count; i++) + { + new_order[i] = ptrs[i] - base_ptr; + temp.Add( *ptrs[i] ); + } + + // Transfer IDs back to m_children + m_children.Clear(); WX_APPEND_ARRAY( temp, m_children ); +#endif +#if 0 + // Too slow + + // Build up array with IDs and original positions + wxGtkTreeModelChildWithPos* temp = new wxGtkTreeModelChildWithPos[child_count]; + size_t i; + for (i = 0; i < child_count; i++) + { + temp[i].pos = i; + temp[i].id = m_children[i]; + } + // Sort array keeping original positions + wxQsort( temp, child_count, sizeof(wxGtkTreeModelChildWithPos), + &wxGtkTreeModelChildWithPosCmp, m_internal ); + // Transfer positions to new_order array and + // IDs to m_children + m_children.Clear(); + for (i = 0; i < child_count; i++) + { + new_order[i] = temp[i].pos; + m_children.Add( temp[i].id ); + } + // Delete array + delete [] temp; +#endif + +#if 0 + // Too slow - g_internal = m_internal; - m_children.Sort( &wxGtkTreeModelChildCmp ); + wxGtkTreeModelChildren temp; + WX_APPEND_ARRAY( temp, m_children ); - gint *new_order = new gint[child_count]; + gs_internal = m_internal; + m_children.Sort( &wxGtkTreeModelChildCmp ); unsigned int pos; for (pos = 0; pos < child_count; pos++) @@ -2435,21 +3090,23 @@ void wxGtkTreeModelNode::Resort() int old_pos = temp.Index( id ); new_order[pos] = old_pos; } - +#endif + GtkTreeModel *gtk_tree_model = GTK_TREE_MODEL( m_internal->GetGtkModel() ); GtkTreeIter iter; iter.user_data = GetItem().GetID(); iter.stamp = m_internal->GetGtkModel()->stamp; - + GtkTreePath *path = m_internal->get_path( &iter ); - + gtk_tree_model_rows_reordered( gtk_tree_model, path, &iter, new_order ); - + gtk_tree_path_free (path); - + delete [] new_order; + unsigned int pos; for (pos = 0; pos < node_count; pos++) { wxGtkTreeModelNode *node = m_nodes.Item( pos ); @@ -2461,24 +3118,32 @@ void wxGtkTreeModelNode::Resort() // wxDataViewCtrlInternal //----------------------------------------------------------------------------- -wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, +wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model ) -{ +{ m_owner = owner; - m_wx_model = wx_model; - m_gtk_model = gtk_model; - m_root = NULL; + m_wx_model = wx_model; + m_gtk_model = gtk_model; + m_root = NULL; m_sort_order = GTK_SORT_ASCENDING; m_sort_column = -1; m_dataview_sort_column = NULL; - InitTree(); + + m_dragDataObject = NULL; + m_dropDataObject = NULL; + + if (!m_wx_model->IsVirtualListModel()) + InitTree(); } - + wxDataViewCtrlInternal::~wxDataViewCtrlInternal() { g_object_unref( m_gtk_model ); + + delete m_dragDataObject; + delete m_dropDataObject; } - + void wxDataViewCtrlInternal::InitTree() { wxDataViewItem item; @@ -2497,38 +3162,214 @@ void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node ) for (pos = 0; pos < count; pos++) { wxDataViewItem child = children[pos]; - + if (m_wx_model->IsContainer( child )) node->AddNode( new wxGtkTreeModelNode( node, child, this ) ); else node->AddLeave( child.GetID() ); - + // Don't send any events here } } } +// GTK+ dnd iface + +bool wxDataViewCtrlInternal::EnableDragSource( const wxDataFormat &format ) +{ + wxGtkString atom_str( gdk_atom_name( format ) ); + m_dragSourceTargetEntryTarget = wxCharBuffer( atom_str ); + + m_dragSourceTargetEntry.target = m_dragSourceTargetEntryTarget.data(); + m_dragSourceTargetEntry.flags = 0; + m_dragSourceTargetEntry.info = static_cast(-1); + + gtk_tree_view_enable_model_drag_source( GTK_TREE_VIEW(m_owner->GtkGetTreeView() ), + GDK_BUTTON1_MASK, &m_dragSourceTargetEntry, 1, (GdkDragAction) GDK_ACTION_COPY ); + + return true; +} + +bool wxDataViewCtrlInternal::EnableDropTarget( const wxDataFormat &format ) +{ + wxGtkString atom_str( gdk_atom_name( format ) ); + m_dropTargetTargetEntryTarget = wxCharBuffer( atom_str ); + + m_dropTargetTargetEntry.target = m_dropTargetTargetEntryTarget.data(); + m_dropTargetTargetEntry.flags = 0; + m_dropTargetTargetEntry.info = static_cast(-1); + + gtk_tree_view_enable_model_drag_dest( GTK_TREE_VIEW(m_owner->GtkGetTreeView() ), + &m_dropTargetTargetEntry, 1, (GdkDragAction) GDK_ACTION_COPY ); + + return true; +} + +gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag_source), + GtkTreePath *path ) +{ + delete m_dragDataObject; + + GtkTreeIter iter; + if (!get_iter( &iter, path )) return FALSE; + wxDataViewItem item( (void*) iter.user_data ); + + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetItem( item ); + event.SetModel( m_wx_model ); + if (!m_owner->HandleWindowEvent( event )) + return FALSE; + + if (!event.IsAllowed()) + return FALSE; + + wxDataObject *obj = event.GetDataObject(); + if (!obj) + return FALSE; + + m_dragDataObject = obj; + + return TRUE; +} + +gboolean +wxDataViewCtrlInternal::drag_data_delete(GtkTreeDragSource *WXUNUSED(drag_source), + GtkTreePath *WXUNUSED(path)) +{ + return FALSE; +} + +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 ); + + if (!m_dragDataObject->IsSupported( selection_data->target )) + return FALSE; + + size_t size = m_dragDataObject->GetDataSize( selection_data->target ); + if (size == 0) + return FALSE; + + void *buf = malloc( size ); + + gboolean res = FALSE; + if (m_dragDataObject->GetDataHere( selection_data->target, buf )) + { + res = TRUE; + + gtk_selection_data_set( selection_data, selection_data->target, + 8, (const guchar*) buf, size ); + } + + free( buf ); + + return res; +} + +gboolean +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 ); + + wxDataViewEvent event( wxEVT_COMMAND_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 ); + if (!m_owner->HandleWindowEvent( event )) + return FALSE; + + if (!event.IsAllowed()) + return FALSE; + + return TRUE; +} + +gboolean +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 ); + + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetItem( item ); + event.SetModel( m_wx_model ); + event.SetDataFormat( selection_data->target ); + if (!m_owner->HandleWindowEvent( event )) + return FALSE; + + if (!event.IsAllowed()) + return FALSE; + + return TRUE; +} + +// notifications from wxDataViewModel + +bool wxDataViewCtrlInternal::Cleared() +{ + if (m_root) + { + delete m_root; + InitTree(); + } + + // Create new GTK model + g_object_unref( m_gtk_model ); + m_gtk_model = wxgtk_tree_model_new(); + m_gtk_model->internal = this; + + return true; +} + void wxDataViewCtrlInternal::Resort() { - m_root->Resort(); + if (!m_wx_model->IsVirtualListModel()) + m_root->Resort(); } bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) { - wxGtkTreeModelNode *parent_node = FindNode( parent ); - if (m_wx_model->IsContainer( item )) - parent_node->AddNode( new wxGtkTreeModelNode( parent_node, item, this ) ); - else - parent_node->AddLeave( item.GetID() ); - + if (!m_wx_model->IsVirtualListModel()) + { + wxGtkTreeModelNode *parent_node = FindNode( parent ); + wxASSERT_MSG(parent_node, + "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel"); + + if (m_wx_model->IsContainer( item )) + parent_node->AddNode( new wxGtkTreeModelNode( parent_node, item, this ) ); + else + parent_node->AddLeave( item.GetID() ); + } + return true; } bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) { - wxGtkTreeModelNode *parent_node = FindNode( parent ); - parent_node->DeleteChild( item.GetID() ); - + if (!m_wx_model->IsVirtualListModel()) + { + wxGtkTreeModelNode *parent_node = FindNode( parent ); + wxASSERT_MSG(parent_node, + "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel"); + + parent_node->DeleteChild( item.GetID() ); + } + return true; } @@ -2538,8 +3379,8 @@ bool wxDataViewCtrlInternal::ItemChanged( const wxDataViewItem &item ) event.SetEventObject( m_owner ); event.SetModel( m_owner->GetModel() ); event.SetItem( item ); - m_owner->GetEventHandler()->ProcessEvent( event ); - + m_owner->HandleWindowEvent( event ); + return true; } @@ -2551,51 +3392,74 @@ bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned event.SetColumn( col ); event.SetDataViewColumn( GetOwner()->GetColumn(col) ); event.SetItem( item ); - m_owner->GetEventHandler()->ProcessEvent( event ); - + m_owner->HandleWindowEvent( event ); + return true; } -bool wxDataViewCtrlInternal::Cleared() +// GTK+ model iface + +GtkTreeModelFlags wxDataViewCtrlInternal::get_flags() { - return true; + if (m_wx_model->IsVirtualListModel()) + return GTK_TREE_MODEL_LIST_ONLY; + else + return GTK_TREE_MODEL_ITERS_PERSIST; } gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path ) { - int depth = gtk_tree_path_get_depth( path ); + if (m_wx_model->IsVirtualListModel()) + { + wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model; - wxGtkTreeModelNode *node = m_root; + unsigned int i = (unsigned int)gtk_tree_path_get_indices (path)[0]; + + if (i >= wx_model->GetLastIndex() + 1) + return FALSE; - int i; - for (i = 0; i < depth; i++) + iter->stamp = m_gtk_model->stamp; + // user_data is just the index + iter->user_data = (gpointer) i; + + return TRUE; + } + else { - BuildBranch( node ); - - gint pos = gtk_tree_path_get_indices (path)[i]; - if (pos < 0) return FALSE; - if ((size_t)pos >= node->GetChildCount()) return FALSE; - - void* id = node->GetChildren().Item( (size_t) pos ); - - if (i == depth-1) - { - iter->stamp = m_gtk_model->stamp; - iter->user_data = id; - return TRUE; - } + int depth = gtk_tree_path_get_depth( path ); - size_t count = node->GetNodes().GetCount(); - size_t pos2; - for (pos2 = 0; pos2 < count; pos2++) + wxGtkTreeModelNode *node = m_root; + + int i; + for (i = 0; i < depth; i++) { - wxGtkTreeModelNode *child_node = node->GetNodes().Item( pos2 ); - if (child_node->GetItem().GetID() == id) + BuildBranch( node ); + + gint pos = gtk_tree_path_get_indices (path)[i]; + if (pos < 0) return FALSE; + if ((size_t)pos >= node->GetChildCount()) return FALSE; + + void* id = node->GetChildren().Item( (size_t) pos ); + + if (i == depth-1) + { + iter->stamp = m_gtk_model->stamp; + iter->user_data = id; + return TRUE; + } + + size_t count = node->GetNodes().GetCount(); + size_t pos2; + for (pos2 = 0; pos2 < count; pos2++) { - node = child_node; - break; + wxGtkTreeModelNode *child_node = node->GetNodes().Item( pos2 ); + if (child_node->GetItem().GetID() == id) + { + node = child_node; + break; + } } - } + } } return FALSE; @@ -2604,17 +3468,27 @@ gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter ) { GtkTreePath *retval = gtk_tree_path_new (); - void *id = iter->user_data; - - wxGtkTreeModelNode *node = FindParentNode( iter ); - while (node) + + if (m_wx_model->IsVirtualListModel()) + { + // user_data is just the index + int i = (wxUIntPtr) iter->user_data; + gtk_tree_path_append_index (retval, i); + } + else { - int pos = node->GetChildren().Index( id ); + void *id = iter->user_data; - gtk_tree_path_prepend_index( retval, pos ); - - id = node->GetItem().GetID(); - node = node->GetParent(); + wxGtkTreeModelNode *node = FindParentNode( iter ); + while (node) + { + int pos = node->GetChildren().Index( id ); + + gtk_tree_path_prepend_index( retval, pos ); + + id = node->GetItem().GetID(); + node = node->GetParent(); + } } return retval; @@ -2622,102 +3496,196 @@ GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter ) gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter ) { - wxGtkTreeModelNode *parent = FindParentNode( iter ); - if( parent == NULL ) - return FALSE; + if (m_wx_model->IsVirtualListModel()) + { + wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model; - int pos = parent->GetChildren().Index( iter->user_data ); + int n = (wxUIntPtr) iter->user_data; - if (pos == (int) parent->GetChildCount()-1) - return FALSE; - - iter->stamp = m_gtk_model->stamp; - iter->user_data = parent->GetChildren().Item( pos+1 ); + if (n == -1) + return FALSE; + + if (n >= (int) wx_model->GetLastIndex()) + return FALSE; + + iter->user_data = (gpointer) ++n; + } + else + { + wxGtkTreeModelNode *parent = FindParentNode( iter ); + if( parent == NULL ) + return FALSE; + + int pos = parent->GetChildren().Index( iter->user_data ); + + if (pos == (int) parent->GetChildCount()-1) + return FALSE; + + iter->stamp = m_gtk_model->stamp; + iter->user_data = parent->GetChildren().Item( pos+1 ); + } return TRUE; } gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *parent ) { - wxDataViewItem item( (void*) parent->user_data ); - - if (!m_wx_model->IsContainer( item )) - return FALSE; - - wxGtkTreeModelNode *parent_node = FindNode( parent ); - BuildBranch( parent_node ); - - if (parent_node->GetChildCount() == 0) - return FALSE; - - iter->stamp = m_gtk_model->stamp; - iter->user_data = (gpointer) parent_node->GetChildren().Item( 0 ); + if (m_wx_model->IsVirtualListModel()) + { + // this is a list, nodes have no children + if (parent) + return FALSE; + + iter->stamp = m_gtk_model->stamp; + iter->user_data = (gpointer) -1; + + return TRUE; + } + else + { + wxDataViewItem item( (void*) parent->user_data ); + + if (!m_wx_model->IsContainer( item )) + return FALSE; + + wxGtkTreeModelNode *parent_node = FindNode( parent ); + wxASSERT_MSG(parent_node, + "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel"); + + BuildBranch( parent_node ); + + if (parent_node->GetChildCount() == 0) + return FALSE; + + iter->stamp = m_gtk_model->stamp; + iter->user_data = (gpointer) parent_node->GetChildren().Item( 0 ); + } return TRUE; } gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter ) { - wxDataViewItem item( (void*) iter->user_data ); - - bool is_container = m_wx_model->IsContainer( item ); - - if (!is_container) + if (m_wx_model->IsVirtualListModel()) + { + // this is a list, nodes have no children return FALSE; - - wxGtkTreeModelNode *node = FindNode( iter ); - BuildBranch( node ); - - return (node->GetChildCount() > 0); + } + else + { + wxDataViewItem item( (void*) iter->user_data ); + + bool is_container = m_wx_model->IsContainer( item ); + + if (!is_container) + return FALSE; + + wxGtkTreeModelNode *node = FindNode( iter ); + wxASSERT_MSG(node, + "Did you forget a call to ItemAdded()? The iterator is unknown to the wxGtkTreeModel"); + + BuildBranch( node ); + + return (node->GetChildCount() > 0); + } } gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter ) { - wxDataViewItem item( (void*) iter->user_data ); - - if (!m_wx_model->IsContainer( item )) + if (m_wx_model->IsVirtualListModel()) + { + wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model; + + if (iter == NULL) + return (gint) wx_model->GetLastIndex() + 1; + return 0; - - wxGtkTreeModelNode *parent_node = FindNode( iter ); - BuildBranch( parent_node ); + } + else + { + if (iter == NULL) + return m_root->GetChildCount(); - // wxPrintf( "iter_n_children %d\n", parent_node->GetChildCount() ); - - return parent_node->GetChildCount(); + wxDataViewItem item( (void*) iter->user_data ); + + if (!m_wx_model->IsContainer( item )) + return 0; + + wxGtkTreeModelNode *parent_node = FindNode( iter ); + wxASSERT_MSG(parent_node, + "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel"); + + BuildBranch( parent_node ); + + // wxPrintf( "iter_n_children %d\n", parent_node->GetChildCount() ); + + return parent_node->GetChildCount(); + } } gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n ) { - void* id = NULL; - if (parent) id = (void*) parent->user_data; - wxDataViewItem item( id ); - - if (!m_wx_model->IsContainer( item )) - return FALSE; - - wxGtkTreeModelNode *parent_node = FindNode( parent ); - BuildBranch( parent_node ); + if (m_wx_model->IsVirtualListModel()) + { + wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model; - // wxPrintf( "iter_nth_child %d\n", n ); - - iter->stamp = m_gtk_model->stamp; - iter->user_data = parent_node->GetChildren().Item( n ); + if (parent) + return FALSE; - return TRUE; + if (n < 0) + return FALSE; + + if (n >= (gint) wx_model->GetLastIndex() + 1) + return FALSE; + + iter->stamp = m_gtk_model->stamp; + iter->user_data = (gpointer) n; + + return TRUE; + } + else + { + void* id = NULL; + if (parent) id = (void*) parent->user_data; + wxDataViewItem item( id ); + + if (!m_wx_model->IsContainer( item )) + return FALSE; + + wxGtkTreeModelNode *parent_node = FindNode( parent ); + wxASSERT_MSG(parent_node, + "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel"); + + BuildBranch( parent_node ); + + // wxPrintf( "iter_nth_child %d\n", n ); + + iter->stamp = m_gtk_model->stamp; + iter->user_data = parent_node->GetChildren().Item( n ); + + return TRUE; + } } gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *child ) { - wxGtkTreeModelNode *node = FindParentNode( child ); - if (!node) + if (m_wx_model->IsVirtualListModel()) + { return FALSE; - - iter->stamp = m_gtk_model->stamp; - iter->user_data = (gpointer) node->GetItem().GetID(); + } + else + { + wxGtkTreeModelNode *node = FindParentNode( child ); + if (!node) + return FALSE; - return TRUE; + iter->stamp = m_gtk_model->stamp; + iter->user_data = (gpointer) node->GetItem().GetID(); + + return TRUE; + } } - + static wxGtkTreeModelNode* wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item ) { @@ -2727,7 +3695,7 @@ wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *tr ItemList list; list.DeleteContents( true ); wxDataViewItem it( item ); - + while( it.IsOk() ) { wxDataViewItem * pItem = new wxDataViewItem( it ); @@ -2749,7 +3717,7 @@ wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *tr { node = nodes[j]; break; - } + } } if( j == len ) @@ -2772,16 +3740,19 @@ wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( GtkTreeIter *iter ) wxDataViewItem item( (void*) iter->user_data ); if (!item.IsOk()) return m_root; - + wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item ); - + +/* if (!result) { wxLogDebug( "Not found %p", iter->user_data ); char *crash = NULL; *crash = 0; } - + // TODO: remove this code +*/ + return result; } @@ -2791,14 +3762,17 @@ wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( const wxDataViewItem &item return m_root; wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item ); - + +/* if (!result) { wxLogDebug( "Not found %p", item.GetID() ); char *crash = NULL; *crash = 0; } - + // TODO: remove this code +*/ + return result; } @@ -2835,7 +3809,7 @@ wxDataViewCtrlInternal_FindParentNode( wxDataViewModel * model, wxGtkTreeModelNo { node = nodes[j]; break; - } + } } if( j == len ) @@ -2860,7 +3834,7 @@ wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( GtkTreeIter *iter ) { if (!iter) return NULL; - + wxDataViewItem item( (void*) iter->user_data ); if (!item.IsOk()) return NULL; @@ -2881,7 +3855,7 @@ wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( const wxDataViewItem //----------------------------------------------------------------------------- static void -wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCtrl *dv ) +wxdataview_selection_changed_callback( GtkTreeSelection* WXUNUSED(selection), wxDataViewCtrl *dv ) { if (!GTK_WIDGET_REALIZED(dv->m_widget)) return; @@ -2889,12 +3863,12 @@ wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCt wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, dv->GetId() ); event.SetItem( dv->GetSelection() ); event.SetModel( dv->GetModel() ); - dv->GetEventHandler()->ProcessEvent( event ); + dv->HandleWindowEvent( event ); } static void -wxdataview_row_activated_callback( GtkTreeView* treeview, GtkTreePath *path, - GtkTreeViewColumn *column, wxDataViewCtrl *dv ) +wxdataview_row_activated_callback( GtkTreeView* WXUNUSED(treeview), GtkTreePath *path, + GtkTreeViewColumn *WXUNUSED(column), wxDataViewCtrl *dv ) { wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, dv->GetId() ); @@ -2903,73 +3877,68 @@ wxdataview_row_activated_callback( GtkTreeView* treeview, GtkTreePath *path, wxDataViewItem item( (void*) iter.user_data );; event.SetItem( item ); event.SetModel( dv->GetModel() ); - dv->GetEventHandler()->ProcessEvent( event ); + dv->HandleWindowEvent( event ); } static gboolean -wxdataview_test_expand_row_callback( GtkTreeView* treeview, GtkTreeIter* iter, - GtkTreePath *path, wxDataViewCtrl *dv ) +wxdataview_test_expand_row_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter, + GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv ) { wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, dv->GetId() ); wxDataViewItem item( (void*) iter->user_data );; event.SetItem( item ); event.SetModel( dv->GetModel() ); - dv->GetEventHandler()->ProcessEvent( event ); - + dv->HandleWindowEvent( event ); + return !event.IsAllowed(); } static void -wxdataview_row_expanded_callback( GtkTreeView* treeview, GtkTreeIter* iter, - GtkTreePath *path, wxDataViewCtrl *dv ) +wxdataview_row_expanded_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter, + GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv ) { wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, dv->GetId() ); wxDataViewItem item( (void*) iter->user_data );; event.SetItem( item ); event.SetModel( dv->GetModel() ); - dv->GetEventHandler()->ProcessEvent( event ); + dv->HandleWindowEvent( event ); } static gboolean -wxdataview_test_collapse_row_callback( GtkTreeView* treeview, GtkTreeIter* iter, - GtkTreePath *path, wxDataViewCtrl *dv ) +wxdataview_test_collapse_row_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter, + GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv ) { wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, dv->GetId() ); wxDataViewItem item( (void*) iter->user_data );; event.SetItem( item ); event.SetModel( dv->GetModel() ); - dv->GetEventHandler()->ProcessEvent( event ); - + dv->HandleWindowEvent( event ); + return !event.IsAllowed(); } static void -wxdataview_row_collapsed_callback( GtkTreeView* treeview, GtkTreeIter* iter, - GtkTreePath *path, wxDataViewCtrl *dv ) +wxdataview_row_collapsed_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter, + GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv ) { wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, dv->GetId() ); wxDataViewItem item( (void*) iter->user_data );; event.SetItem( item ); event.SetModel( dv->GetModel() ); - dv->GetEventHandler()->ProcessEvent( event ); + dv->HandleWindowEvent( event ); } //----------------------------------------------------------------------------- // wxDataViewCtrl //----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -// InsertChild for wxDataViewCtrl -//----------------------------------------------------------------------------- - -static void wxInsertChildInDataViewCtrl( wxWindowGTK* parent, wxWindowGTK* child ) +void wxDataViewCtrl::AddChildGTK(wxWindowGTK* child) { - wxDataViewCtrl * dvc = (wxDataViewCtrl*) parent; - GtkWidget *treeview = dvc->GtkGetTreeView(); + GtkWidget* treeview = GtkGetTreeView(); // Insert widget in GtkTreeView if (GTK_WIDGET_REALIZED(treeview)) @@ -2980,7 +3949,7 @@ static void wxInsertChildInDataViewCtrl( wxWindowGTK* parent, wxWindowGTK* child static void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget), - GtkAllocation *alloc, + GtkAllocation *WXUNUSED(gtk_alloc), wxDataViewCtrl *win ) { wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst(); @@ -3008,9 +3977,9 @@ void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget), //----------------------------------------------------------------------------- static gboolean -gtk_dataview_motion_notify_callback( GtkWidget *widget, - GdkEventMotion *gdk_event, - wxDataViewCtrl *dv ) +gtk_dataview_motion_notify_callback( GtkWidget *WXUNUSED(widget), + GdkEventMotion *gdk_event, + wxDataViewCtrl *dv ) { if (gdk_event->is_hint) { @@ -3026,7 +3995,7 @@ gtk_dataview_motion_notify_callback( GtkWidget *widget, GtkTreeViewColumn *column = NULL; gint cell_x = 0; gint cell_y = 0; - if (gtk_tree_view_get_path_at_pos( + if (gtk_tree_view_get_path_at_pos( GTK_TREE_VIEW(dv->GtkGetTreeView()), (int) gdk_event->x, (int) gdk_event->y, &path, @@ -3038,9 +4007,9 @@ gtk_dataview_motion_notify_callback( GtkWidget *widget, { GtkTreeIter iter; dv->GtkGetInternal()->get_iter( &iter, path ); - + // wxPrintf( "mouse %d %d\n", (int) gdk_event->x, (int) gdk_event->y ); - + gtk_tree_path_free( path ); } } @@ -3049,6 +4018,47 @@ gtk_dataview_motion_notify_callback( GtkWidget *widget, return FALSE; } +//----------------------------------------------------------------------------- +// "button_press_event" +//----------------------------------------------------------------------------- + +static gboolean +gtk_dataview_button_press_callback( GtkWidget *WXUNUSED(widget), + GdkEventButton *gdk_event, + wxDataViewCtrl *dv ) +{ + if ((gdk_event->button == 3) && (gdk_event->type == GDK_BUTTON_PRESS)) + { + GtkTreePath *path = NULL; + 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, + &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; + } + } + } + + return FALSE; +} IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase) @@ -3057,16 +4067,21 @@ wxDataViewCtrl::~wxDataViewCtrl() if (m_notifier) GetModel()->RemoveNotifier( m_notifier ); + m_cols.Clear(); + // remove the model from the GtkTreeView before it gets destroyed by the // wxDataViewCtrlBase's dtor gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), NULL ); - + delete m_internal; } void wxDataViewCtrl::Init() { m_notifier = NULL; + m_internal = NULL; + + m_cols.DeleteContents( true ); } bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, @@ -3082,11 +4097,10 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, return false; } - m_insertCallback = wxInsertChildInDataViewCtrl; - m_widget = gtk_scrolled_window_new (NULL, NULL); + g_object_ref(m_widget); - GtkScrolledWindowSetBorder(m_widget, style); + GTKScrolledWindowSetBorder(m_widget, style); m_treeview = gtk_tree_view_new(); gtk_container_add (GTK_CONTAINER (m_widget), m_treeview); @@ -3096,7 +4110,10 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, #ifdef __WXGTK26__ if (!gtk_check_version(2,6,0)) - gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), TRUE ); + { + bool fixed = (style & wxDV_VARIABLE_LINE_HEIGHT) == 0; + gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed ); + } #endif if (style & wxDV_MULTIPLE) @@ -3120,16 +4137,15 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, else if (style & wxDV_HORIZ_RULES) grid = GTK_TREE_VIEW_GRID_LINES_HORIZONTAL; - gtk_tree_view_set_grid_lines( GTK_TREE_VIEW(m_treeview), grid ); + if (grid != GTK_TREE_VIEW_GRID_LINES_NONE) + gtk_tree_view_set_grid_lines( GTK_TREE_VIEW(m_treeview), grid ); } - else #endif - { - gtk_tree_view_set_rules_hint( GTK_TREE_VIEW(m_treeview), (style & wxDV_HORIZ_RULES) != 0 ); - } + + gtk_tree_view_set_rules_hint( GTK_TREE_VIEW(m_treeview), (style & wxDV_ROW_LINES) != 0 ); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget), - GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_widget_show (m_treeview); m_parent->DoAddChild( this ); @@ -3149,13 +4165,16 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, g_signal_connect (m_treeview, "test-expand-row", G_CALLBACK (wxdataview_test_expand_row_callback), this); - + g_signal_connect_after (m_treeview, "row-expanded", G_CALLBACK (wxdataview_row_expanded_callback), this); g_signal_connect (m_treeview, "motion_notify_event", G_CALLBACK (gtk_dataview_motion_notify_callback), this); + g_signal_connect (m_treeview, "button_press_event", + G_CALLBACK (gtk_dataview_button_press_callback), this); + return true; } @@ -3174,9 +4193,26 @@ void wxDataViewCtrl::OnInternalIdle() bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) { + if (GetModel()) + { + delete m_internal; + m_internal = NULL; + + delete m_notifier; + m_notifier = NULL; + } + 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; @@ -3186,13 +4222,23 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) model->AddNotifier( m_notifier ); gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_model) ); - + // unref in wxDataViewCtrlInternal // g_object_unref( gtk_model ); return true; } +bool wxDataViewCtrl::EnableDragSource( const wxDataFormat &format ) +{ + return m_internal->EnableDragSource( format ); +} + +bool wxDataViewCtrl::EnableDropTarget( const wxDataFormat &format ) +{ + return m_internal->EnableDropTarget( format ); +} + bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) { if (!wxDataViewCtrlBase::AppendColumn(col)) @@ -3200,7 +4246,16 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) m_cols.Append( col ); - gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), +#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) + 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()) ); return true; @@ -3213,12 +4268,43 @@ bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col ) m_cols.Insert( col ); - gtk_tree_view_insert_column( GTK_TREE_VIEW(m_treeview), +#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) + 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 ); return true; } +bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col ) +{ + if (!wxDataViewCtrlBase::InsertColumn(pos,col)) + return false; + + 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) + 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 ); + + return true; +} + unsigned int wxDataViewCtrl::GetColumnCount() const { return m_cols.GetCount(); @@ -3229,9 +4315,9 @@ wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const GtkTreeViewColumn *gtk_col = gtk_tree_view_get_column( GTK_TREE_VIEW(m_treeview), pos ); if (!gtk_col) return NULL; - + wxDataViewColumnList::const_iterator iter; - for (iter = m_cols.begin(); iter != m_cols.end(); iter++) + for (iter = m_cols.begin(); iter != m_cols.end(); ++iter) { wxDataViewColumn *col = *iter; if (GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) == gtk_col) @@ -3239,18 +4325,16 @@ wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const return col; } } - + return NULL; } bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) { - gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview), + gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview), GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()) ); - m_cols.remove( column ); - - delete column; + m_cols.DeleteObject( column ); return true; } @@ -3258,15 +4342,15 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) bool wxDataViewCtrl::ClearColumns() { wxDataViewColumnList::iterator iter; - for (iter = m_cols.begin(); iter != m_cols.end(); iter++) + for (iter = m_cols.begin(); iter != m_cols.end(); ++iter) { wxDataViewColumn *col = *iter; - gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview), + gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview), GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ); } - - m_cols.clear(); - + + m_cols.Clear(); + return true; } @@ -3275,9 +4359,9 @@ 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) ); - + gint pos = g_list_index( list, (gconstpointer) gtk_column ); - + g_list_free( list ); return pos; @@ -3306,26 +4390,37 @@ void wxDataViewCtrl::Collapse( const wxDataViewItem & item ) 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 ); + + return res; +} + wxDataViewItem wxDataViewCtrl::GetSelection() const { GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - + if (m_windowStyle & wxDV_MULTIPLE) { // Report the first one GtkTreeModel *model; GList *list = gtk_tree_selection_get_selected_rows( selection, &model ); - + if (list) { GtkTreePath *path = (GtkTreePath*) list->data; GtkTreeIter iter; m_internal->get_iter( &iter, path ); - + // delete list g_list_foreach( list, (GFunc) gtk_tree_path_free, NULL ); g_list_free( list ); - + return wxDataViewItem( (void*) iter.user_data ); } } @@ -3338,7 +4433,7 @@ wxDataViewItem wxDataViewCtrl::GetSelection() const return item; } } - + return wxDataViewItem(0); } @@ -3356,7 +4451,7 @@ int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const while (list) { GtkTreePath *path = (GtkTreePath*) list->data; - + GtkTreeIter iter; m_internal->get_iter( &iter, path ); @@ -3390,29 +4485,44 @@ int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) { GtkDisableSelectionEvents(); - + GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); gtk_tree_selection_unselect_all( selection ); - + + wxDataViewItem last_parent; + size_t i; for (i = 0; i < sel.GetCount(); i++) { + wxDataViewItem item = sel[i]; + wxDataViewItem parent = GetModel()->GetParent( item ); + if (parent) + { + if (parent != last_parent) + ExpandAncestors(item); + } + last_parent = parent; + GtkTreeIter iter; - iter.user_data = (gpointer) sel[i].GetID(); + iter.stamp = m_internal->GetGtkModel()->stamp; + iter.user_data = (gpointer) item.GetID(); gtk_tree_selection_select_iter( selection, &iter ); } - + GtkEnableSelectionEvents(); } void wxDataViewCtrl::Select( const wxDataViewItem & item ) { + ExpandAncestors(item); + GtkDisableSelectionEvents(); GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); GtkTreeIter iter; + iter.stamp = m_internal->GetGtkModel()->stamp; iter.user_data = (gpointer) item.GetID(); gtk_tree_selection_select_iter( selection, &iter ); @@ -3426,6 +4536,7 @@ void wxDataViewCtrl::Unselect( const wxDataViewItem & item ) GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); GtkTreeIter iter; + iter.stamp = m_internal->GetGtkModel()->stamp; iter.user_data = (gpointer) item.GetID(); gtk_tree_selection_unselect_iter( selection, &iter ); @@ -3437,35 +4548,39 @@ bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); GtkTreeIter iter; + iter.stamp = m_internal->GetGtkModel()->stamp; iter.user_data = (gpointer) item.GetID(); - + return gtk_tree_selection_iter_is_selected( selection, &iter ); } void wxDataViewCtrl::SelectAll() { GtkDisableSelectionEvents(); - + GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - + gtk_tree_selection_select_all( selection ); - + GtkEnableSelectionEvents(); } void wxDataViewCtrl::UnselectAll() { GtkDisableSelectionEvents(); - + GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - + gtk_tree_selection_unselect_all( selection ); - + GtkEnableSelectionEvents(); } -void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn *column ) +void wxDataViewCtrl::EnsureVisible(const wxDataViewItem& item, + const wxDataViewColumn *WXUNUSED(column)) { + ExpandAncestors(item); + GtkTreeIter iter; iter.user_data = (gpointer) item.GetID(); GtkTreePath *path = m_internal->get_path( &iter ); @@ -3473,22 +4588,24 @@ void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataVie gtk_tree_path_free( path ); } -void wxDataViewCtrl::HitTest( const wxPoint &point, - wxDataViewItem &item, wxDataViewColumn *&column ) const +void wxDataViewCtrl::HitTest(const wxPoint& WXUNUSED(point), + wxDataViewItem& item, + wxDataViewColumn *& column) const { item = wxDataViewItem(0); column = NULL; } -wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem &item, - const wxDataViewColumn *column ) const +wxRect +wxDataViewCtrl::GetItemRect(const wxDataViewItem& WXUNUSED(item), + const wxDataViewColumn *WXUNUSED(column)) const { return wxRect(); } void wxDataViewCtrl::DoSetExpanderColumn() { - gtk_tree_view_set_expander_column( GTK_TREE_VIEW(m_treeview), + gtk_tree_view_set_expander_column( GTK_TREE_VIEW(m_treeview), GTK_TREE_VIEW_COLUMN( GetExpanderColumn()->GetGtkHandle() ) ); }