#include "wx/gtk/private/gdkconv.h"
using namespace wxGTKImpl;
+class wxGtkDataViewModelNotifier;
+
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
class wxDataViewCtrlInternal
{
public:
- wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model );
+ wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model );
~wxDataViewCtrlInternal();
// model iface
bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
bool ItemChanged( const wxDataViewItem &item );
- bool ValueChanged( const wxDataViewItem &item, unsigned int col );
+ bool ValueChanged( const wxDataViewItem &item, unsigned int model_column );
bool Cleared();
+ bool BeforeReset();
+ bool AfterReset();
void Resort();
// sorting interface
// item can be deleted already in the model
int GetIndexOf( const wxDataViewItem &parent, const wxDataViewItem &item );
+ virtual void OnInternalIdle();
+
protected:
void InitTree();
+ void ScheduleRefresh();
+
wxGtkTreeModelNode *FindNode( const wxDataViewItem &item );
wxGtkTreeModelNode *FindNode( GtkTreeIter *iter );
wxGtkTreeModelNode *FindParentNode( const wxDataViewItem &item );
GtkTargetEntry m_dropTargetTargetEntry;
wxCharBuffer m_dropTargetTargetEntryTarget;
wxDataObject *m_dropDataObject;
+
+ wxGtkDataViewModelNotifier *m_notifier;
+
+ bool m_dirty;
};
gint sort_column_id,
GtkTreeIterCompareFunc func,
gpointer data,
- GtkDestroyNotify destroy);
+ GDestroyNotify destroy);
static void wxgtk_tree_model_set_default_sort_func (GtkTreeSortable *sortable,
GtkTreeIterCompareFunc func,
gpointer data,
- GtkDestroyNotify destroy);
+ GDestroyNotify destroy);
static gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable *sortable);
/* drag'n'drop */
gint WXUNUSED(sort_column_id),
GtkTreeIterCompareFunc func,
gpointer WXUNUSED(data),
- GtkDestroyNotify WXUNUSED(destroy))
+ GDestroyNotify WXUNUSED(destroy))
{
g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
g_return_if_fail (func != NULL);
wxgtk_tree_model_set_default_sort_func (GtkTreeSortable *sortable,
GtkTreeIterCompareFunc func,
gpointer WXUNUSED(data),
- GtkDestroyNotify WXUNUSED(destroy))
+ GDestroyNotify WXUNUSED(destroy))
{
g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
g_return_if_fail (func != NULL);
wxSize size = cell->GetSize();
- gint calc_width = (gint) renderer->xpad * 2 + size.x;
- gint calc_height = (gint) renderer->ypad * 2 + size.y;
+ int xpad, ypad;
+ gtk_cell_renderer_get_padding(renderer, &xpad, &ypad);
+ int calc_width = xpad * 2 + size.x;
+ int calc_height = ypad * 2 + size.y;
if (x_offset)
*x_offset = 0;
if (cell_area && size.x > 0 && size.y > 0)
{
+ float xalign, yalign;
+ gtk_cell_renderer_get_alignment(renderer, &xalign, &yalign);
if (x_offset)
{
- *x_offset = (gint)((renderer->xalign *
- (cell_area->width - calc_width - 2 * renderer->xpad)));
- *x_offset = MAX (*x_offset, 0) + renderer->xpad;
+ *x_offset = int(xalign * (cell_area->width - calc_width - 2 * xpad));
+ *x_offset = MAX(*x_offset, 0) + xpad;
}
if (y_offset)
{
- *y_offset = (gint)((renderer->yalign *
- (cell_area->height - calc_height - 2 * renderer->ypad)));
- *y_offset = MAX (*y_offset, 0) + renderer->ypad;
+ *y_offset = int(yalign * (cell_area->height - calc_height - 2 * ypad));
+ *y_offset = MAX(*y_offset, 0) + ypad;
}
}
background_area, expose_area, flags);
wxRect rect(wxRectFromGDKRect(cell_area));
- rect = rect.Deflate(renderer->xpad, renderer->ypad);
+ int xpad, ypad;
+ gtk_cell_renderer_get_padding(renderer, &xpad, &ypad);
+ rect = rect.Deflate(xpad, ypad);
wxWindowDC* dc = (wxWindowDC*) cell->GetDC();
wxWindowDCImpl *impl = (wxWindowDCImpl *) dc->GetImpl();
rect.x += cell_area->x;
rect.y += cell_area->y;
- rect.width -= renderer->xpad * 2;
- rect.height -= renderer->ypad * 2;
+ int xpad, ypad;
+ gtk_cell_renderer_get_padding(renderer, &xpad, &ypad);
+ rect.width -= xpad * 2;
+ rect.height -= ypad * 2;
wxRect renderrect(wxRectFromGDKRect(&rect));
class wxGtkDataViewModelNotifier: public wxDataViewModelNotifier
{
public:
- wxGtkDataViewModelNotifier( GtkWxTreeModel *wxgtk_model,
- wxDataViewModel *wx_model,
- wxDataViewCtrl *ctrl );
+ wxGtkDataViewModelNotifier( wxDataViewModel *wx_model, wxDataViewCtrlInternal *internal );
~wxGtkDataViewModelNotifier();
virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
virtual bool ItemChanged( const wxDataViewItem &item );
- virtual bool ValueChanged( const wxDataViewItem &item, unsigned int col );
+ virtual bool ValueChanged( const wxDataViewItem &item, unsigned int model_column );
virtual bool Cleared();
virtual void Resort();
+ virtual bool BeforeReset();
+ virtual bool AfterReset();
- void SetGtkModel( GtkWxTreeModel *model ) { m_wxgtk_model = model; }
+ void UpdateLastCount();
private:
- GtkWxTreeModel *m_wxgtk_model;
- wxDataViewModel *m_wx_model;
- wxDataViewCtrl *m_owner;
+ wxDataViewModel *m_wx_model;
+ wxDataViewCtrlInternal *m_internal;
};
// ---------------------------------------------------------
// ---------------------------------------------------------
wxGtkDataViewModelNotifier::wxGtkDataViewModelNotifier(
- GtkWxTreeModel* wxgtk_model, wxDataViewModel *wx_model,
- wxDataViewCtrl *ctrl )
+ wxDataViewModel *wx_model, wxDataViewCtrlInternal *internal )
{
- m_wxgtk_model = wxgtk_model;
m_wx_model = wx_model;
- m_owner = ctrl;
+ m_internal = internal;
}
wxGtkDataViewModelNotifier::~wxGtkDataViewModelNotifier()
{
m_wx_model = NULL;
- m_wxgtk_model = NULL;
+ m_internal = NULL;
}
bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
{
- m_owner->GtkGetInternal()->ItemAdded( parent, item );
+ m_internal->ItemAdded( parent, item );
+ GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel();
GtkTreeIter iter;
- iter.stamp = m_wxgtk_model->stamp;
+ iter.stamp = wxgtk_model->stamp;
iter.user_data = item.GetID();
wxGtkTreePath path(wxgtk_tree_model_get_path(
- GTK_TREE_MODEL(m_wxgtk_model), &iter ));
+ GTK_TREE_MODEL(wxgtk_model), &iter ));
gtk_tree_model_row_inserted(
- GTK_TREE_MODEL(m_wxgtk_model), path, &iter);
+ GTK_TREE_MODEL(wxgtk_model), path, &iter);
return true;
}
bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
{
+ GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel();
#if 0
// using _get_path for a deleted item cannot be
// a good idea
GtkTreeIter iter;
- iter.stamp = m_wxgtk_model->stamp;
+ iter.stamp = wxgtk_model->stamp;
iter.user_data = (gpointer) item.GetID();
wxGtkTreePath path(wxgtk_tree_model_get_path(
- GTK_TREE_MODEL(m_wxgtk_model), &iter ));
+ GTK_TREE_MODEL(wxgtk_model), &iter ));
#else
// so get the path from the parent
GtkTreeIter iter;
- iter.stamp = m_wxgtk_model->stamp;
+ iter.stamp = wxgtk_model->stamp;
iter.user_data = (gpointer) parent.GetID();
wxGtkTreePath path(wxgtk_tree_model_get_path(
- GTK_TREE_MODEL(m_wxgtk_model), &iter ));
+ GTK_TREE_MODEL(wxgtk_model), &iter ));
// and add the final index ourselves
- int index = m_owner->GtkGetInternal()->GetIndexOf( parent, item );
+ int index = m_internal->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_MODEL(wxgtk_model), path );
- m_owner->GtkGetInternal()->ItemDeleted( parent, item );
+ m_internal->ItemDeleted( parent, item );
return true;
}
void wxGtkDataViewModelNotifier::Resort()
{
- m_owner->GtkGetInternal()->Resort();
+ m_internal->Resort();
}
bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item )
{
+ GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel();
+
GtkTreeIter iter;
- iter.stamp = m_wxgtk_model->stamp;
+ iter.stamp = wxgtk_model->stamp;
iter.user_data = (gpointer) item.GetID();
wxGtkTreePath path(wxgtk_tree_model_get_path(
- GTK_TREE_MODEL(m_wxgtk_model), &iter ));
+ GTK_TREE_MODEL(wxgtk_model), &iter ));
gtk_tree_model_row_changed(
- GTK_TREE_MODEL(m_wxgtk_model), path, &iter );
+ GTK_TREE_MODEL(wxgtk_model), path, &iter );
- m_owner->GtkGetInternal()->ItemChanged( item );
+ m_internal->ItemChanged( item );
return true;
}
-bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsigned int model_col )
+bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsigned int model_column )
{
+ GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel();
+ wxDataViewCtrl *ctrl = m_internal->GetOwner();
+
// This adds GTK+'s missing MVC logic for ValueChanged
unsigned int index;
- for (index = 0; index < m_owner->GetColumnCount(); index++)
+ for (index = 0; index < ctrl->GetColumnCount(); index++)
{
- wxDataViewColumn *column = m_owner->GetColumn( index );
- if (column->GetModelColumn() == model_col)
+ wxDataViewColumn *column = ctrl->GetColumn( index );
+ if (column->GetModelColumn() == model_column)
{
- GtkTreeView *widget = GTK_TREE_VIEW(m_owner->m_treeview);
+ GtkTreeView *widget = GTK_TREE_VIEW(ctrl->GtkGetTreeView());
GtkTreeViewColumn *gcolumn = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle());
// Get cell area
GtkTreeIter iter;
- iter.stamp = m_wxgtk_model->stamp;
+ iter.stamp = wxgtk_model->stamp;
iter.user_data = (gpointer) item.GetID();
wxGtkTreePath path(wxgtk_tree_model_get_path(
- GTK_TREE_MODEL(m_wxgtk_model), &iter ));
+ GTK_TREE_MODEL(wxgtk_model), &iter ));
GdkRectangle cell_area;
gtk_tree_view_get_cell_area( widget, path, gcolumn, &cell_area );
gtk_widget_queue_draw_area( GTK_WIDGET(widget),
cell_area.x - xdiff, ydiff + cell_area.y, cell_area.width, cell_area.height );
- m_owner->GtkGetInternal()->ValueChanged( item, model_col );
+ m_internal->ValueChanged( item, model_column );
return true;
}
return false;
}
+bool wxGtkDataViewModelNotifier::BeforeReset()
+{
+ GtkWidget *treeview = m_internal->GetOwner()->GtkGetTreeView();
+ gtk_tree_view_set_model( GTK_TREE_VIEW(treeview), NULL );
+
+ return true;
+}
+
+bool wxGtkDataViewModelNotifier::AfterReset()
+{
+ GtkWidget *treeview = m_internal->GetOwner()->GtkGetTreeView();
+ GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel();
+
+ m_internal->Cleared();
+
+ gtk_tree_view_set_model( GTK_TREE_VIEW(treeview), GTK_TREE_MODEL(wxgtk_model) );
+
+ return true;
+}
+
bool wxGtkDataViewModelNotifier::Cleared()
{
+ GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel();
+
// There is no call to tell the model that everything
// has been deleted so call row_deleted() for every
// child of root...
- int count = m_owner->GtkGetInternal()->iter_n_children( NULL ); // number of children of root
+ int count = m_internal->iter_n_children( NULL ); // number of children of root
GtkTreePath *path = gtk_tree_path_new_first(); // points to root
int i;
for (i = 0; i < count; i++)
- gtk_tree_model_row_deleted( GTK_TREE_MODEL(m_wxgtk_model), path );
-
+ gtk_tree_model_row_deleted( GTK_TREE_MODEL(wxgtk_model), path );
+
gtk_tree_path_free( path );
-
- m_owner->GtkGetInternal()->Cleared();
+
+ m_internal->Cleared();
return true;
}
wxDataViewRendererBase( varianttype, mode, align )
{
m_renderer = NULL;
+ m_mode = mode;
// we haven't changed them yet
m_usingDefaultAttrs = true;
return;
}
+ m_mode = mode;
+
// This value is most often ignored in GtkTreeView
GValue gvalue = { 0, };
g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() );
m_context = window->GTKGetPangoDefaultContext();
m_layout = pango_layout_new( m_context );
- m_fontdesc = pango_font_description_copy( widget->style->font_desc );
+ m_fontdesc = pango_font_description_copy(gtk_widget_get_style(widget)->font_desc);
m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget );
// we create it on demand so need to do it even from a const function
const_cast<wxDataViewCustomRenderer *>(this)->
m_text_renderer = GTK_CELL_RENDERER_TEXT(gtk_cell_renderer_text_new());
+ g_object_ref_sink(m_text_renderer);
}
return m_text_renderer;
delete m_dc;
if (m_text_renderer)
- gtk_object_sink( GTK_OBJECT(m_text_renderer) );
+ g_object_unref(m_text_renderer);
}
wxDC *wxDataViewCustomRenderer::GetDC()
wxDataViewChoiceRenderer( choices, mode, alignment )
{
}
-
+
void wxDataViewChoiceByIndexRenderer::GtkOnTextEdited(const gchar *itempath, const wxString& str)
{
wxVariant value( (long) GetChoices().Index( str ) );
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;
}
return wxSize(x,y+d);
}
-bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *model,
+bool wxDataViewDateRenderer::Activate( const wxRect& WXUNUSED(cell), wxDataViewModel *model,
const wxDataViewItem &item, unsigned int col )
{
wxVariant variant;
cell->SetValue( value );
+ // deal with disabled items
+ bool enabled = wx_model->IsEnabled( item, cell->GetOwner()->GetModelColumn() );
+
+ // a) this sets the appearance to disabled grey
+ GValue gvalue = { 0, };
+ g_value_init( &gvalue, G_TYPE_BOOLEAN );
+ g_value_set_boolean( &gvalue, enabled );
+ g_object_set_property( G_OBJECT(renderer), "sensitive", &gvalue );
+ g_value_unset( &gvalue );
+
+ // b) this actually disables the control/renderer
+ if (enabled)
+ cell->SetMode( cell->GtkGetMode() );
+ else
+ cell->SetMode( wxDATAVIEW_CELL_INERT );
+
// deal with attributes: if the renderer doesn't support them at all, we
// don't even need to query the model for them
}
// else: no custom attributes specified and we're already using the default
// ones -- nothing to do
+
}
} // extern "C"
{
if (m_isConnected)
return;
-
- if (GTK_WIDGET_REALIZED(GetOwner()->m_treeview))
+
+ if (gtk_widget_get_realized(GetOwner()->m_treeview))
{
GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
if (column->button)
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 );
-
+ gtk_tree_view_column_set_clickable( column, TRUE );
+
m_isConnected = true;
}
}
{
wxDataViewColumnBase::SetBitmap( bitmap );
- if (bitmap.Ok())
+ if (bitmap.IsOk())
{
GtkImage *gtk_image = GTK_IMAGE(m_image);
gtk_tree_view_column_set_visible( GTK_TREE_VIEW_COLUMN(m_column), !hidden );
}
-void wxDataViewColumn::SetResizeable( bool resizeable )
+void wxDataViewColumn::SetResizeable( bool resizable )
{
- gtk_tree_view_column_set_resizable( GTK_TREE_VIEW_COLUMN(m_column), resizeable );
+ gtk_tree_view_column_set_resizable( GTK_TREE_VIEW_COLUMN(m_column), resizable );
}
void wxDataViewColumn::SetAlignment( wxAlignment align )
void wxDataViewColumn::SetWidth( int width )
{
- if (width < 0)
+ if ( width == wxCOL_WIDTH_AUTOSIZE )
{
-#if 1
- gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_FIXED );
-
- // TODO find a better calculation
- gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), wxDVC_DEFAULT_WIDTH );
-#else
- // this is unpractical for large numbers of items and disables
- // user resizing, which is totally unexpected
+ // NB: this disables user resizing
gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_AUTOSIZE );
-#endif
}
else
{
- gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_FIXED );
+ if ( width == wxCOL_WIDTH_DEFAULT )
+ {
+ // TODO find a better calculation
+ width = wxDVC_DEFAULT_WIDTH;
+ }
+ gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_FIXED );
gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), width );
}
}
// wxDataViewCtrlInternal
//-----------------------------------------------------------------------------
-wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner,
- wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model )
+wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model )
{
m_owner = owner;
m_wx_model = wx_model;
- m_gtk_model = gtk_model;
+
+ m_gtk_model = NULL;
m_root = NULL;
m_sort_order = GTK_SORT_ASCENDING;
m_sort_column = -1;
m_dragDataObject = NULL;
m_dropDataObject = NULL;
+ m_dirty = false;
+
+ m_gtk_model = wxgtk_tree_model_new();
+ m_gtk_model->internal = this;
+
+ m_notifier = new wxGtkDataViewModelNotifier( wx_model, this );
+
+ wx_model->AddNotifier( m_notifier );
+
+ // g_object_unref( gtk_model ); ???
+
if (!m_wx_model->IsVirtualListModel())
InitTree();
+
+ gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->GtkGetTreeView()), GTK_TREE_MODEL(m_gtk_model) );
}
wxDataViewCtrlInternal::~wxDataViewCtrlInternal()
{
+ m_wx_model->RemoveNotifier( m_notifier );
+
+ // remove the model from the GtkTreeView before it gets destroyed
+ gtk_tree_view_set_model( GTK_TREE_VIEW( m_owner->GtkGetTreeView() ), NULL );
+
g_object_unref( m_gtk_model );
delete m_dragDataObject;
delete m_dropDataObject;
}
+void wxDataViewCtrlInternal::ScheduleRefresh()
+{
+ m_dirty = true;
+}
+
+void wxDataViewCtrlInternal::OnInternalIdle()
+{
+ if (m_dirty)
+ {
+ GtkWidget *widget = m_owner->GtkGetTreeView();
+ gtk_widget_queue_draw( widget );
+ m_dirty = false;
+ }
+}
+
void wxDataViewCtrlInternal::InitTree()
{
wxDataViewItem item;
{
wxDataViewItemArray children;
unsigned int count = m_wx_model->GetChildren( node->GetItem(), children );
-
+
unsigned int pos;
for (pos = 0; pos < count; pos++)
{
event.SetEventObject( m_owner );
event.SetItem( item );
event.SetModel( m_wx_model );
+ gint x, y;
+ gtk_widget_get_pointer(m_owner->GtkGetTreeView(), &x, &y);
+ event.SetPosition(x, y);
if (!m_owner->HandleWindowEvent( event ))
return FALSE;
if ( !item )
return FALSE;
- if (!m_dragDataObject->IsSupported( selection_data->target ))
+ GdkAtom target = gtk_selection_data_get_target(selection_data);
+ if (!m_dragDataObject->IsSupported(target))
return FALSE;
- size_t size = m_dragDataObject->GetDataSize( selection_data->target );
+ size_t size = m_dragDataObject->GetDataSize(target);
if (size == 0)
return FALSE;
void *buf = malloc( size );
gboolean res = FALSE;
- if (m_dragDataObject->GetDataHere( selection_data->target, buf ))
+ if (m_dragDataObject->GetDataHere(target, buf))
{
res = TRUE;
- gtk_selection_data_set( selection_data, selection_data->target,
+ gtk_selection_data_set(selection_data, target,
8, (const guchar*) buf, size );
}
event.SetEventObject( m_owner );
event.SetItem( item );
event.SetModel( m_wx_model );
- event.SetDataFormat( selection_data->target );
- event.SetDataSize( selection_data->length );
- event.SetDataBuffer( selection_data->data );
+ event.SetDataFormat(gtk_selection_data_get_target(selection_data));
+ event.SetDataSize(gtk_selection_data_get_length(selection_data));
+ event.SetDataBuffer(const_cast<guchar*>(gtk_selection_data_get_data(selection_data)));
if (!m_owner->HandleWindowEvent( event ))
return FALSE;
event.SetEventObject( m_owner );
event.SetItem( item );
event.SetModel( m_wx_model );
- event.SetDataFormat( selection_data->target );
+ event.SetDataFormat(gtk_selection_data_get_target(selection_data));
if (!m_owner->HandleWindowEvent( event ))
return FALSE;
delete m_root;
m_root = NULL;
}
-
+
InitTree();
-
+
+ ScheduleRefresh();
+
return true;
}
{
if (!m_wx_model->IsVirtualListModel())
m_root->Resort();
+
+ ScheduleRefresh();
}
bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
parent_node->AddLeave( item.GetID() );
}
+ ScheduleRefresh();
+
return true;
}
parent_node->DeleteChild( item.GetID() );
}
+ ScheduleRefresh();
+
return true;
}
return true;
}
-bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned int col )
+bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned int view_column )
{
wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, m_owner->GetId() );
event.SetEventObject( m_owner );
event.SetModel( m_owner->GetModel() );
- event.SetColumn( col );
- event.SetDataViewColumn( GetOwner()->GetColumn(col) );
+ event.SetColumn( view_column );
+ event.SetDataViewColumn( GetOwner()->GetColumn(view_column) );
event.SetItem( item );
m_owner->HandleWindowEvent( event );
while (node)
{
int pos = node->GetChildren().Index( id );
-
+
gtk_tree_path_prepend_index( retval, pos );
id = node->GetItem().GetID();
static void
wxdataview_selection_changed_callback( GtkTreeSelection* WXUNUSED(selection), wxDataViewCtrl *dv )
{
- if (!GTK_WIDGET_REALIZED(dv->m_widget))
+ if (!gtk_widget_get_realized(dv->m_widget))
return;
wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, dv->GetId() );
GtkWidget* treeview = GtkGetTreeView();
// Insert widget in GtkTreeView
- if (GTK_WIDGET_REALIZED(treeview))
+ if (gtk_widget_get_realized(treeview))
gtk_widget_set_parent_window( child->m_widget,
gtk_tree_view_get_bin_window( GTK_TREE_VIEW(treeview) ) );
gtk_widget_set_parent( child->m_widget, treeview );
wxDataViewCtrl::~wxDataViewCtrl()
{
- if (m_notifier)
- GetModel()->RemoveNotifier( m_notifier );
+ // Stop editing before destroying the control to remove any event handlers
+ // which are added when editing started: if we didn't do this, the base
+ // class dtor would assert as it checks for any leftover handlers.
+ if ( m_treeview )
+ {
+ GtkTreeViewColumn *col;
+ gtk_tree_view_get_cursor(GTK_TREE_VIEW(m_treeview), NULL, &col);
- m_cols.Clear();
+ wxDataViewColumn * const wxcol = FromGTKColumn(col);
+ if ( wxcol )
+ {
+ // This won't do anything if we're not editing it
+ wxcol->GetRenderer()->CancelEditing();
+ }
+ }
- // remove the model from the GtkTreeView before it gets destroyed by the
- // wxDataViewCtrlBase's dtor
- gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), NULL );
+ m_cols.Clear();
delete m_internal;
}
void wxDataViewCtrl::Init()
{
- m_notifier = NULL;
m_internal = NULL;
m_cols.DeleteContents( true );
{
wxWindow::OnInternalIdle();
+ m_internal->OnInternalIdle();
+
unsigned int cols = GetColumnCount();
unsigned int i;
for (i = 0; i < cols; i++)
wxDataViewColumn *col = GetColumn( i );
col->OnInternalIdle();
}
+
+ if (m_ensureVisibleDefered.IsOk())
+ {
+ ExpandAncestors(m_ensureVisibleDefered);
+ GtkTreeIter iter;
+ iter.user_data = (gpointer) m_ensureVisibleDefered.GetID();
+ wxGtkTreePath path(m_internal->get_path( &iter ));
+ gtk_tree_view_scroll_to_cell( GTK_TREE_VIEW(m_treeview), path, NULL, false, 0.0, 0.0 );
+ m_ensureVisibleDefered = wxDataViewItem(0);
+ }
}
bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
}
#endif
- GtkWxTreeModel *gtk_model = wxgtk_tree_model_new();
- m_internal = new wxDataViewCtrlInternal( this, model, gtk_model );
- gtk_model->internal = m_internal;
-
- m_notifier = new wxGtkDataViewModelNotifier( gtk_model, model, this );
-
- model->AddNotifier( m_notifier );
-
- gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_model) );
-
- // unref in wxDataViewCtrlInternal
- // g_object_unref( gtk_model );
+ m_internal = new wxDataViewCtrlInternal( this, model );
return true;
}
return m_cols.GetCount();
}
-wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
+wxDataViewColumn* wxDataViewCtrl::FromGTKColumn(GtkTreeViewColumn *gtk_col) const
{
- GtkTreeViewColumn *gtk_col = gtk_tree_view_get_column( GTK_TREE_VIEW(m_treeview), pos );
- if (!gtk_col)
+ if ( !gtk_col )
return NULL;
wxDataViewColumnList::const_iterator iter;
}
}
+ wxFAIL_MSG( "No matching column?" );
+
return NULL;
}
+wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
+{
+ GtkTreeViewColumn *gtk_col = gtk_tree_view_get_column( GTK_TREE_VIEW(m_treeview), pos );
+
+ return FromGTKColumn(gtk_col);
+}
+
bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
{
gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview),
int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
{
- GtkTreeViewColumn *gtk_column = GTK_TREE_VIEW_COLUMN(column->GetConstGtkHandle());
+ GtkTreeViewColumn *gtk_column = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle());
GList *list = gtk_tree_view_get_columns( GTK_TREE_VIEW(m_treeview) );
gtk_tree_view_set_cursor(GTK_TREE_VIEW(m_treeview), path, NULL, FALSE);
}
+void wxDataViewCtrl::StartEditor(const wxDataViewItem& item, unsigned int column)
+{
+ wxCHECK_RET( m_treeview,
+ "Current item can't be set before creating the control." );
+
+ // We need to make sure the model knows about this item or the path would
+ // be invalid and gtk_tree_view_set_cursor() would silently do nothing.
+ ExpandAncestors(item);
+
+ wxDataViewColumn *dvcolumn = GetColumn(column);
+ wxASSERT_MSG(dvcolumn, "Could not retrieve column");
+ GtkTreeViewColumn *gcolumn = GTK_TREE_VIEW_COLUMN(dvcolumn->GetGtkHandle());
+
+ // We also need to preserve the existing selection from changing.
+ // Unfortunately the only way to do it seems to use our own selection
+ // function and forbid any selection changes during set cursor call.
+ wxGtkTreeSelectionLock
+ lock(gtk_tree_view_get_selection(GTK_TREE_VIEW(m_treeview)));
+
+ // Do move the cursor now.
+ GtkTreeIter iter;
+ iter.user_data = item.GetID();
+ wxGtkTreePath path(m_internal->get_path( &iter ));
+
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(m_treeview), path, gcolumn, TRUE);
+}
+
wxDataViewItem wxDataViewCtrl::GetSelection() const
{
GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
void wxDataViewCtrl::EnsureVisible(const wxDataViewItem& item,
const wxDataViewColumn *WXUNUSED(column))
{
+ m_ensureVisibleDefered = item;
ExpandAncestors(item);
GtkTreeIter iter;
gtk_tree_view_scroll_to_cell( GTK_TREE_VIEW(m_treeview), path, NULL, false, 0.0, 0.0 );
}
-void wxDataViewCtrl::HitTest(const wxPoint& WXUNUSED(point),
+void wxDataViewCtrl::HitTest(const wxPoint& point,
wxDataViewItem& item,
wxDataViewColumn *& column) const
{
- item = wxDataViewItem(0);
- column = NULL;
+ // gtk_tree_view_get_dest_row_at_pos() is the right one. But it does not tell the column.
+ // gtk_tree_view_get_path_at_pos() is the wrong function. It doesn't mind the header but returns column.
+ // See http://mail.gnome.org/archives/gtkmm-list/2005-January/msg00080.html
+ // So we have to use both of them.
+ // Friedrich Haase 2010-9-20
+ wxGtkTreePath path, pathScratch;
+ GtkTreeViewColumn* GtkColumn = NULL;
+ GtkTreeViewDropPosition pos = GTK_TREE_VIEW_DROP_INTO_OR_AFTER;
+ gint cell_x = 0;
+ gint cell_y = 0;
+
+ // cannot directly call GtkGetTreeView(), HitTest is const and so is this pointer
+ wxDataViewCtrl* ctrl = (wxDataViewCtrl*)this; // ugly workaround, ctrl is NOT const
+ GtkTreeView* treeView = GTK_TREE_VIEW(ctrl->GtkGetTreeView());
+
+ // is there possibly a better suited function to get the column?
+ gtk_tree_view_get_path_at_pos( // and this is the wrong call but it delivers the column
+ treeView,
+ (int) point.x, (int) point.y,
+ pathScratch.ByRef(),
+ &GtkColumn, // here we get the GtkColumn
+ &cell_x,
+ &cell_y );
+
+ if ( GtkColumn != NULL )
+ {
+ // we got GTK column
+ // the right call now which takes the header into account
+ gtk_tree_view_get_dest_row_at_pos( treeView, (int) point.x, (int) point.y, path.ByRef(), &pos);
+
+ if (path)
+ item = wxDataViewItem(GTKPathToItem(path));
+ // else we got a GTK column but the position is not over an item, e.g. below last item
+ for ( unsigned int i=0, cols=GetColumnCount(); i<cols; ++i ) // search the wx column
+ {
+ wxDataViewColumn* col = GetColumn(i);
+ if ( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) == GtkColumn )
+ {
+ column = col; // here we get the wx column
+ break;
+ }
+ }
+ }
+ // else no column and thus no item, both null
}
wxRect
projects / wxWidgets.git / blobdiff