#include "wx/icon.h"
#include "wx/list.h"
#include "wx/settings.h"
+ #include "wx/dataobj.h"
#include "wx/crt.h"
#endif
class wxDataViewCtrlInternal
{
public:
- wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model, GtkWxTreeModel *owner );
+ wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model );
~wxDataViewCtrlInternal();
// model iface
// dnd iface
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,
+ gboolean drag_data_get( GtkTreeDragSource *drag_source, GtkTreePath *path,
GtkSelectionData *selection_data );
- gboolean drag_data_received( GtkTreeDragDest *drag_dest, GtkTreePath *dest,
+ gboolean drag_data_received( GtkTreeDragDest *drag_dest, GtkTreePath *dest,
GtkSelectionData *selection_data );
- gboolean row_drop_possible( GtkTreeDragDest *drag_dest, GtkTreePath *dest_path,
+ gboolean row_drop_possible( GtkTreeDragDest *drag_dest, GtkTreePath *dest_path,
GtkSelectionData *selection_data );
// notifactions from wxDataViewModel
~wxGtkTreeModelNode()
{
- size_t count = m_children.GetCount();
+ size_t count = m_nodes.GetCount();
size_t i;
for (i = 0; i < count; i++)
{
iface->has_default_sort_func = wxgtk_tree_model_has_default_sort_func;
}
-static void
+static void
wxgtk_tree_model_drag_source_init(GtkTreeDragSourceIface *iface)
{
iface->row_draggable = wxgtk_tree_model_row_draggable;
iface->drag_data_get = wxgtk_tree_model_drag_data_get;
}
-static void
+static void
wxgtk_tree_model_drag_dest_init (GtkTreeDragDestIface *iface)
{
iface->drag_data_received = wxgtk_tree_model_drag_data_received;
GtkTreeIter *iter)
{
GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
-
+
if (wxtree_model->stamp != iter->stamp)
wxPrintf( "crash\n" );
g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE);
-
+
return wxtree_model->internal->iter_next( iter );
}
}
/* drag'n'drop iface */
-static gboolean
+static gboolean
wxgtk_tree_model_row_draggable (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->row_draggable( drag_source, path );
}
-static gboolean
+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
+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
+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
+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
+static gboolean
wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortable,
gint *sort_column_id,
GtkSortType *order)
wxDataViewColumn *gs_lastLeftClickHeader = NULL;
-static void
+static void
wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable,
gint sort_column_id,
GtkSortType order)
gs_lastLeftClickHeader = NULL;
}
-static void
+static void
wxgtk_tree_model_set_sort_func (GtkTreeSortable *sortable,
gint WXUNUSED(sort_column_id),
GtkTreeIterCompareFunc func,
gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable *sortable)
{
g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE );
-
+
return FALSE;
}
{
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.y += cell_area->y;
rect.width -= renderer->xpad * 2;
rect.height -= renderer->ypad * 2;
-
+
GdkRectangle dummy;
if (gdk_rectangle_intersect (expose_area, &rect, &dummy))
{
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;
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;
}
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;
+
+ 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
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 );
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;
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
GtkWidget *widget = window->m_treeview;
// Set later
m_gdkwindow = NULL;
-
+
m_window = window;
m_context = window->GtkGetPangoDefaultContext();
public:
wxDataViewCtrlDC( wxDataViewCtrl *window ) :
wxWindowDC( new wxDataViewCtrlDCImpl( this, window ) )
- { }
+ { }
};
-
+
// ---------------------------------------------------------
// wxDataViewCustomRenderer
Init(mode, align);
}
-void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset,
+void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset,
wxRect WXUNUSED(cell), wxDC *WXUNUSED(dc), int WXUNUSED(state) )
{
#if 0
return true;
}
-bool wxDataViewIconTextRenderer::GetValue( wxVariant &value ) const
+bool wxDataViewIconTextRenderer::GetValue( wxVariant &WXUNUSED(value) ) const
{
return false;
}
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;
}
static gboolean
-gtk_dataview_header_button_press_callback( GtkWidget *widget,
+gtk_dataview_header_button_press_callback( GtkWidget *WXUNUSED(widget),
GdkEventButton *gdk_event,
wxDataViewColumn *column )
{
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 );
}
-static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
+static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column),
GtkCellRenderer *renderer,
GtkTreeModel *model,
GtkTreeIter *iter,
wxDataViewModel *wx_model = tree_model->internal->GetDataViewModel();
- if (!wx_model->IsIndexListModel())
+ if (!wx_model->IsVirtualListModel())
{
if (wx_model->IsContainer( item ))
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
-
- // 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 );
-
+ SetWidth( width );
+
+ // 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 );
gtk_tree_view_column_set_cell_data_func( column, renderer,
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( gtk_label_get_text( GTK_LABEL(m_label) ) );
}
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;
if (bitmap.GetMask())
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 );
}
}
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
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 )
m_sort_column = -1;
m_dataview_sort_column = NULL;
- if (!m_wx_model->IsIndexListModel())
+ if (!m_wx_model->IsVirtualListModel())
InitTree();
}
// GTK+ dnd iface
-gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag_source),
+gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag_source),
GtkTreePath *path )
{
GtkTreeIter iter;
if (!get_iter( &iter, path )) return FALSE;
-
+
wxDataViewItem item( (void*) iter.user_data );
return m_wx_model->IsDraggable( item );
}
-gboolean wxDataViewCtrlInternal::drag_data_delete( GtkTreeDragSource *WXUNUSED(drag_source),
- GtkTreePath* path )
+gboolean
+wxDataViewCtrlInternal::drag_data_delete(GtkTreeDragSource *WXUNUSED(drag_source),
+ GtkTreePath *WXUNUSED(path))
{
return FALSE;
}
-gboolean wxDataViewCtrlInternal::drag_data_get( GtkTreeDragSource *WXUNUSED(drag_source),
+gboolean wxDataViewCtrlInternal::drag_data_get( GtkTreeDragSource *WXUNUSED(drag_source),
GtkTreePath *path, GtkSelectionData *selection_data )
{
GtkTreeIter iter;
if (!get_iter( &iter, path )) return FALSE;
-
+
wxDataViewItem item( (void*) iter.user_data );
-
+
wxDataFormat format( selection_data->target );
-
+
size_t size = m_wx_model->GetDragDataSize( item, format );
if (size == 0) return FALSE;
-
+
void *data = malloc( size );
-
+
m_wx_model->GetDragData( item, format, data, size );
-
+
gtk_selection_data_set( selection_data, selection_data->target,
8, (const guchar*) data, size );
free( data );
-
+
return TRUE;
}
-gboolean wxDataViewCtrlInternal::drag_data_received( GtkTreeDragDest *WXUNUSED(drag_dest),
- GtkTreePath *dest, GtkSelectionData *selection_data )
+gboolean
+wxDataViewCtrlInternal::drag_data_received(GtkTreeDragDest *WXUNUSED(drag_dest),
+ GtkTreePath *WXUNUSED(dest),
+ GtkSelectionData *WXUNUSED(selection_data))
{
return FALSE;
}
-gboolean wxDataViewCtrlInternal::row_drop_possible( GtkTreeDragDest *WXUNUSED(drag_dest),
- GtkTreePath *dest_path, GtkSelectionData *selection_data )
+gboolean
+wxDataViewCtrlInternal::row_drop_possible(GtkTreeDragDest *WXUNUSED(drag_dest),
+ GtkTreePath *WXUNUSED(dest_path),
+ GtkSelectionData *WXUNUSED(selection_data))
{
return FALSE;
}
{
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 );
if (m_wx_model->IsContainer( item ))
bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
{
- if (!m_wx_model->IsIndexListModel())
+ if (!m_wx_model->IsVirtualListModel())
{
wxGtkTreeModelNode *parent_node = FindNode( parent );
parent_node->DeleteChild( item.GetID() );
GtkTreeModelFlags wxDataViewCtrlInternal::get_flags()
{
- if (m_wx_model->IsIndexListModel())
+ 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 )
{
- if (m_wx_model->IsIndexListModel())
+ if (m_wx_model->IsVirtualListModel())
{
wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_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;
gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter )
{
- if (m_wx_model->IsIndexListModel())
+ if (m_wx_model->IsVirtualListModel())
{
wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
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)
gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter )
{
- if (m_wx_model->IsIndexListModel())
+ if (m_wx_model->IsVirtualListModel())
{
// this is a list, nodes have no children
return FALSE;
gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter )
{
- if (m_wx_model->IsIndexListModel())
+ if (m_wx_model->IsVirtualListModel())
{
wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
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;
gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *child )
{
- if (m_wx_model->IsIndexListModel())
+ if (m_wx_model->IsVirtualListModel())
{
return FALSE;
}
//-----------------------------------------------------------------------------
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;
}
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() );
}
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() );
}
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() );
}
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() );
}
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() );
static
void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget),
- GtkAllocation *alloc,
+ GtkAllocation *WXUNUSED(gtk_alloc),
wxDataViewCtrl *win )
{
wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
//-----------------------------------------------------------------------------
static gboolean
-gtk_dataview_motion_notify_callback( GtkWidget *widget,
+gtk_dataview_motion_notify_callback( GtkWidget *WXUNUSED(widget),
GdkEventMotion *gdk_event,
wxDataViewCtrl *dv )
{
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 );
{
m_notifier = NULL;
m_internal = NULL;
+
+ m_cols.DeleteContents( true );
}
static GtkTargetEntry gs_target;
g_signal_connect (m_treeview, "size_allocate",
G_CALLBACK (gtk_dataviewctrl_size_callback), this);
- gs_target.target = "UTF8_STRING";
+ gs_target.target = const_cast<char *>("UTF8_STRING");
gs_target.flags = 0;
- gs_target.info = -1;
- gtk_tree_view_enable_model_drag_source( GTK_TREE_VIEW(m_treeview),
+ gs_target.info = static_cast<guint>(-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)
g_signal_connect (m_treeview, "button_press_event",
G_CALLBACK (gtk_dataview_button_press_callback), this);
-
+
return true;
}
{
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;
m_cols.Append( col );
+#ifdef __WXGTK26__
+ if (!gtk_check_version(2,6,0))
+ {
+ if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
+ GTK_TREE_VIEW_COLUMN_FIXED)
+ 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()) );
m_cols.Insert( col );
+#ifdef __WXGTK26__
+ if (!gtk_check_version(2,6,0))
+ {
+ if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
+ GTK_TREE_VIEW_COLUMN_FIXED)
+ 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();
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)
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;
}
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;
}
GtkEnableSelectionEvents();
}
-void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn *column )
+void wxDataViewCtrl::EnsureVisible(const wxDataViewItem& item,
+ const wxDataViewColumn *WXUNUSED(column))
{
GtkTreeIter iter;
iter.user_data = (gpointer) item.GetID();
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();
}
projects / wxWidgets.git / blobdiff