X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ff9d30c0aab3b281ef9b380eac17435556c5088..6f8dd114f41f0cfdf3670267e88f7dea1da18f5a:/src/gtk/dataview.cpp

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 58b3538b6a..4610c07b01 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -3439,14 +3439,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))
@@ -3607,8 +3602,6 @@ 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);
 
@@ -3991,6 +3984,7 @@ void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
     for (i = 0; i < sel.GetCount(); i++)
     {
         GtkTreeIter iter;
+        iter.stamp = m_internal->GetGtkModel()->stamp;
         iter.user_data = (gpointer) sel[i].GetID();
         gtk_tree_selection_select_iter( selection, &iter );
     }
@@ -4005,6 +3999,7 @@ void wxDataViewCtrl::Select( 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_select_iter( selection, &iter );
 
@@ -4018,6 +4013,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 );
 
@@ -4029,6 +4025,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 );