X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd7cef4a056b655eb8ecc1d1b760b33bb18f1ea6..bbd55ff9564dcaf1a5d2ee93d789c4d656baabef:/src/gtk/dataview.cpp diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 2d31f41a6a..8389e4dc68 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -20,10 +20,7 @@ #include "wx/log.h" #include "wx/dcclient.h" #include "wx/sizer.h" - #include "wx/icon.h" - #include "wx/list.h" #include "wx/settings.h" - #include "wx/dataobj.h" #include "wx/crt.h" #endif @@ -36,12 +33,13 @@ #include "wx/gtk/dc.h" #include "wx/gtk/dcclient.h" +#include "wx/gtk/private/gdkconv.h" +using namespace wxGTKImpl; + //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -class wxDataViewCtrlInternal; - -wxDataViewCtrlInternal *g_internal = NULL; +static wxDataViewCtrlInternal *gs_internal = NULL; class wxGtkTreeModelNode; @@ -56,7 +54,7 @@ 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 *gtk_model ); @@ -74,6 +72,10 @@ public: gboolean iter_parent( GtkTreeIter *iter, GtkTreeIter *child ); // 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, @@ -93,10 +95,10 @@ public: // 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; } @@ -105,9 +107,13 @@ public: // 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; } + // item can be deleted already in the model + int GetIndexOf( const wxDataViewItem &parent, const wxDataViewItem &item ); + protected: void InitTree(); wxGtkTreeModelNode *FindNode( const wxDataViewItem &item ); @@ -124,6 +130,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; }; @@ -131,10 +145,11 @@ 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; } @@ -146,7 +161,7 @@ class wxGtkTreeModelNode { public: wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item, - wxDataViewCtrlInternal *internal ) + wxDataViewCtrlInternal *internal ) { m_parent = parent; m_item = item; @@ -155,7 +170,7 @@ public: ~wxGtkTreeModelNode() { - size_t count = m_children.GetCount(); + size_t count = m_nodes.GetCount(); size_t i; for (i = 0; i < count; i++) { @@ -174,7 +189,7 @@ public: 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 ); } @@ -188,7 +203,7 @@ public: 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 ); } @@ -212,7 +227,6 @@ public: break; } } - } wxGtkTreeModelNode* GetParent() @@ -222,8 +236,8 @@ public: 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; } @@ -319,7 +333,7 @@ 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); + GtkSortType *order); static void wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable, gint sort_column_id, GtkSortType order); @@ -347,7 +361,7 @@ static gboolean wxgtk_tree_model_drag_data_received (GtkTreeDragDest *d GtkSelectionData *selection_data); static gboolean wxgtk_tree_model_row_drop_possible (GtkTreeDragDest *drag_dest, GtkTreePath *dest_path, - GtkSelectionData *selection_data); + GtkSelectionData *selection_data); static GObjectClass *list_parent_class = NULL; @@ -531,8 +545,8 @@ wxgtk_tree_model_get_column_type (GtkTreeModel *tree_model, gtype = G_TYPE_STRING; else { - gtype = G_TYPE_STRING; - // wxFAIL_MSG( _T("non-string columns not supported yet") ); + gtype = G_TYPE_POINTER; + // wxFAIL_MSG( wxT("non-string columns not supported for searching yet") ); } return gtype; @@ -583,7 +597,7 @@ wxgtk_tree_model_get_value (GtkTreeModel *tree_model, } else { - wxFAIL_MSG( _T("non-string columns not supported yet") ); + wxFAIL_MSG( wxT("non-string columns not supported yet") ); } } @@ -593,8 +607,8 @@ wxgtk_tree_model_iter_next (GtkTreeModel *tree_model, { GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; - if (wxtree_model->stamp != iter->stamp) - wxPrintf( "crash\n" ); + // This happens when clearing the view by calling .._set_model( NULL ); + if (iter->stamp == 0) return FALSE; g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE); @@ -609,7 +623,10 @@ wxgtk_tree_model_iter_children (GtkTreeModel *tree_model, { GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - g_return_val_if_fail (wxtree_model->stamp == parent->stamp, FALSE); + if (parent) + { + g_return_val_if_fail (wxtree_model->stamp == parent->stamp, FALSE); + } return wxtree_model->internal->iter_children( iter, parent ); } @@ -630,8 +647,8 @@ wxgtk_tree_model_iter_n_children (GtkTreeModel *tree_model, GtkTreeIter *iter) { 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); + g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), 0); + g_return_val_if_fail ( !iter || wxtree_model->stamp == iter->stamp, 0); return wxtree_model->internal->iter_n_children( iter ); } @@ -721,7 +738,7 @@ wxgtk_tree_model_drag_data_received (GtkTreeDragDest *drag_dest, static gboolean wxgtk_tree_model_row_drop_possible (GtkTreeDragDest *drag_dest, GtkTreePath *dest_path, - GtkSelectionData *selection_data) + GtkSelectionData *selection_data) { GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_dest; g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); @@ -797,24 +814,27 @@ wxgtk_tree_model_set_sort_func (GtkTreeSortable *sortable, gint WXUNUSED(sort_column_id), GtkTreeIterCompareFunc func, gpointer WXUNUSED(data), - GtkDestroyNotify WXUNUSED(destroy) ) + 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 WXUNUSED(data), - GtkDestroyNotify WXUNUSED(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 ); @@ -822,7 +842,152 @@ gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable *sortabl } //----------------------------------------------------------------------------- -// 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" { @@ -962,8 +1127,6 @@ 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 *WXUNUSED(event), @@ -975,9 +1138,15 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing( { 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, @@ -990,8 +1159,8 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing( // rect.width -= renderer->xpad * 2; // rect.height -= renderer->ypad * 2; -// wxRect renderrect( rect.x, rect.y, rect.width, rect.height ); - wxRect renderrect( cell_area->x, cell_area->y, cell_area->width, cell_area->height ); +// wxRect renderrect(wxRectFromGDKRect(&rect)); + wxRect renderrect(wxRectFromGDKRect(cell_area)); GtkTreePath *treepath = gtk_tree_path_new_from_string( path ); GtkTreeIter iter; @@ -1062,50 +1231,36 @@ gtk_wx_cell_renderer_render (GtkCellRenderer *renderer, GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer; wxDataViewCustomRenderer *cell = wxrenderer->cell; - cell->window = window; - cell->widget = widget; - cell->background_area = (void*) background_area; - cell->cell_area = (void*) cell_area; - cell->expose_area = (void*) expose_area; - cell->flags = (int) flags; + cell->GTKStashRenderParams(window, widget, + background_area, expose_area, flags); - GdkRectangle rect; - gtk_wx_cell_renderer_get_size (renderer, widget, cell_area, - &rect.x, - &rect.y, - &rect.width, - &rect.height); + wxRect rect(wxRectFromGDKRect(cell_area)); + rect = rect.Deflate(renderer->xpad, renderer->ypad); - rect.x += cell_area->x; - rect.y += cell_area->y; - rect.width -= renderer->xpad * 2; - rect.height -= renderer->ypad * 2; + wxWindowDC* dc = (wxWindowDC*) cell->GetDC(); + wxWindowDCImpl *impl = (wxWindowDCImpl *) dc->GetImpl(); - GdkRectangle dummy; - if (gdk_rectangle_intersect (expose_area, &rect, &dummy)) + // Reinitialize wxWindowDC's GDK window if drawing occurs into a different + // window such as a DnD drop window. + if (window != impl->m_gdkwindow) { - wxRect renderrect( rect.x, rect.y, rect.width, rect.height ); - wxWindowDC* dc = (wxWindowDC*) cell->GetDC(); - wxWindowDCImpl *impl = (wxWindowDCImpl *) dc->GetImpl(); - if (impl->m_gdkwindow == NULL) - { - impl->m_gdkwindow = window; - impl->SetUpDC(); - } - - int state = 0; - if (flags & GTK_CELL_RENDERER_SELECTED) - state |= wxDATAVIEW_CELL_SELECTED; - if (flags & GTK_CELL_RENDERER_PRELIT) - state |= wxDATAVIEW_CELL_PRELIT; - if (flags & GTK_CELL_RENDERER_INSENSITIVE) - state |= wxDATAVIEW_CELL_INSENSITIVE; - if (flags & GTK_CELL_RENDERER_INSENSITIVE) - state |= wxDATAVIEW_CELL_INSENSITIVE; - if (flags & GTK_CELL_RENDERER_FOCUSED) - state |= wxDATAVIEW_CELL_FOCUSED; - cell->Render( renderrect, dc, state ); + impl->Destroy(); + impl->m_gdkwindow = window; + impl->SetUpDC(); } + + int state = 0; + if (flags & GTK_CELL_RENDERER_SELECTED) + state |= wxDATAVIEW_CELL_SELECTED; + if (flags & GTK_CELL_RENDERER_PRELIT) + state |= wxDATAVIEW_CELL_PRELIT; + if (flags & GTK_CELL_RENDERER_INSENSITIVE) + state |= wxDATAVIEW_CELL_INSENSITIVE; + if (flags & GTK_CELL_RENDERER_INSENSITIVE) + state |= wxDATAVIEW_CELL_INSENSITIVE; + if (flags & GTK_CELL_RENDERER_FOCUSED) + state |= wxDATAVIEW_CELL_FOCUSED; + cell->WXCallRender( rect, dc, state ); } static gboolean @@ -1133,7 +1288,7 @@ gtk_wx_cell_renderer_activate( rect.width -= renderer->xpad * 2; rect.height -= renderer->ypad * 2; - wxRect renderrect( rect.x, rect.y, rect.width, rect.height ); + wxRect renderrect(wxRectFromGDKRect(&rect)); wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel(); @@ -1172,12 +1327,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; @@ -1251,12 +1400,26 @@ bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) { +#if 0 + // using _get_path for a deleted item cannot be + // a good idea GtkTreeIter iter; iter.stamp = m_wxgtk_model->stamp; iter.user_data = (gpointer) item.GetID(); - GtkTreePath *path = wxgtk_tree_model_get_path( GTK_TREE_MODEL(m_wxgtk_model), &iter ); +#else + // so get the path from the parent + GtkTreeIter iter; + iter.stamp = m_wxgtk_model->stamp; + iter.user_data = (gpointer) parent.GetID(); + GtkTreePath *path = wxgtk_tree_model_get_path( + GTK_TREE_MODEL(m_wxgtk_model), &iter ); + // and add the final index ourselves + int index = m_owner->GtkGetInternal()->GetIndexOf( parent, item ); + gtk_tree_path_append_index( path, index ); +#endif + gtk_tree_model_row_deleted( GTK_TREE_MODEL(m_wxgtk_model), path ); gtk_tree_path_free (path); @@ -1330,16 +1493,9 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig bool wxGtkDataViewModelNotifier::Cleared() { - 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; + return true; } // --------------------------------------------------------- @@ -1366,6 +1522,9 @@ 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() ); @@ -1399,17 +1558,25 @@ wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewC { m_renderer = NULL; + // we haven't changed them yet + m_usingDefaultAttrs = true; + // NOTE: SetMode() and SetAlignment() needs to be called in the renderer's ctor, // after the m_renderer pointer has been initialized } +void wxDataViewRenderer::GtkPackIntoColumn(GtkTreeViewColumn *column) +{ + gtk_tree_view_column_pack_end( column, m_renderer, TRUE /* expand */); +} + void wxDataViewRenderer::GtkInitHandlers() { if (!gtk_check_version(2,6,0)) { g_signal_connect (GTK_CELL_RENDERER(m_renderer), "editing_started", - G_CALLBACK (wxgtk_renderer_editing_started), - this); + G_CALLBACK (wxgtk_renderer_editing_started), + this); } } @@ -1474,8 +1641,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; @@ -1505,81 +1685,210 @@ void wxDataViewRenderer::SetAlignment( int align ) g_value_unset( &gvalue2 ); } +void wxDataViewRenderer::SetAlignment( int align ) +{ + m_alignment = align; + GtkUpdateAlignment(); +} + int wxDataViewRenderer::GetAlignment() const { - int ret = 0; - GValue gvalue; + return m_alignment; +} - // horizontal alignment: +void wxDataViewRenderer::EnableEllipsize(wxEllipsizeMode mode) +{ +#ifdef __WXGTK26__ + if ( gtk_check_version(2, 6, 0) != NULL ) + return; - 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; + GtkCellRendererText * const rend = GtkGetTextRenderer(); + if ( !rend ) + return; + + // we use the same values in wxEllipsizeMode as PangoEllipsizeMode so we + // can just cast between them + GValue gvalue = { 0, }; + g_value_init( &gvalue, PANGO_TYPE_ELLIPSIZE_MODE ); + g_value_set_enum( &gvalue, static_cast(mode) ); + g_object_set_property( G_OBJECT(rend), "ellipsize", &gvalue ); g_value_unset( &gvalue ); +#else // GTK < 2.6 + wxUnusedVar(mode); +#endif // GTK 2.6/before +} +wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const +{ +#ifdef __WXGTK26__ + if ( gtk_check_version(2, 6, 0) != NULL ) + return wxELLIPSIZE_NONE; - // vertical alignment: + GtkCellRendererText * const rend = GtkGetTextRenderer(); + if ( !rend ) + return wxELLIPSIZE_NONE; - 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; + GValue gvalue = { 0, }; + g_value_init( &gvalue, PANGO_TYPE_ELLIPSIZE_MODE ); + g_object_get_property( G_OBJECT(rend), "ellipsize", &gvalue ); + wxEllipsizeMode + mode = static_cast(g_value_get_enum( &gvalue )); g_value_unset( &gvalue ); - return ret; + return mode; +#else // GTK < 2.6 + return wxELLIPSIZE_NONE; +#endif // GTK 2.6/before } +void +wxDataViewRenderer::GtkOnTextEdited(const gchar *itempath, const wxString& str) +{ + wxVariant value(str); + if (!Validate( value )) + return; + GtkTreePath *path = gtk_tree_path_new_from_string( itempath ); + GtkTreeIter iter; + GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, path ); + wxDataViewItem item( (void*) iter.user_data );; + gtk_tree_path_free( path ); + + GtkOnCellChanged(value, item, GetOwner()->GetModelColumn()); +} + +void +wxDataViewRenderer::GtkOnCellChanged(const wxVariant& value, + const wxDataViewItem& item, + unsigned col) +{ + wxDataViewModel *model = GetOwner()->GetOwner()->GetModel(); + model->ChangeValue( value, item, col ); +} // --------------------------------------------------------- // wxDataViewTextRenderer // --------------------------------------------------------- -extern "C" { -static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer, - gchar *arg1, gchar *arg2, gpointer user_data ); -} +extern "C" +{ 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; - if (!cell->Validate( value )) - return; + cell->GtkOnTextEdited(arg1, wxGTK_CONV_BACK_FONT( + arg2, cell->GetOwner()->GetOwner()->GetFont())); +} - wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel(); +} - GtkTreePath *path = gtk_tree_path_new_from_string( arg1 ); - GtkTreeIter iter; - cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, path ); - wxDataViewItem item( (void*) iter.user_data );; - gtk_tree_path_free( path ); +namespace +{ - unsigned int model_col = cell->GetOwner()->GetModelColumn(); +// helper function used by wxDataViewTextRenderer and +// wxDataViewCustomRenderer::RenderText(): it applies the attributes to the +// given text renderer and returns true if anything was done +bool GtkApplyAttr(GtkCellRendererText *renderer, const wxDataViewItemAttr& attr) +{ + bool usingDefaultAttrs = true; + if (attr.HasColour()) + { + const GdkColor * const gcol = attr.GetColour().GetColor(); + + GValue gvalue = { 0, }; + g_value_init( &gvalue, GDK_TYPE_COLOR ); + g_value_set_boxed( &gvalue, gcol ); + g_object_set_property( G_OBJECT(renderer), "foreground_gdk", &gvalue ); + g_value_unset( &gvalue ); + + usingDefaultAttrs = false; + } + else + { + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_BOOLEAN ); + g_value_set_boolean( &gvalue, FALSE ); + g_object_set_property( G_OBJECT(renderer), "foreground-set", &gvalue ); + g_value_unset( &gvalue ); + } + + if (attr.GetItalic()) + { + GValue gvalue = { 0, }; + g_value_init( &gvalue, PANGO_TYPE_STYLE ); + g_value_set_enum( &gvalue, PANGO_STYLE_ITALIC ); + g_object_set_property( G_OBJECT(renderer), "style", &gvalue ); + g_value_unset( &gvalue ); + + usingDefaultAttrs = false; + } + else + { + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_BOOLEAN ); + g_value_set_boolean( &gvalue, FALSE ); + g_object_set_property( G_OBJECT(renderer), "style-set", &gvalue ); + g_value_unset( &gvalue ); + } + + + if (attr.GetBold()) + { + GValue gvalue = { 0, }; + g_value_init( &gvalue, PANGO_TYPE_WEIGHT ); + g_value_set_enum( &gvalue, PANGO_WEIGHT_BOLD ); + g_object_set_property( G_OBJECT(renderer), "weight", &gvalue ); + g_value_unset( &gvalue ); + + usingDefaultAttrs = false; + } + else + { + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_BOOLEAN ); + g_value_set_boolean( &gvalue, FALSE ); + g_object_set_property( G_OBJECT(renderer), "weight-set", &gvalue ); + g_value_unset( &gvalue ); + } + +#if 0 + if (attr.HasBackgroundColour()) + { + wxColour colour = attr.GetBackgroundColour(); + const GdkColor * const gcol = colour.GetColor(); + + GValue gvalue = { 0, }; + g_value_init( &gvalue, GDK_TYPE_COLOR ); + g_value_set_boxed( &gvalue, gcol ); + g_object_set_property( G_OBJECT(renderer), "cell-background_gdk", &gvalue ); + g_value_unset( &gvalue ); + } + else + { + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_BOOLEAN ); + g_value_set_boolean( &gvalue, FALSE ); + g_object_set_property( G_OBJECT(renderer), "cell-background-set", &gvalue ); + g_value_unset( &gvalue ); + } +#endif - model->SetValue( value, item, model_col ); - model->ValueChanged( item, model_col ); + return !usingDefaultAttrs; } +} // anonymous namespace + IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer) wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode, 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) { @@ -1598,29 +1907,25 @@ wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxD SetAlignment(align); } -bool wxDataViewTextRenderer::SetValue( const wxVariant &value ) +bool wxDataViewTextRenderer::SetTextValue(const wxString& str) { - wxString tmp = value; - GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_STRING ); - g_value_set_string( &gvalue, wxGTK_CONV_FONT( tmp, GetOwner()->GetOwner()->GetFont() ) ); + g_value_set_string( &gvalue, wxGTK_CONV_FONT( str, GetOwner()->GetOwner()->GetFont() ) ); g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); g_value_unset( &gvalue ); return true; } -bool wxDataViewTextRenderer::GetValue( wxVariant &value ) const +bool wxDataViewTextRenderer::GetTextValue(wxString& str) const { GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_STRING ); g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue ); - wxString tmp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ), wx_const_cast(wxDataViewTextRenderer*, this)->GetOwner()->GetOwner()->GetFont() ); + str = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ), const_cast(this)->GetOwner()->GetOwner()->GetFont() ); g_value_unset( &gvalue ); - value = tmp; - return true; } @@ -1645,29 +1950,42 @@ void wxDataViewTextRenderer::SetAlignment( int align ) g_value_unset( &gvalue ); } -// --------------------------------------------------------- -// wxDataViewTextRendererAttr -// --------------------------------------------------------- - -IMPLEMENT_CLASS(wxDataViewTextRendererAttr,wxDataViewTextRenderer) +bool wxDataViewTextRenderer::GtkSetAttr(const wxDataViewItemAttr& attr) +{ + return GtkApplyAttr(GtkGetTextRenderer(), attr); +} -wxDataViewTextRendererAttr::wxDataViewTextRendererAttr( const wxString &varianttype, - wxDataViewCellMode mode, int align ) : - wxDataViewTextRenderer( varianttype, mode, align ) +GtkCellRendererText *wxDataViewTextRenderer::GtkGetTextRenderer() const { + return GTK_CELL_RENDERER_TEXT(m_renderer); } // --------------------------------------------------------- // wxDataViewBitmapRenderer // --------------------------------------------------------- +namespace +{ + +// set "pixbuf" property on the given renderer +void SetPixbufProp(GtkCellRenderer *renderer, GdkPixbuf *pixbuf) +{ + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_OBJECT ); + g_value_set_object( &gvalue, pixbuf ); + g_object_set_property( G_OBJECT(renderer), "pixbuf", &gvalue ); + g_value_unset( &gvalue ); +} + +} // anonymous namespace + IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer) wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode, int align ) : wxDataViewRenderer( varianttype, mode, align ) { - m_renderer = (GtkCellRenderer*) gtk_cell_renderer_pixbuf_new(); + m_renderer = gtk_cell_renderer_pixbuf_new(); SetMode(mode); SetAlignment(align); @@ -1680,38 +1998,23 @@ bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value ) wxBitmap bitmap; bitmap << value; - // This may create a Pixbuf representation in the - // wxBitmap object (and it will stay there) - GdkPixbuf *pixbuf = bitmap.GetPixbuf(); - - GValue gvalue = { 0, }; - g_value_init( &gvalue, G_TYPE_OBJECT ); - g_value_set_object( &gvalue, pixbuf ); - g_object_set_property( G_OBJECT(m_renderer), "pixbuf", &gvalue ); - g_value_unset( &gvalue ); - - return true; + // GetPixbuf() may create a Pixbuf representation in the wxBitmap + // object (and it will stay there and remain owned by wxBitmap) + SetPixbufProp(m_renderer, bitmap.GetPixbuf()); } - - if (value.GetType() == wxT("wxIcon")) + else if (value.GetType() == wxT("wxIcon")) { - wxIcon bitmap; - bitmap << value; - - // This may create a Pixbuf representation in the - // wxBitmap object (and it will stay there) - GdkPixbuf *pixbuf = bitmap.GetPixbuf(); - - GValue gvalue = { 0, }; - g_value_init( &gvalue, G_TYPE_OBJECT ); - g_value_set_object( &gvalue, pixbuf ); - g_object_set_property( G_OBJECT(m_renderer), "pixbuf", &gvalue ); - g_value_unset( &gvalue ); + wxIcon icon; + icon << value; - return true; + SetPixbufProp(m_renderer, icon.GetPixbuf()); + } + else + { + return false; } - return false; + return true; } bool wxDataViewBitmapRenderer::GetValue( wxVariant &WXUNUSED(value) ) const @@ -1756,8 +2059,7 @@ static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer, unsigned int model_col = cell->GetOwner()->GetModelColumn(); - model->SetValue( value, item, model_col ); - model->ValueChanged( item, model_col ); + model->ChangeValue( value, item, model_col ); } IMPLEMENT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer) @@ -1828,7 +2130,7 @@ public: 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 ); @@ -1855,9 +2157,10 @@ public: IMPLEMENT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer) wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, - wxDataViewCellMode mode, int align, - bool no_init ) : - wxDataViewRenderer( varianttype, mode, align ) + wxDataViewCellMode mode, + int align, + bool no_init ) + : wxDataViewCustomRendererBase( varianttype, mode, align ) { m_dc = NULL; m_text_renderer = NULL; @@ -1868,40 +2171,47 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, Init(mode, align); } -void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, - wxRect WXUNUSED(cell), wxDC *WXUNUSED(dc), int WXUNUSED(state) ) +GtkCellRendererText *wxDataViewCustomRenderer::GtkGetTextRenderer() const { -#if 0 - wxDataViewCtrl *view = GetOwner()->GetOwner(); - wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ? - wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) : - view->GetForegroundColour(); - dc->SetTextForeground(col); - dc->DrawText( text, cell.x + xoffset, cell.y + ((cell.height - dc->GetCharHeight()) / 2)); -#else - if (!m_text_renderer) - m_text_renderer = gtk_cell_renderer_text_new(); + if ( !m_text_renderer ) + { + // we create it on demand so need to do it even from a const function + const_cast(this)-> + m_text_renderer = GTK_CELL_RENDERER_TEXT(gtk_cell_renderer_text_new()); + } + + return m_text_renderer; +} + +void wxDataViewCustomRenderer::RenderText( const wxString &text, + int xoffset, + wxRect cell, + wxDC *WXUNUSED(dc), + int WXUNUSED(state) ) +{ + + GtkCellRendererText * const textRenderer = GtkGetTextRenderer(); GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_STRING ); g_value_set_string( &gvalue, wxGTK_CONV_FONT( text, GetOwner()->GetOwner()->GetFont() ) ); - g_object_set_property( G_OBJECT(m_text_renderer), "text", &gvalue ); + g_object_set_property( G_OBJECT(textRenderer), "text", &gvalue ); g_value_unset( &gvalue ); - ((GdkRectangle*) cell_area)->x += xoffset; - ((GdkRectangle*) cell_area)->width -= xoffset; + GtkApplyAttr(textRenderer, GetAttr()); - gtk_cell_renderer_render( m_text_renderer, - window, - widget, - (GdkRectangle*) background_area, - (GdkRectangle*) cell_area, - (GdkRectangle*) expose_area, - (GtkCellRendererState) flags ); + GdkRectangle cell_area; + wxRectToGDKRect(cell, cell_area); + cell_area.x += xoffset; + cell_area.width -= xoffset; - ((GdkRectangle*) cell_area)->x -= xoffset; - ((GdkRectangle*) cell_area)->width += xoffset; -#endif + gtk_cell_renderer_render( GTK_CELL_RENDERER(textRenderer), + m_renderParams.window, + m_renderParams.widget, + m_renderParams.background_area, + &cell_area, + m_renderParams.expose_area, + (GtkCellRendererState) m_renderParams.flags ); } bool wxDataViewCustomRenderer::Init(wxDataViewCellMode mode, int align) @@ -2032,6 +2342,170 @@ 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), + 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 ); +} + +// ---------------------------------------------------------------------------- +// wxDataViewChoiceByIndexRenderer +// ---------------------------------------------------------------------------- + +wxDataViewChoiceByIndexRenderer::wxDataViewChoiceByIndexRenderer( const wxArrayString &choices, + wxDataViewCellMode mode, int alignment ) : + wxDataViewChoiceRenderer( choices, mode, alignment ) +{ +} + +void wxDataViewChoiceByIndexRenderer::GtkOnTextEdited(const gchar *itempath, const wxString& str) +{ + wxVariant value( (long) GetChoices().Index( str ) ); + + if (!Validate( value )) + return; + + GtkTreePath *path = gtk_tree_path_new_from_string( itempath ); + GtkTreeIter iter; + GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, path ); + wxDataViewItem item( (void*) iter.user_data );; + gtk_tree_path_free( path ); + + GtkOnCellChanged(value, item, GetOwner()->GetModelColumn()); +} + +bool wxDataViewChoiceByIndexRenderer::SetValue( const wxVariant &value ) +{ + wxVariant string_value = GetChoice( value.GetLong() ); + return wxDataViewChoiceRenderer::SetValue( string_value ); +} + +bool wxDataViewChoiceByIndexRenderer::GetValue( wxVariant &value ) const +{ + wxVariant string_value; + if (!wxDataViewChoiceRenderer::GetValue( string_value )) + return false; + + value = (long) GetChoices().Index( string_value.GetString() ); + return true; +} + // --------------------------------------------------------- // wxDataViewDateRenderer // --------------------------------------------------------- @@ -2074,10 +2548,7 @@ END_EVENT_TABLE() void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event ) { - wxDateTime date = event.GetDate(); - wxVariant value = date; - m_model->SetValue( value, m_item, m_col ); - m_model->ValueChanged( m_item, m_col ); + m_model->ChangeValue( event.GetDate(), m_item, m_col ); DismissAndNotify(); } @@ -2143,67 +2614,63 @@ bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *m IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer) -wxDataViewIconTextRenderer::wxDataViewIconTextRenderer( - const wxString &varianttype, wxDataViewCellMode mode, int align ) : - wxDataViewCustomRenderer( varianttype, mode, align ) +wxDataViewIconTextRenderer::wxDataViewIconTextRenderer + ( + const wxString &varianttype, + wxDataViewCellMode mode, + int align + ) + : wxDataViewTextRenderer(varianttype, mode, align) { - SetMode(mode); - SetAlignment(align); + m_rendererIcon = gtk_cell_renderer_pixbuf_new(); } wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer() { } -bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value ) +void wxDataViewIconTextRenderer::GtkPackIntoColumn(GtkTreeViewColumn *column) { - m_value << value; - return true; -} + // add the icon renderer first + gtk_tree_view_column_pack_start(column, m_rendererIcon, FALSE /* !expand */); -bool wxDataViewIconTextRenderer::GetValue( wxVariant &WXUNUSED(value) ) const -{ - return false; + // add the text renderer too + wxDataViewRenderer::GtkPackIntoColumn(column); } -bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state ) +bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value ) { - const wxIcon &icon = m_value.GetIcon(); - int offset = 0; - if (icon.IsOk()) - { - int yoffset = wxMax( 0, (cell.height - icon.GetHeight()) / 2 ); - dc->DrawIcon( icon, cell.x, cell.y + yoffset ); - offset = icon.GetWidth() + 4; - } + m_value << value; - RenderText( m_value.GetText(), offset, cell, dc, state ); + SetTextValue(m_value.GetText()); + SetPixbufProp(m_rendererIcon, m_value.GetIcon().GetPixbuf()); return true; } -wxSize wxDataViewIconTextRenderer::GetSize() const +bool wxDataViewIconTextRenderer::GetValue(wxVariant& value) const { - wxSize size; - if (m_value.GetIcon().IsOk()) - size.x = 4 + m_value.GetIcon().GetWidth(); - wxCoord x,y,d; - GetView()->GetTextExtent( m_value.GetText(), &x, &y, &d ); - size.x += x; - size.y = y+d; - return size; -} + wxString str; + if ( !GetTextValue(str) ) + return false; -wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl( - wxWindow *WXUNUSED(parent), wxRect WXUNUSED(labelRect), const wxVariant &WXUNUSED(value) ) -{ - return NULL; + // user doesn't have any way to edit the icon so leave it unchanged + value << wxDataViewIconText(str, m_value.GetIcon()); + + return true; } -bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( - wxControl* WXUNUSED(editor), wxVariant &WXUNUSED(value) ) +void +wxDataViewIconTextRenderer::GtkOnCellChanged(const wxVariant& value, + const wxDataViewItem& item, + unsigned col) { - return false; + // we receive just the text part of our value as it's the only one which + // can be edited, but we need the full wxDataViewIconText value for the + // model + wxVariant valueIconText; + valueIconText << wxDataViewIconText(value.GetString(), m_value.GetIcon()); + wxDataViewTextRenderer::GtkOnCellChanged(valueIconText, item, col); } // --------------------------------------------------------- @@ -2244,14 +2711,8 @@ gtk_dataview_header_button_press_callback( GtkWidget *WXUNUSED(widget), return FALSE; } -extern "C" { -static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, - GtkCellRenderer *cell, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data ); -} - +extern "C" +{ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column), GtkCellRenderer *renderer, @@ -2268,170 +2729,78 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column), wxDataViewModel *wx_model = tree_model->internal->GetDataViewModel(); - if (!wx_model->IsIndexListModel()) - { - - if (wx_model->IsContainer( item )) + if (!wx_model->IsVirtualListModel()) { - if (wx_model->HasContainerColumns( item ) || (cell->GetOwner()->GetModelColumn() == 0)) + gboolean visible; + if (wx_model->IsContainer( item )) { - GValue gvalue = { 0, }; - g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_value_set_boolean( &gvalue, TRUE ); - g_object_set_property( G_OBJECT(renderer), "visible", &gvalue ); - g_value_unset( &gvalue ); + visible = wx_model->HasContainerColumns( item ) || + (cell->GetOwner()->GetModelColumn() == 0); } else { - GValue gvalue = { 0, }; - g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_value_set_boolean( &gvalue, FALSE ); - g_object_set_property( G_OBJECT(renderer), "visible", &gvalue ); - g_value_unset( &gvalue ); - - return; + visible = true; } - } - else - { + GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_value_set_boolean( &gvalue, TRUE ); + g_value_set_boolean( &gvalue, visible ); g_object_set_property( G_OBJECT(renderer), "visible", &gvalue ); g_value_unset( &gvalue ); - } + if ( !visible ) + return; } wxVariant value; wx_model->GetValue( value, item, cell->GetOwner()->GetModelColumn() ); if (value.GetType() != cell->GetVariantType()) + { wxLogError( wxT("Wrong type, required: %s but: %s"), value.GetType().c_str(), cell->GetVariantType().c_str() ); - - cell->SetValue( value ); - - 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(); - const GdkColor * const gcol = colour.GetColor(); - - GValue gvalue = { 0, }; - g_value_init( &gvalue, GDK_TYPE_COLOR ); - g_value_set_boxed( &gvalue, gcol ); - g_object_set_property( G_OBJECT(renderer), "cell-background_gdk", &gvalue ); - g_value_unset( &gvalue ); - } - else - { - GValue gvalue = { 0, }; - g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_value_set_boolean( &gvalue, FALSE ); - g_object_set_property( G_OBJECT(renderer), "cell-background-set", &gvalue ); - g_value_unset( &gvalue ); - } -#endif + cell->SetValue( value ); + + // deal with attributes: if the renderer doesn't support them at all, we + // don't even need to query the model for them + if ( !cell->GtkSupportsAttrs() ) + return; + + // it can support attributes so check if this item has any + wxDataViewItemAttr attr; + if ( wx_model->GetAttr( item, cell->GetOwner()->GetModelColumn(), attr ) + || !cell->GtkIsUsingDefaultAttrs() ) + { + bool usingDefaultAttrs = !cell->GtkSetAttr(attr); + cell->GtkSetUsingDefaultAttrs(usingDefaultAttrs); + } + // else: no custom attributes specified and we're already using the default + // ones -- nothing to do } -IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase) +} // extern "C" #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 ); @@ -2442,7 +2811,6 @@ void wxDataViewColumn::Init(wxAlignment align, int flags, int width) { m_isConnected = false; - GtkCellRenderer *renderer = (GtkCellRenderer *) GetRenderer()->GetGtkHandle(); GtkTreeViewColumn *column = gtk_tree_view_column_new(); m_column = (GtkWidget*) column; @@ -2451,21 +2819,30 @@ void wxDataViewColumn::Init(wxAlignment align, int flags, int width) SetWidth( width ); - gtk_tree_view_column_pack_end( column, renderer, TRUE ); + // 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_set_cell_data_func( column, renderer, - wxGtkTreeCellDataFunc, (gpointer) GetRenderer(), NULL ); -} + wxDataViewRenderer * const colRenderer = GetRenderer(); + GtkCellRenderer * const cellRenderer = colRenderer->GetGtkHandle(); -wxDataViewColumn::~wxDataViewColumn() -{ + colRenderer->GtkPackIntoColumn(column); + + gtk_tree_view_column_set_cell_data_func( column, cellRenderer, + wxGtkTreeCellDataFunc, (gpointer) colRenderer, NULL ); } void wxDataViewColumn::OnInternalIdle() { if (m_isConnected) return; - + if (GTK_WIDGET_REALIZED(GetOwner()->m_treeview)) { GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); @@ -2474,6 +2851,9 @@ void wxDataViewColumn::OnInternalIdle() g_signal_connect(column->button, "button_press_event", G_CALLBACK (gtk_dataview_header_button_press_callback), this); + // otherwise the event will be blocked by GTK+ + gtk_tree_view_column_set_clickable( column, TRUE ); + m_isConnected = true; } } @@ -2490,41 +2870,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(); @@ -2538,13 +2909,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 ); } } @@ -2570,6 +2939,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 @@ -2588,7 +2960,7 @@ 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() ); } @@ -2596,13 +2968,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 @@ -2655,7 +3042,16 @@ void wxDataViewColumn::SetWidth( int 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 { @@ -2679,6 +3075,36 @@ bool wxDataViewColumn::IsReorderable() const // 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(); @@ -2697,13 +3123,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 - g_internal = m_internal; - m_children.Sort( &wxGtkTreeModelChildCmp ); + // 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 - gint *new_order = new gint[child_count]; +#if 0 + // Too slow + + wxGtkTreeModelChildren temp; + WX_APPEND_ARRAY( temp, m_children ); + + gs_internal = m_internal; + m_children.Sort( &wxGtkTreeModelChildCmp ); unsigned int pos; for (pos = 0; pos < child_count; pos++) @@ -2712,6 +3192,7 @@ 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() ); @@ -2727,6 +3208,7 @@ void wxGtkTreeModelNode::Resort() delete [] new_order; + unsigned int pos; for (pos = 0; pos < node_count; pos++) { wxGtkTreeModelNode *node = m_nodes.Item( pos ); @@ -2749,13 +3231,19 @@ wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, m_sort_column = -1; m_dataview_sort_column = NULL; - if (!m_wx_model->IsIndexListModel()) + 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() @@ -2789,15 +3277,62 @@ void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node ) // 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 ); - return m_wx_model->IsDraggable( item ); + 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 @@ -2812,71 +3347,110 @@ gboolean wxDataViewCtrlInternal::drag_data_get( GtkTreeDragSource *WXUNUSED(drag { GtkTreeIter iter; if (!get_iter( &iter, path )) return FALSE; - wxDataViewItem item( (void*) iter.user_data ); - wxDataFormat format( selection_data->target ); + if (!m_dragDataObject->IsSupported( selection_data->target )) + return FALSE; - size_t size = m_wx_model->GetDragDataSize( item, format ); - if (size == 0) return FALSE; + size_t size = m_dragDataObject->GetDataSize( selection_data->target ); + if (size == 0) + return FALSE; - void *data = malloc( size ); + void *buf = malloc( size ); - m_wx_model->GetDragData( item, format, data, 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*) data, size ); + gtk_selection_data_set( selection_data, selection_data->target, + 8, (const guchar*) buf, size ); + } - free( data ); + free( buf ); - return TRUE; + return res; } gboolean wxDataViewCtrlInternal::drag_data_received(GtkTreeDragDest *WXUNUSED(drag_dest), - GtkTreePath *WXUNUSED(dest), - GtkSelectionData *WXUNUSED(selection_data)) + GtkTreePath *path, + GtkSelectionData *selection_data) { - return FALSE; + 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 *WXUNUSED(dest_path), - GtkSelectionData *WXUNUSED(selection_data)) + GtkTreePath *path, + GtkSelectionData *selection_data) { - return FALSE; + 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() { + GtkWidget* tree_widget = GetOwner()->GtkGetTreeView(); + gtk_tree_view_set_model( GTK_TREE_VIEW(tree_widget), NULL ); + gtk_tree_view_set_model( GTK_TREE_VIEW(tree_widget), GTK_TREE_MODEL(m_gtk_model) ); + if (m_root) { delete m_root; InitTree(); } - // 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() { - if (!m_wx_model->IsIndexListModel()) + if (!m_wx_model->IsVirtualListModel()) m_root->Resort(); } bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) { - if (!m_wx_model->IsIndexListModel()) + 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 @@ -2888,9 +3462,12 @@ bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDa bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) { - if (!m_wx_model->IsIndexListModel()) + 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() ); } @@ -2925,26 +3502,32 @@ bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned GtkTreeModelFlags wxDataViewCtrlInternal::get_flags() { - if (m_wx_model->IsIndexListModel()) - return GTK_TREE_MODEL_LIST_ONLY; - else - return GTK_TREE_MODEL_ITERS_PERSIST; + int flags = 0; + + if ( m_wx_model->IsListModel() ) + flags |= GTK_TREE_MODEL_LIST_ONLY; + + if ( !m_wx_model->IsVirtualListModel() ) + flags |= GTK_TREE_MODEL_ITERS_PERSIST; + + return GtkTreeModelFlags(flags); } gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path ) { - if (m_wx_model->IsIndexListModel()) + + if (m_wx_model->IsVirtualListModel()) { - wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model; + wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model; unsigned int i = (unsigned int)gtk_tree_path_get_indices (path)[0]; - if (i >= wx_model->GetLastIndex() + 1) + if (i >= wx_model->GetCount()) return FALSE; iter->stamp = m_gtk_model->stamp; - // user_data is just the index - iter->user_data = (gpointer) i; + // user_data is just the index +1 + iter->user_data = (gpointer) (i+1); return TRUE; } @@ -2991,12 +3574,19 @@ gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter ) { + // When this is called from ItemDeleted(), the item is already + // deleted in the model. + GtkTreePath *retval = gtk_tree_path_new (); - if (m_wx_model->IsIndexListModel()) + if (m_wx_model->IsVirtualListModel()) { - // user_data is just the index - int i = (wxUIntPtr) iter->user_data; + // iter is root, add nothing + if (!iter->user_data) + return retval; + + // user_data is just the index +1 + int i = ( (wxUIntPtr) iter->user_data ) -1; gtk_tree_path_append_index (retval, i); } else @@ -3020,32 +3610,45 @@ GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter ) gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter ) { - if (m_wx_model->IsIndexListModel()) + if (m_wx_model->IsVirtualListModel()) { - wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model; + wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model; - int n = (wxUIntPtr) iter->user_data; + // user_data is just the index +1 + int n = ( (wxUIntPtr) iter->user_data ) -1; if (n == -1) + { + iter->user_data = NULL; return FALSE; + } - if (n >= (int) wx_model->GetLastIndex()) + if (n >= (int) wx_model->GetCount()-1) + { + iter->user_data = NULL; return FALSE; + } - iter->user_data = (gpointer) ++n; + // user_data is just the index +1 (+2 because we need the next) + iter->user_data = (gpointer) (n+2); } else { wxGtkTreeModelNode *parent = FindParentNode( iter ); if( parent == NULL ) + { + iter->user_data = NULL; return FALSE; + } int pos = parent->GetChildren().Index( iter->user_data ); if (pos == (int) parent->GetChildCount()-1) + { + iter->user_data = NULL; return FALSE; + } - iter->stamp = m_gtk_model->stamp; iter->user_data = parent->GetChildren().Item( pos+1 ); } @@ -3054,25 +3657,39 @@ gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter ) gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *parent ) { - if (m_wx_model->IsIndexListModel()) + 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; + iter->user_data = (gpointer) 1; return TRUE; } else { - wxDataViewItem item( (void*) parent->user_data ); + if (iter == NULL) + { + if (m_root->GetChildCount() == 0) return FALSE; + iter->stamp = m_gtk_model->stamp; + iter->user_data = (gpointer) m_root->GetChildren().Item( 0 ); + return TRUE; + } + + + wxDataViewItem item; + if (parent) + item = wxDataViewItem( (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) @@ -3087,13 +3704,21 @@ gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter * gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter ) { - if (m_wx_model->IsIndexListModel()) + if (m_wx_model->IsVirtualListModel()) { + wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model; + + if (iter == NULL) + return (wx_model->GetCount() > 0); + // this is a list, nodes have no children return FALSE; } else { + if (iter == NULL) + return (m_root->GetChildCount() > 0); + wxDataViewItem item( (void*) iter->user_data ); bool is_container = m_wx_model->IsContainer( item ); @@ -3102,6 +3727,9 @@ gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter ) 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); @@ -3110,26 +3738,30 @@ gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter ) gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter ) { - if (m_wx_model->IsIndexListModel()) + if (m_wx_model->IsVirtualListModel()) { - wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model; + wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model; if (iter == NULL) - return (gint) wx_model->GetLastIndex() + 1; + return (gint) wx_model->GetCount(); return 0; } else { + if (iter == NULL) + return m_root->GetChildCount(); + wxDataViewItem item( (void*) iter->user_data ); if (!m_wx_model->IsContainer( item )) return 0; wxGtkTreeModelNode *parent_node = FindNode( iter ); - BuildBranch( parent_node ); + wxASSERT_MSG(parent_node, + "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel"); - // wxPrintf( "iter_n_children %d\n", parent_node->GetChildCount() ); + BuildBranch( parent_node ); return parent_node->GetChildCount(); } @@ -3137,9 +3769,9 @@ gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter ) gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n ) { - if (m_wx_model->IsIndexListModel()) + if (m_wx_model->IsVirtualListModel()) { - wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model; + wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model; if (parent) return FALSE; @@ -3147,11 +3779,12 @@ gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter if (n < 0) return FALSE; - if (n >= (gint) wx_model->GetLastIndex() + 1) + if (n >= (gint) wx_model->GetCount()) return FALSE; iter->stamp = m_gtk_model->stamp; - iter->user_data = (gpointer) n; + // user_data is just the index +1 + iter->user_data = (gpointer) (n+1); return TRUE; } @@ -3165,9 +3798,10 @@ gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter return FALSE; wxGtkTreeModelNode *parent_node = FindNode( parent ); - BuildBranch( parent_node ); + wxASSERT_MSG(parent_node, + "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel"); - // wxPrintf( "iter_nth_child %d\n", n ); + BuildBranch( parent_node ); iter->stamp = m_gtk_model->stamp; iter->user_data = parent_node->GetChildren().Item( n ); @@ -3178,7 +3812,7 @@ gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *child ) { - if (m_wx_model->IsIndexListModel()) + if (m_wx_model->IsVirtualListModel()) { return FALSE; } @@ -3195,6 +3829,28 @@ gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *ch } } +// item can be deleted already in the model +int wxDataViewCtrlInternal::GetIndexOf( const wxDataViewItem &parent, const wxDataViewItem &item ) +{ + if (m_wx_model->IsVirtualListModel()) + { + return wxPtrToUInt(item.GetID()) - 1; + } + else + { + wxGtkTreeModelNode *parent_node = FindNode( parent ); + wxGtkTreeModelChildren &children = parent_node->GetChildren(); + size_t j; + for (j = 0; j < children.GetCount(); j++) + { + if (children[j] == item.GetID()) + return j; + } + } + return -1; +} + + static wxGtkTreeModelNode* wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item ) { @@ -3218,7 +3874,7 @@ wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *tr if( node && node->GetNodes().GetCount() != 0 ) { int len = node->GetNodes().GetCount(); - wxGtkTreeModelNodes nodes = node->GetNodes(); + wxGtkTreeModelNodes &nodes = node->GetNodes(); int j = 0; for( ; j < len; j ++) { @@ -3252,12 +3908,15 @@ wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( GtkTreeIter *iter ) 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; } @@ -3269,12 +3928,15 @@ wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( const wxDataViewItem &item 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; } @@ -3439,14 +4101,9 @@ wxdataview_row_collapsed_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* // 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)) @@ -3516,8 +4173,6 @@ gtk_dataview_motion_notify_callback( GtkWidget *WXUNUSED(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 ); } } @@ -3575,6 +4230,8 @@ 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 ); @@ -3586,16 +4243,14 @@ void wxDataViewCtrl::Init() { m_notifier = NULL; m_internal = NULL; -} -static GtkTargetEntry gs_target; + m_cols.DeleteContents( true ); +} bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) { - Init(); - if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator )) { @@ -3603,11 +4258,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); @@ -3615,15 +4269,12 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, g_signal_connect (m_treeview, "size_allocate", G_CALLBACK (gtk_dataviewctrl_size_callback), this); - gs_target.target = const_cast("UTF8_STRING"); - gs_target.flags = 0; - gs_target.info = static_cast(-1); - gtk_tree_view_enable_model_drag_source( GTK_TREE_VIEW(m_treeview), - GDK_BUTTON1_MASK, &gs_target, 1, (GdkDragAction) GDK_ACTION_COPY ); - #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) @@ -3655,7 +4306,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, 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 ); @@ -3703,18 +4354,19 @@ void wxDataViewCtrl::OnInternalIdle() bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) { - if (GetModel()) - { - delete m_internal; - m_internal = NULL; - - delete m_notifier; - m_notifier = NULL; - } + wxDELETE(m_internal); if (!wxDataViewCtrlBase::AssociateModel( model )) return false; +#ifdef __WXGTK26__ + if (!gtk_check_version(2,6,0)) + { + bool fixed = (((GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) == 0) || (model->IsVirtualListModel())); + gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed ); + } +#endif + GtkWxTreeModel *gtk_model = wxgtk_tree_model_new(); m_internal = new wxDataViewCtrlInternal( this, model, gtk_model ); gtk_model->internal = m_internal; @@ -3731,6 +4383,16 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *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)) @@ -3775,6 +4437,28 @@ bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col ) 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(); @@ -3787,7 +4471,7 @@ wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const 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) @@ -3804,9 +4488,7 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview), GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()) ); - m_cols.remove( column ); - - delete column; + m_cols.DeleteObject( column ); return true; } @@ -3814,14 +4496,14 @@ 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_COLUMN(col->GetGtkHandle()) ); } - m_cols.clear(); + m_cols.Clear(); return true; } @@ -3862,6 +4544,17 @@ 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) ); @@ -3951,11 +4644,23 @@ void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) 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 ); } @@ -3964,11 +4669,14 @@ void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) 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 ); @@ -3982,6 +4690,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 ); @@ -3993,6 +4702,7 @@ 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 ); @@ -4023,6 +4733,8 @@ void wxDataViewCtrl::UnselectAll() 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 ); @@ -4069,6 +4781,10 @@ void wxDataViewCtrl::GtkEnableSelectionEvents() G_CALLBACK (wxdataview_selection_changed_callback), this); } +// ---------------------------------------------------------------------------- +// visual attributes stuff +// ---------------------------------------------------------------------------- + // static wxVisualAttributes wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) @@ -4076,9 +4792,12 @@ wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new); } +void wxDataViewCtrl::DoApplyWidgetStyle(GtkRcStyle *style) +{ + wxDataViewCtrlBase::DoApplyWidgetStyle(style); + gtk_widget_modify_style(m_treeview, style); +} -#endif - // !wxUSE_GENERICDATAVIEWCTRL +#endif // !wxUSE_GENERICDATAVIEWCTRL -#endif - // wxUSE_DATAVIEWCTRL +#endif // wxUSE_DATAVIEWCTRL