Add some version checks to help compiling on OSX.

[wxWidgets.git] / src / gtk / dataview.cpp

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 62eb070d42cbc7b838f73c8ea127e28883776e8e..ee2ea2b68683c56f7f3e65a1e88221a08fe3ced6 100644 (file)
--- 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/log.h"
     #include "wx/dcclient.h"
     #include "wx/sizer.h"

-    #include "wx/icon.h"
-    #include "wx/list.h"

     #include "wx/settings.h"
     #include "wx/settings.h"

-    #include "wx/dataobj.h"

     #include "wx/crt.h"
 #endif
 
     #include "wx/crt.h"
 #endif
 


@@ -36,12 +33,15 @@
 #include "wx/gtk/dc.h"
 #include "wx/gtk/dcclient.h"
 
 #include "wx/gtk/dc.h"
 #include "wx/gtk/dcclient.h"
 

+#include "wx/gtk/private/gdkconv.h"
+using namespace wxGTKImpl;
+
+class wxGtkDataViewModelNotifier;
+

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 

-class wxDataViewCtrlInternal;
-
-wxDataViewCtrlInternal *g_internal = NULL;
+static wxDataViewCtrlInternal *gs_internal = NULL;

 
 class wxGtkTreeModelNode;
 
 
 class wxGtkTreeModelNode;
 


@@ -49,6 +49,146 @@ extern "C" {
 typedef struct _GtkWxTreeModel       GtkWxTreeModel;
 }
 
 typedef struct _GtkWxTreeModel       GtkWxTreeModel;
 }
 

+// ----------------------------------------------------------------------------
+// wxGtkTreePath: self-destroying GtkTreePath
+// ----------------------------------------------------------------------------
+
+// Usually this object is initialized with the associated GtkTreePath
+// immediately when it's constructed but it can also be changed later either by
+// using Assign() or by getting the pointer to the internally stored pointer
+// value using ByRef(). The latter should be avoided but is very convenient
+// when using GTK functions with GtkTreePath output parameters.
+class wxGtkTreePath
+{
+public:
+    // Ctor takes ownership of the given path and will free it if non-NULL.
+    wxGtkTreePath(GtkTreePath *path = NULL) : m_path(path) { }
+
+    // Creates a tree path for the given string path.
+    wxGtkTreePath(const gchar *strpath)
+        : m_path(gtk_tree_path_new_from_string(strpath))
+    {
+    }
+
+    // Set the stored pointer if not done by ctor.
+    void Assign(GtkTreePath *path)
+    {
+        wxASSERT_MSG( !m_path, "shouldn't be already initialized" );
+
+        m_path = path;
+    }
+
+    // Return the pointer to the internally stored pointer. This should only be
+    // used to initialize the object by passing it to some GTK function.
+    GtkTreePath **ByRef()
+    {
+        wxASSERT_MSG( !m_path, "shouldn't be already initialized" );
+
+        return &m_path;
+    }
+
+
+    operator GtkTreePath *() const { return m_path; }
+
+    ~wxGtkTreePath() { if ( m_path ) gtk_tree_path_free(m_path); }
+
+private:
+    GtkTreePath *m_path;
+
+    wxDECLARE_NO_COPY_CLASS(wxGtkTreePath);
+};
+
+// ----------------------------------------------------------------------------
+// wxGtkTreeSelectionLock: prevent selection from changing during the
+//                                 lifetime of this object
+// ----------------------------------------------------------------------------
+
+// Implementation note: it could be expected that setting the selection
+// function in this class ctor and resetting it back to the old value in its
+// dtor would work. However currently gtk_tree_selection_get_select_function()
+// can't be passed NULL (see https://bugzilla.gnome.org/show_bug.cgi?id=626276)
+// so we can't do this. Instead, we always use the selection function (which
+// imposes extra overhead, albeit minimal one, on all selection operations) and
+// just set/reset the flag telling it whether it should allow or forbid the
+// selection.
+//
+// Also notice that currently only a single object of this class may exist at
+// any given moment. It's just simpler like this and we don't need anything
+// more for now.
+
+extern "C"
+gboolean wxdataview_selection_func(GtkTreeSelection * WXUNUSED(selection),
+                                   GtkTreeModel * WXUNUSED(model),
+                                   GtkTreePath * WXUNUSED(path),
+                                   gboolean WXUNUSED(path_currently_selected),
+                                   gpointer data)
+{
+    return data == NULL;
+}
+
+class wxGtkTreeSelectionLock
+{
+public:
+    wxGtkTreeSelectionLock(GtkTreeSelection *selection)
+        : m_selection(selection)
+    {
+        wxASSERT_MSG( !ms_instance, "this class is not reentrant currently" );
+
+        ms_instance = this;
+
+        CheckCurrentSelectionFunc(NULL);
+
+        // Pass some non-NULL pointer as "data" for the callback, it doesn't
+        // matter what it is as long as it's non-NULL.
+        gtk_tree_selection_set_select_function(selection,
+                                               wxdataview_selection_func,
+                                               this,
+                                               NULL);
+    }
+
+    ~wxGtkTreeSelectionLock()
+    {
+        CheckCurrentSelectionFunc(wxdataview_selection_func);
+
+        gtk_tree_selection_set_select_function(m_selection,
+                                               wxdataview_selection_func,
+                                               NULL,
+                                               NULL);
+
+        ms_instance = NULL;
+    }
+
+private:
+    void CheckCurrentSelectionFunc(GtkTreeSelectionFunc func)
+    {
+        // We can only use gtk_tree_selection_get_select_function() with 2.14+
+        // so check for its availability both during compile- and run-time.
+#if GTK_CHECK_VERSION(2, 14, 0)
+        if ( gtk_check_version(2, 14, 0) != NULL )
+            return;
+
+        // If this assert is triggered, it means the code elsewhere has called
+        // gtk_tree_selection_set_select_function() but currently doing this
+        // breaks this class so the code here needs to be changed.
+        wxASSERT_MSG
+        (
+            gtk_tree_selection_get_select_function(m_selection) == func,
+            "selection function has changed unexpectedly, review this code!"
+        );
+#endif // GTK+ 2.14+
+
+        wxUnusedVar(func);
+    }
+
+    static wxGtkTreeSelectionLock *ms_instance;
+
+    GtkTreeSelection * const m_selection;
+
+    wxDECLARE_NO_COPY_CLASS(wxGtkTreeSelectionLock);
+};
+
+wxGtkTreeSelectionLock *wxGtkTreeSelectionLock::ms_instance = NULL;
+

 //-----------------------------------------------------------------------------
 // wxDataViewCtrlInternal
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDataViewCtrlInternal
 //-----------------------------------------------------------------------------


@@ -59,7 +199,7 @@ WX_DEFINE_LIST(ItemList)
 class wxDataViewCtrlInternal
 {
 public:
 class wxDataViewCtrlInternal
 {
 public:

-    wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model );
+    wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model );

     ~wxDataViewCtrlInternal();
 
     // model iface
     ~wxDataViewCtrlInternal();
 
     // model iface


@@ -74,9 +214,10 @@ public:
     gboolean iter_parent( GtkTreeIter *iter, GtkTreeIter *child );
 
     // dnd iface
     gboolean iter_parent( GtkTreeIter *iter, GtkTreeIter *child );
 
     // dnd iface

-   
+

     bool EnableDragSource( const wxDataFormat &format );
     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,
     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,


@@ -90,16 +231,18 @@ public:
     bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
     bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
     bool ItemChanged( const wxDataViewItem &item );
     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 Cleared();

+    bool BeforeReset();
+    bool AfterReset();

     void Resort();
 
     // sorting interface
     void SetSortOrder( GtkSortType sort_order ) { m_sort_order = sort_order; }
     void Resort();
 
     // sorting interface
     void SetSortOrder( GtkSortType sort_order ) { m_sort_order = sort_order; }

-    GtkSortType GetSortOrder()                  { return m_sort_order; }
+    GtkSortType GetSortOrder() const            { return m_sort_order; }

 
     void SetSortColumn( int column )            { m_sort_column = column; }
 
     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; }
 
     void SetDataViewSortColumn( wxDataViewColumn *column ) { m_dataview_sort_column = column; }
     wxDataViewColumn *GetDataViewSortColumn()   { return m_dataview_sort_column; }


@@ -108,11 +251,19 @@ public:
 
     // accessors
     wxDataViewModel* GetDataViewModel() { return m_wx_model; }
 
     // 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; }
 
     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 );
+
+    virtual void OnInternalIdle();
+

 protected:
     void InitTree();
 protected:
     void InitTree();

+    void ScheduleRefresh();
+

     wxGtkTreeModelNode *FindNode( const wxDataViewItem &item );
     wxGtkTreeModelNode *FindNode( GtkTreeIter *iter );
     wxGtkTreeModelNode *FindParentNode( const wxDataViewItem &item );
     wxGtkTreeModelNode *FindNode( const wxDataViewItem &item );
     wxGtkTreeModelNode *FindNode( GtkTreeIter *iter );
     wxGtkTreeModelNode *FindParentNode( const wxDataViewItem &item );


@@ -127,10 +278,18 @@ private:
     GtkSortType           m_sort_order;
     wxDataViewColumn     *m_dataview_sort_column;
     int                   m_sort_column;
     GtkSortType           m_sort_order;
     wxDataViewColumn     *m_dataview_sort_column;
     int                   m_sort_column;

+

     GtkTargetEntry        m_dragSourceTargetEntry;
     wxCharBuffer          m_dragSourceTargetEntryTarget;
     wxDataObject         *m_dragDataObject;
     GtkTargetEntry        m_dragSourceTargetEntry;
     wxCharBuffer          m_dragSourceTargetEntryTarget;
     wxDataObject         *m_dragDataObject;

+
+    GtkTargetEntry        m_dropTargetTargetEntry;
+    wxCharBuffer          m_dropTargetTargetEntryTarget;

     wxDataObject         *m_dropDataObject;
     wxDataObject         *m_dropDataObject;

+
+    wxGtkDataViewModelNotifier *m_notifier;
+
+    bool                  m_dirty;

 };
 
 
 };
 
 


@@ -138,10 +297,11 @@ private:
 // wxGtkTreeModelNode
 //-----------------------------------------------------------------------------
 
 // wxGtkTreeModelNode
 //-----------------------------------------------------------------------------
 

+static

 int LINKAGEMODE wxGtkTreeModelChildCmp( void** id1, void** id2 )
 {
 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( wxDataViewItem(*id1), wxDataViewItem(*id2),
+        gs_internal->GetSortColumn(), (gs_internal->GetSortOrder() == GTK_SORT_ASCENDING) );

 
     return ret;
 }
 
     return ret;
 }


@@ -153,7 +313,7 @@ class wxGtkTreeModelNode
 {
 public:
     wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item,
 {
 public:
     wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item,

-      wxDataViewCtrlInternal *internal )
+                        wxDataViewCtrlInternal *internal )

     {
         m_parent = parent;
         m_item = item;
     {
         m_parent = parent;
         m_item = item;


@@ -181,7 +341,7 @@ public:
 
             if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare())
             {
 
             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 );
             }
                 m_children.Sort( &wxGtkTreeModelChildCmp );
                 return m_children.Index( id );
             }


@@ -195,7 +355,7 @@ public:
 
             if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare())
             {
 
             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 );
             }
                 m_children.Sort( &wxGtkTreeModelChildCmp );
                 return m_children.Index( id );
             }


@@ -219,7 +379,6 @@ public:
                     break;
                 }
             }
                     break;
                 }
             }

-

         }
 
     wxGtkTreeModelNode* GetParent()
         }
 
     wxGtkTreeModelNode* GetParent()


@@ -229,8 +388,8 @@ public:
     wxGtkTreeModelChildren &GetChildren()
         { return m_children; }
 
     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; }
 
     wxDataViewItem &GetItem() { return m_item; }
     wxDataViewCtrlInternal *GetInternal() { return m_internal; }


@@ -326,7 +485,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,
 /* 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);
 static void     wxgtk_tree_model_set_sort_column_id    (GtkTreeSortable       *sortable,
                                                         gint                   sort_column_id,
                                                         GtkSortType            order);


@@ -334,11 +493,11 @@ static void     wxgtk_tree_model_set_sort_func         (GtkTreeSortable       *s
                                                         gint                   sort_column_id,
                                                         GtkTreeIterCompareFunc func,
                                                         gpointer               data,
                                                         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,
 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 */
 static gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable       *sortable);
 
 /* drag'n'drop */


@@ -354,7 +513,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);
 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;
 
 
 static GObjectClass *list_parent_class = NULL;


@@ -534,14 +693,12 @@ wxgtk_tree_model_get_column_type (GtkTreeModel *tree_model,
 
     wxString wxtype = wxtree_model->internal->GetDataViewModel()->GetColumnType( (unsigned int) index );
 
 
     wxString wxtype = wxtree_model->internal->GetDataViewModel()->GetColumnType( (unsigned int) index );
 

-    wxPrintf( "get_column_type %s\n", wxtype );
-

     if (wxtype == wxT("string"))
         gtype = G_TYPE_STRING;
     else
     {
     if (wxtype == wxT("string"))
         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;
     }
 
     return gtype;


@@ -592,7 +749,7 @@ wxgtk_tree_model_get_value (GtkTreeModel *tree_model,
     }
     else
     {
     }
     else
     {

-        wxFAIL_MSG( _T("non-string columns not supported yet") );
+        wxFAIL_MSG( wxT("non-string columns not supported yet") );

     }
 }
 
     }
 }
 


@@ -602,8 +759,8 @@ wxgtk_tree_model_iter_next (GtkTreeModel  *tree_model,
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) 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);
 
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
     g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE);


@@ -618,7 +775,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);
 {
     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 );
 }
 
     return wxtree_model->internal->iter_children( iter, parent );
 }


@@ -639,8 +799,8 @@ wxgtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
                                   GtkTreeIter  *iter)
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) 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 );
 }
 
     return wxtree_model->internal->iter_n_children( iter );
 }


@@ -730,7 +890,7 @@ wxgtk_tree_model_drag_data_received (GtkTreeDragDest  *drag_dest,
 static gboolean
 wxgtk_tree_model_row_drop_possible (GtkTreeDragDest  *drag_dest,
                                     GtkTreePath      *dest_path,
 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);
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_dest;
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);


@@ -806,24 +966,27 @@ wxgtk_tree_model_set_sort_func (GtkTreeSortable        *sortable,
                                 gint                    WXUNUSED(sort_column_id),
                                 GtkTreeIterCompareFunc  func,
                                 gpointer                WXUNUSED(data),
                                 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);
 }
 
 {
     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),
+                                        GDestroyNotify          WXUNUSED(destroy))

 {
     g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
     g_return_if_fail (func != NULL);
 
 {
     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 );
 
 {
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE );
 


@@ -831,7 +994,149 @@ 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;
+    wxDataViewColumn *column = wx_renderer->GetOwner();
+
+    wxDataViewItem
+        item(column->GetOwner()->GTKPathToItem(wxGtkTreePath(path)));
+
+    wxDataViewCtrl *dv = column->GetOwner();
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING, dv->GetId() );
+    event.SetDataViewColumn( column );
+    event.SetModel( dv->GetModel() );
+    event.SetColumn( column->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" {
 //-----------------------------------------------------------------------------
 
 extern "C" {


@@ -971,8 +1276,6 @@ gtk_wx_cell_renderer_new (void)
     return (GtkCellRenderer*) g_object_new (GTK_TYPE_WX_CELL_RENDERER, NULL);
 }
 
     return (GtkCellRenderer*) g_object_new (GTK_TYPE_WX_CELL_RENDERER, NULL);
 }
 

-
-

 static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
                         GtkCellRenderer         *renderer,
                         GdkEvent                *WXUNUSED(event),
 static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
                         GtkCellRenderer         *renderer,
                         GdkEvent                *WXUNUSED(event),


@@ -1005,14 +1308,11 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
 //    rect.width  -= renderer->xpad * 2;
 //    rect.height -= renderer->ypad * 2;
 
 //    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;
-    cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, treepath );
-    wxDataViewItem item( (void*) iter.user_data );
-    gtk_tree_path_free( treepath );
+    wxDataViewItem
+        item(cell->GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(path)));

 
     cell->StartEditing( item, renderrect );
 
 
     cell->StartEditing( item, renderrect );
 


@@ -1033,8 +1333,21 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
 
     wxSize size = cell->GetSize();
 
 
     wxSize size = cell->GetSize();
 

-    gint calc_width  = (gint) renderer->xpad * 2 + size.x;
-    gint calc_height = (gint) renderer->ypad * 2 + size.y;
+    wxDataViewCtrl * const ctrl = cell->GetOwner()->GetOwner();
+
+    // Uniform row height, if specified, overrides the value returned by the
+    // renderer.
+    if ( !ctrl->HasFlag(wxDV_VARIABLE_LINE_HEIGHT) )
+    {
+        const int uniformHeight = ctrl->GTKGetUniformRowHeight();
+        if ( uniformHeight > 0 )
+            size.y = uniformHeight;
+    }
+
+    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 (x_offset)
         *x_offset = 0;


@@ -1043,17 +1356,17 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
 
     if (cell_area && size.x > 0 && size.y > 0)
     {
 
     if (cell_area && size.x > 0 && size.y > 0)
     {

+        float xalign, yalign;
+        gtk_cell_renderer_get_alignment(renderer, &xalign, &yalign);

         if (x_offset)
         {
         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)
         {
         }
         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;

         }
     }
 
         }
     }
 


@@ -1077,50 +1390,38 @@ gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
     wxDataViewCustomRenderer *cell = wxrenderer->cell;
 
     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));
+    int xpad, ypad;
+    gtk_cell_renderer_get_padding(renderer, &xpad, &ypad);
+    rect = rect.Deflate(xpad, 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
 }
 
 static gboolean


@@ -1145,19 +1446,17 @@ gtk_wx_cell_renderer_activate(
 
     rect.x += cell_area->x;
     rect.y += cell_area->y;
 
     rect.x += cell_area->x;
     rect.y += cell_area->y;

-    rect.width  -= renderer->xpad * 2;
-    rect.height -= renderer->ypad * 2;
-
-    wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
+    int xpad, ypad;
+    gtk_cell_renderer_get_padding(renderer, &xpad, &ypad);
+    rect.width  -= xpad * 2;
+    rect.height -= ypad * 2;

 
 

-    wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel();
+    wxRect renderrect(wxRectFromGDKRect(&rect));

 
 

-    GtkTreePath *treepath = gtk_tree_path_new_from_string( path );
+    wxDataViewCtrl * const ctrl = cell->GetOwner()->GetOwner();
+    wxDataViewModel *model = ctrl->GetModel();

 
 

-    GtkTreeIter iter;
-    cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, treepath );
-    wxDataViewItem item( iter.user_data );
-    gtk_tree_path_free( treepath );
+    wxDataViewItem item(ctrl->GTKPathToItem(wxGtkTreePath(path)));

 
     unsigned int model_col = cell->GetOwner()->GetModelColumn();
 
 
     unsigned int model_col = cell->GetOwner()->GetModelColumn();
 


@@ -1202,24 +1501,23 @@ gtk_wx_cell_renderer_activate(
 class wxGtkDataViewModelNotifier: public wxDataViewModelNotifier
 {
 public:
 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 );
     ~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 Cleared();
     virtual void Resort();

+    virtual bool BeforeReset();
+    virtual bool AfterReset();

 
 

-    void SetGtkModel( GtkWxTreeModel *model ) { m_wxgtk_model = model; }
+    void UpdateLastCount();

 
 private:
 
 private:

-    GtkWxTreeModel      *m_wxgtk_model;
-    wxDataViewModel     *m_wx_model;
-    wxDataViewCtrl      *m_owner;
+    wxDataViewModel         *m_wx_model;
+    wxDataViewCtrlInternal  *m_internal;

 };
 
 // ---------------------------------------------------------
 };
 
 // ---------------------------------------------------------


@@ -1227,97 +1525,112 @@ private:
 // ---------------------------------------------------------
 
 wxGtkDataViewModelNotifier::wxGtkDataViewModelNotifier(
 // ---------------------------------------------------------
 
 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_wx_model = wx_model;

-    m_owner = ctrl;
+    m_internal = internal;

 }
 
 wxGtkDataViewModelNotifier::~wxGtkDataViewModelNotifier()
 {
     m_wx_model = NULL;
 }
 
 wxGtkDataViewModelNotifier::~wxGtkDataViewModelNotifier()
 {
     m_wx_model = NULL;

-    m_wxgtk_model = NULL;
+    m_internal = NULL;

 }
 
 bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
 {
 }
 
 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;
 
     GtkTreeIter iter;

-    iter.stamp = m_wxgtk_model->stamp;
-    iter.user_data = (gpointer) item.GetID();
+    iter.stamp = wxgtk_model->stamp;
+    iter.user_data = item.GetID();

 
 

-    GtkTreePath *path = wxgtk_tree_model_get_path(
-        GTK_TREE_MODEL(m_wxgtk_model), &iter );
+    wxGtkTreePath path(wxgtk_tree_model_get_path(
+        GTK_TREE_MODEL(wxgtk_model), &iter ));

     gtk_tree_model_row_inserted(
     gtk_tree_model_row_inserted(

-        GTK_TREE_MODEL(m_wxgtk_model), path, &iter);
-    gtk_tree_path_free (path);
+        GTK_TREE_MODEL(wxgtk_model), path, &iter);

 
     return true;
 }
 
 bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
 {
 
     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;
     GtkTreeIter iter;

-    iter.stamp = m_wxgtk_model->stamp;
+    iter.stamp = wxgtk_model->stamp;

     iter.user_data = (gpointer) item.GetID();
     iter.user_data = (gpointer) item.GetID();

+    wxGtkTreePath path(wxgtk_tree_model_get_path(
+        GTK_TREE_MODEL(wxgtk_model), &iter ));
+#else
+    // so get the path from the parent
+    GtkTreeIter iter;
+    iter.stamp = wxgtk_model->stamp;
+    iter.user_data = (gpointer) parent.GetID();
+    wxGtkTreePath path(wxgtk_tree_model_get_path(
+        GTK_TREE_MODEL(wxgtk_model), &iter ));
+    // and add the final index ourselves
+    int index = m_internal->GetIndexOf( parent, item );
+    gtk_tree_path_append_index( path, index );
+#endif

 
 

-    GtkTreePath *path = wxgtk_tree_model_get_path(
-        GTK_TREE_MODEL(m_wxgtk_model), &iter );

     gtk_tree_model_row_deleted(
     gtk_tree_model_row_deleted(

-        GTK_TREE_MODEL(m_wxgtk_model), path );
-    gtk_tree_path_free (path);
+        GTK_TREE_MODEL(wxgtk_model), path );

 
 

-    m_owner->GtkGetInternal()->ItemDeleted( parent, item );
+    m_internal->ItemDeleted( parent, item );

 
     return true;
 }
 
 void wxGtkDataViewModelNotifier::Resort()
 {
 
     return true;
 }
 
 void wxGtkDataViewModelNotifier::Resort()
 {

-    m_owner->GtkGetInternal()->Resort();
+    m_internal->Resort();

 }
 
 bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item )
 {
 }
 
 bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item )
 {

+    GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel();
+

     GtkTreeIter iter;
     GtkTreeIter iter;

-    iter.stamp = m_wxgtk_model->stamp;
+    iter.stamp = wxgtk_model->stamp;

     iter.user_data = (gpointer) item.GetID();
 
     iter.user_data = (gpointer) item.GetID();
 

-    GtkTreePath *path = wxgtk_tree_model_get_path(
-        GTK_TREE_MODEL(m_wxgtk_model), &iter );
+    wxGtkTreePath path(wxgtk_tree_model_get_path(
+        GTK_TREE_MODEL(wxgtk_model), &iter ));

     gtk_tree_model_row_changed(
     gtk_tree_model_row_changed(

-        GTK_TREE_MODEL(m_wxgtk_model), path, &iter );
-    gtk_tree_path_free (path);
+        GTK_TREE_MODEL(wxgtk_model), path, &iter );

 
 

-    m_owner->GtkGetInternal()->ItemChanged( item );
+    m_internal->ItemChanged( item );

 
     return true;
 }
 
 
     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;
     // 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;
             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();
             iter.user_data = (gpointer) item.GetID();

-            GtkTreePath *path = wxgtk_tree_model_get_path(
-                GTK_TREE_MODEL(m_wxgtk_model), &iter );
+            wxGtkTreePath path(wxgtk_tree_model_get_path(
+                GTK_TREE_MODEL(wxgtk_model), &iter ));

             GdkRectangle cell_area;
             gtk_tree_view_get_cell_area( widget, path, gcolumn, &cell_area );
             GdkRectangle cell_area;
             gtk_tree_view_get_cell_area( widget, path, gcolumn, &cell_area );

-            gtk_tree_path_free( path );

 
             GtkAdjustment* hadjust = gtk_tree_view_get_hadjustment( widget );
             double d = gtk_adjustment_get_value( hadjust );
 
             GtkAdjustment* hadjust = gtk_tree_view_get_hadjustment( widget );
             double d = gtk_adjustment_get_value( hadjust );


@@ -1328,7 +1641,7 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig
             gtk_widget_queue_draw_area( GTK_WIDGET(widget),
                 cell_area.x - xdiff, ydiff + cell_area.y, cell_area.width, cell_area.height );
 
             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 true;
         }


@@ -1337,18 +1650,47 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig
     return false;
 }
 
     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()
 {
 bool wxGtkDataViewModelNotifier::Cleared()
 {

-    gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->m_treeview), NULL );
+    GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel();

 
 

-    // this will create a new GTK model
-    m_owner->GtkGetInternal()->Cleared();
+    // There is no call to tell the model that everything
+    // has been deleted so call row_deleted() for every
+    // child of root...

 
 

-    SetGtkModel( m_owner->GtkGetInternal()->GetGtkModel() );
+    int count = m_internal->iter_n_children( NULL ); // number of children of root

 
 

-    gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->m_treeview), GTK_TREE_MODEL(m_wxgtk_model) );
+    GtkTreePath *path = gtk_tree_path_new_first();  // points to root

 
 

-    return false;
+    int i;
+    for (i = 0; i < count; i++)
+        gtk_tree_model_row_deleted( GTK_TREE_MODEL(wxgtk_model), path );
+
+    gtk_tree_path_free( path );
+
+    m_internal->Cleared();
+
+    return true;

 }
 
 // ---------------------------------------------------------
 }
 
 // ---------------------------------------------------------


@@ -1375,22 +1717,21 @@ static void
 wxgtk_renderer_editing_started( GtkCellRenderer *WXUNUSED(cell), GtkCellEditable *editable,
                                 gchar *path, wxDataViewRenderer *wxrenderer )
 {
 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() );
     event.SetDataViewColumn( column );
     event.SetModel( dv->GetModel() );
     wxDataViewColumn *column = wxrenderer->GetOwner();
     wxDataViewCtrl *dv = column->GetOwner();
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, dv->GetId() );
     event.SetDataViewColumn( column );
     event.SetModel( dv->GetModel() );

-    GtkTreePath *tree_path = gtk_tree_path_new_from_string( path );
-    GtkTreeIter iter;
-    dv->GtkGetInternal()->get_iter( &iter, tree_path );
-    gtk_tree_path_free( tree_path );
-    wxDataViewItem item( iter.user_data );
+    wxDataViewItem item(dv->GTKPathToItem(wxGtkTreePath(path)));

     event.SetItem( item );
     dv->HandleWindowEvent( event );
 
     if (GTK_IS_CELL_EDITABLE(editable))
     {
     event.SetItem( item );
     dv->HandleWindowEvent( event );
 
     if (GTK_IS_CELL_EDITABLE(editable))
     {

-        s_user_data = iter.user_data;
+        s_user_data = item.GetID();

 
         g_signal_connect (GTK_CELL_EDITABLE (editable), "editing_done",
             G_CALLBACK (wxgtk_cell_editable_editing_done),
 
         g_signal_connect (GTK_CELL_EDITABLE (editable), "editing_done",
             G_CALLBACK (wxgtk_cell_editable_editing_done),


@@ -1407,18 +1748,27 @@ wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewC
     wxDataViewRendererBase( varianttype, mode, align )
 {
     m_renderer = NULL;
     wxDataViewRendererBase( varianttype, mode, align )
 {
     m_renderer = NULL;

+    m_mode = mode;
+
+    // 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
 }
 
 
     // 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",
 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);

     }
 }
 
     }
 }
 


@@ -1444,6 +1794,8 @@ void wxDataViewRenderer::SetMode( wxDataViewCellMode mode )
             return;
     }
 
             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() );
     // This value is most often ignored in GtkTreeView
     GValue gvalue = { 0, };
     g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() );


@@ -1483,7 +1835,7 @@ wxDataViewCellMode wxDataViewRenderer::GetMode() const
     return ret;
 }
 
     return ret;
 }
 

-void wxDataViewRenderer::GtkUpdateAlignment()
+void wxDataViewRenderer::GtkApplyAlignment(GtkCellRenderer *renderer)

 {
     int align = m_alignment;
 
 {
     int align = m_alignment;
 


@@ -1509,7 +1861,7 @@ void wxDataViewRenderer::GtkUpdateAlignment()
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_FLOAT );
     g_value_set_float( &gvalue, xalign );
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_FLOAT );
     g_value_set_float( &gvalue, xalign );

-    g_object_set_property( G_OBJECT(m_renderer), "xalign", &gvalue );
+    g_object_set_property( G_OBJECT(renderer), "xalign", &gvalue );

     g_value_unset( &gvalue );
 
     // vertical alignment:
     g_value_unset( &gvalue );
 
     // vertical alignment:


@@ -1523,7 +1875,7 @@ void wxDataViewRenderer::GtkUpdateAlignment()
     GValue gvalue2 = { 0, };
     g_value_init( &gvalue2, G_TYPE_FLOAT );
     g_value_set_float( &gvalue2, yalign );
     GValue gvalue2 = { 0, };
     g_value_init( &gvalue2, G_TYPE_FLOAT );
     g_value_set_float( &gvalue2, yalign );

-    g_object_set_property( G_OBJECT(m_renderer), "yalign", &gvalue2 );
+    g_object_set_property( G_OBJECT(renderer), "yalign", &gvalue2 );

     g_value_unset( &gvalue2 );
 }
 
     g_value_unset( &gvalue2 );
 }
 


@@ -1538,49 +1890,199 @@ int wxDataViewRenderer::GetAlignment() const
     return m_alignment;
 }
 
     return m_alignment;
 }
 

-// ---------------------------------------------------------
-// wxDataViewTextRenderer
-// ---------------------------------------------------------
+void wxDataViewRenderer::EnableEllipsize(wxEllipsizeMode mode)
+{
+#ifdef __WXGTK26__
+    if ( gtk_check_version(2, 6, 0) != NULL )
+        return;

 
 

-extern "C" {
-static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
-    gchar *arg1, gchar *arg2, gpointer user_data );
+    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<PangoEllipsizeMode>(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

 }
 
 }
 

-static void wxGtkTextRendererEditedCallback( GtkCellRendererText *WXUNUSED(renderer),
-    gchar *arg1, gchar *arg2, gpointer user_data )
+wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const

 {
 {

-    wxDataViewRenderer *cell = (wxDataViewRenderer*) user_data;
+#ifdef __WXGTK26__
+    if ( gtk_check_version(2, 6, 0) != NULL )
+        return wxELLIPSIZE_NONE;

 
 

-    wxString tmp = wxGTK_CONV_BACK_FONT(arg2, cell->GetOwner()->GetOwner()->GetFont());
-    wxVariant value = tmp;
-    if (!cell->Validate( value ))
-        return;
+    GtkCellRendererText * const rend = GtkGetTextRenderer();
+    if ( !rend )
+        return wxELLIPSIZE_NONE;

 
 

-    wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel();
+    GValue gvalue = { 0, };
+    g_value_init( &gvalue, PANGO_TYPE_ELLIPSIZE_MODE );
+    g_object_get_property( G_OBJECT(rend), "ellipsize", &gvalue );
+    wxEllipsizeMode
+        mode = static_cast<wxEllipsizeMode>(g_value_get_enum( &gvalue ));
+    g_value_unset( &gvalue );

 
 

-    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 );
+    return mode;
+#else // GTK < 2.6
+    return wxELLIPSIZE_NONE;
+#endif // GTK 2.6/before
+}

 
 

-    unsigned int model_col = cell->GetOwner()->GetModelColumn();
+void
+wxDataViewRenderer::GtkOnTextEdited(const gchar *itempath, const wxString& str)
+{
+    wxVariant value(str);
+    if (!Validate( value ))
+        return;
+
+    wxDataViewItem
+        item(GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(itempath)));

 
 

-    model->SetValue( value, item, model_col );
-    model->ValueChanged( item, model_col );
+    GtkOnCellChanged(value, item, GetOwner()->GetModelColumn());

 }
 
 }
 

-IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer)
+void
+wxDataViewRenderer::GtkOnCellChanged(const wxVariant& value,
+                                     const wxDataViewItem& item,
+                                     unsigned col)
+{
+    wxDataViewModel *model = GetOwner()->GetOwner()->GetModel();
+    model->ChangeValue( value, item, col );
+}

 
 

-wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode,
-                                                int align ) :
-    wxDataViewRenderer( varianttype, mode, align )
+// ---------------------------------------------------------
+// wxDataViewTextRenderer
+// ---------------------------------------------------------
+
+extern "C"

 {
 {

-    m_renderer = (GtkCellRenderer*) gtk_cell_renderer_text_new();

 
 

-    if (mode & wxDATAVIEW_CELL_EDITABLE)
-    {
+static void wxGtkTextRendererEditedCallback( GtkCellRendererText *WXUNUSED(renderer),
+    gchar *arg1, gchar *arg2, gpointer user_data )
+{
+    wxDataViewRenderer *cell = (wxDataViewRenderer*) user_data;
+
+    cell->GtkOnTextEdited(arg1, wxGTK_CONV_BACK_FONT(
+                arg2, cell->GetOwner()->GetOwner()->GetFont()));
+}
+
+}
+
+namespace
+{
+
+// 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
+
+    return !usingDefaultAttrs;
+}
+
+} // anonymous namespace
+
+IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer)
+
+wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode,
+                                                int align ) :
+    wxDataViewRenderer( varianttype, mode, align )
+{
+    GtkWxCellRendererText *text_renderer = gtk_wx_cell_renderer_text_new();
+    text_renderer->wx_renderer = this;
+    m_renderer = (GtkCellRenderer*) text_renderer;
+
+    if (mode & wxDATAVIEW_CELL_EDITABLE)
+    {

         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_BOOLEAN );
         g_value_set_boolean( &gvalue, true );
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_BOOLEAN );
         g_value_set_boolean( &gvalue, true );


@@ -1596,29 +2098,25 @@ wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxD
     SetAlignment(align);
 }
 
     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 );
     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;
 }
 
     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 );
 {
     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 ), const_cast<wxDataViewTextRenderer*>(this)->GetOwner()->GetOwner()->GetFont() );
+    str = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ), const_cast<wxDataViewTextRenderer*>(this)->GetOwner()->GetOwner()->GetFont() );

     g_value_unset( &gvalue );
 
     g_value_unset( &gvalue );
 

-    value = tmp;
-

     return true;
 }
 
     return true;
 }
 


@@ -1643,29 +2141,42 @@ void wxDataViewTextRenderer::SetAlignment( int align )
     g_value_unset( &gvalue );
 }
 
     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
 // ---------------------------------------------------------
 
 }
 
 // ---------------------------------------------------------
 // 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 )
 {
 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);
 
     SetMode(mode);
     SetAlignment(align);


@@ -1678,38 +2189,23 @@ bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value )
         wxBitmap bitmap;
         bitmap << 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
 }
 
 bool wxDataViewBitmapRenderer::GetValue( wxVariant &WXUNUSED(value) ) const


@@ -1744,18 +2240,14 @@ static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
     if (!cell->Validate( value ))
         return;
 
     if (!cell->Validate( value ))
         return;
 

-    wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel();
+    wxDataViewCtrl * const ctrl = cell->GetOwner()->GetOwner();
+    wxDataViewModel *model = ctrl->GetModel();

 
 

-    GtkTreePath *gtk_path = gtk_tree_path_new_from_string( path );
-    GtkTreeIter iter;
-    cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, gtk_path );
-    wxDataViewItem item( (void*) iter.user_data );;
-    gtk_tree_path_free( gtk_path );
+    wxDataViewItem item(ctrl->GTKPathToItem(wxGtkTreePath(path)));

 
     unsigned int model_col = cell->GetOwner()->GetModelColumn();
 
 
     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)
 }
 
 IMPLEMENT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer)


@@ -1826,9 +2318,9 @@ public:
 
         m_window = window;
 
 
         m_window = window;
 

-        m_context = window->GtkGetPangoDefaultContext();
+        m_context = window->GTKGetPangoDefaultContext();

         m_layout = pango_layout_new( m_context );
         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 );
 
 
         m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget );
 


@@ -1853,9 +2345,10 @@ public:
 IMPLEMENT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
 
 wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
 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;
 {
     m_dc = NULL;
     m_text_renderer = NULL;


@@ -1866,40 +2359,54 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
         Init(mode, align);
 }
 
         Init(mode, align);
 }
 

-void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset,
-                                           wxRect WXUNUSED(cell), wxDC *WXUNUSED(dc), int WXUNUSED(state) )
+void wxDataViewCustomRenderer::GtkInitTextRenderer()
+{
+    m_text_renderer = GTK_CELL_RENDERER_TEXT(gtk_cell_renderer_text_new());
+    g_object_ref_sink(m_text_renderer);
+
+    GtkApplyAlignment(GTK_CELL_RENDERER(m_text_renderer));
+}
+
+GtkCellRendererText *wxDataViewCustomRenderer::GtkGetTextRenderer() const
+{
+    if ( !m_text_renderer )
+    {
+        // we create it on demand so need to do it even from a const function
+        const_cast<wxDataViewCustomRenderer *>(this)->GtkInitTextRenderer();
+    }
+
+    return m_text_renderer;
+}
+
+void wxDataViewCustomRenderer::RenderText( const wxString &text,
+                                           int xoffset,
+                                           wxRect cell,
+                                           wxDC *WXUNUSED(dc),
+                                           int WXUNUSED(state) )

 {
 {

-#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();
+
+    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() ) );
 
     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 );
 
     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)
 }
 
 bool wxDataViewCustomRenderer::Init(wxDataViewCellMode mode, int align)


@@ -1923,7 +2430,7 @@ wxDataViewCustomRenderer::~wxDataViewCustomRenderer()
         delete m_dc;
 
     if (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()
 }
 
 wxDC *wxDataViewCustomRenderer::GetDC()


@@ -1958,15 +2465,20 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label,
     {
         m_renderer = (GtkCellRenderer*) gtk_cell_renderer_progress_new();
 
     {
         m_renderer = (GtkCellRenderer*) gtk_cell_renderer_progress_new();
 

-        GValue gvalue = { 0, };
-        g_value_init( &gvalue, G_TYPE_STRING );
-
-        g_value_set_string( &gvalue, wxGTK_CONV_FONT( m_label, GetOwner()->GetOwner()->GetFont() ) );
-        g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
-        g_value_unset( &gvalue );
-

         SetMode(mode);
         SetAlignment(align);
         SetMode(mode);
         SetAlignment(align);

+
+#if !wxUSE_UNICODE
+        // We can't initialize the renderer just yet because we don't have the
+        // pointer to the column that uses this renderer yet and so attempt to
+        // dereference GetOwner() to get the font that is used as a source of
+        // encoding in multibyte-to-Unicode conversion in GTKSetLabel() in
+        // non-Unicode builds would crash. So simply remember to do it later.
+        if ( !m_label.empty() )
+            m_needsToSetLabel = true;
+        else
+#endif // !wxUSE_UNICODE
+            GTKSetLabel();

     }
     else
 #endif
     }
     else
 #endif


@@ -1980,11 +2492,36 @@ wxDataViewProgressRenderer::~wxDataViewProgressRenderer()
 {
 }
 
 {
 }
 

+void wxDataViewProgressRenderer::GTKSetLabel()
+{
+    GValue gvalue = { 0, };
+    g_value_init( &gvalue, G_TYPE_STRING );
+
+    // Take care to not use GetOwner() here if the label is empty, we can be
+    // called from ctor when GetOwner() is still NULL in this case.
+    g_value_set_string( &gvalue,
+                        m_label.empty() ? ""
+                                        : wxGTK_CONV_FONT(m_label,
+                                            GetOwner()->GetOwner()->GetFont())
+                      );
+    g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
+    g_value_unset( &gvalue );
+
+#if !wxUSE_UNICODE
+    m_needsToSetLabel = false;
+#endif // !wxUSE_UNICODE
+}
+

 bool wxDataViewProgressRenderer::SetValue( const wxVariant &value )
 {
 #ifdef __WXGTK26__
     if (!gtk_check_version(2,6,0))
     {
 bool wxDataViewProgressRenderer::SetValue( const wxVariant &value )
 {
 #ifdef __WXGTK26__
     if (!gtk_check_version(2,6,0))
     {

+#if !wxUSE_UNICODE
+        if ( m_needsToSetLabel )
+            GTKSetLabel();
+#endif // !wxUSE_UNICODE
+

         gint tmp = (long) value;
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_INT );
         gint tmp = (long) value;
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_INT );


@@ -2046,9 +2583,12 @@ wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString &choices
         m_renderer = (GtkCellRenderer*) gtk_cell_renderer_combo_new();
 
         GtkListStore *store = gtk_list_store_new( 1, G_TYPE_STRING );
         m_renderer = (GtkCellRenderer*) gtk_cell_renderer_combo_new();
 
         GtkListStore *store = gtk_list_store_new( 1, G_TYPE_STRING );

-        size_t n;
-        for (n = 0; n < m_choices.GetCount(); n++)
-            gtk_list_store_insert_with_values( store, NULL, n, 0, m_choices[n].utf8_str(), -1 );
+        for (size_t n = 0; n < m_choices.GetCount(); n++)
+        {
+            gtk_list_store_insert_with_values(
+                store, NULL, n, 0,
+                static_cast<const char *>(m_choices[n].utf8_str()), -1 );
+        }

 
         g_object_set (m_renderer,
                 "model", store,
 
         g_object_set (m_renderer,
                 "model", store,


@@ -2092,7 +2632,9 @@ bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value )
     {
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_STRING );
     {
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_STRING );

-        g_value_set_string( &gvalue, wxGTK_CONV_FONT( value.GetString(), GetOwner()->GetOwner()->GetFont() ) );
+        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 );
     }
         g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
         g_value_unset( &gvalue );
     }


@@ -2111,10 +2653,13 @@ bool wxDataViewChoiceRenderer::GetValue( wxVariant &value ) const
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_STRING );
         g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_STRING );
         g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );

-        wxString temp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ), const_cast<wxDataViewTextRenderer*>(this)->GetOwner()->GetOwner()->GetFont() );
+        wxString temp = wxGTK_CONV_BACK_FONT(g_value_get_string(&gvalue),
+                                             GetOwner()->GetOwner()->GetFont());

         g_value_unset( &gvalue );
         value = temp;
         g_value_unset( &gvalue );
         value = temp;

-        wxPrintf( "temp %s\n", temp );
+
+        //wxPrintf( "temp %s\n", temp );
+        // TODO: remove this code

     }
     else
 #endif
     }
     else
 #endif


@@ -2144,6 +2689,45 @@ void wxDataViewChoiceRenderer::SetAlignment( int align )
     g_value_unset( &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;
+
+    wxDataViewItem
+        item(GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(itempath)));
+
+    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
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxDataViewDateRenderer
 // ---------------------------------------------------------


@@ -2186,10 +2770,7 @@ END_EVENT_TABLE()
 
 void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event )
 {
 
 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();
 }
 
     DismissAndNotify();
 }
 


@@ -2231,7 +2812,7 @@ wxSize wxDataViewDateRenderer::GetSize() const
     return wxSize(x,y+d);
 }
 
     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;
                                        const wxDataViewItem &item, unsigned int col )
 {
     wxVariant variant;


@@ -2255,67 +2836,63 @@ bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *m
 
 IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer)
 
 
 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()
 {
 }
 
 }
 
 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;
 }
 
 
     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);

 }
 
 // ---------------------------------------------------------
 }
 
 // ---------------------------------------------------------


@@ -2356,14 +2933,8 @@ gtk_dataview_header_button_press_callback( GtkWidget *WXUNUSED(widget),
     return FALSE;
 }
 
     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,
 
 static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column),
                             GtkCellRenderer *renderer,


@@ -2382,148 +2953,76 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column),
 
     if (!wx_model->IsVirtualListModel())
     {
 
     if (!wx_model->IsVirtualListModel())
     {

-
-    if (wx_model->IsContainer( item ))
-    {
-        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
         {
         }
         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 );
         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 );
         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())
     }
 
     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() );
         wxLogError( wxT("Wrong type, required: %s but: %s"),
                     value.GetType().c_str(),
                     cell->GetVariantType().c_str() );

+    }

 
     cell->SetValue( value );
 
 
     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 );
-        }
+    // deal with disabled items
+    bool enabled = wx_model->IsEnabled( item, cell->GetOwner()->GetModelColumn() );

 
 

-        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 );
-        }
+    // 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 );

 
 

-        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 );
-        }
-    }
+    // b) this actually disables the control/renderer
+    if (enabled)
+        cell->SetMode( cell->GtkGetMode() );
+    else
+        cell->SetMode( wxDATAVIEW_CELL_INERT );
+        

 
 

-#if 0
-    if (attr.HasBackgroundColour())
-    {
-        wxColour colour = attr.GetBackgroundColour();
-        const GdkColor * const gcol = colour.GetColor();
+    // 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;

 
 

-        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
+    // it can support attributes so check if this item has any
+    wxDataViewItemAttr attr;
+    if ( wx_model->GetAttr( item, cell->GetOwner()->GetModelColumn(), attr )
+            || !cell->GtkIsUsingDefaultAttrs() )

     {
     {

-        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 );
+        bool usingDefaultAttrs = !cell->GtkSetAttr(attr);
+        cell->GtkSetUsingDefaultAttrs(usingDefaultAttrs);

     }
     }

-#endif
-
+    // else: no custom attributes specified and we're already using the default
+    //       ones -- nothing to do
+    

 }
 
 }
 

+} // extern "C"
+

 #include <wx/listimpl.cpp>
 WX_DEFINE_LIST(wxDataViewColumnList)
 
 #include <wx/listimpl.cpp>
 WX_DEFINE_LIST(wxDataViewColumnList)
 


@@ -2551,7 +3050,6 @@ void wxDataViewColumn::Init(wxAlignment align, int flags, int width)
 {
     m_isConnected = false;
 
 {
     m_isConnected = false;
 

-    GtkCellRenderer *renderer = (GtkCellRenderer *) GetRenderer()->GetGtkHandle();

     GtkTreeViewColumn *column = gtk_tree_view_column_new();
     m_column = (GtkWidget*) column;
 
     GtkTreeViewColumn *column = gtk_tree_view_column_new();
     m_column = (GtkWidget*) column;
 


@@ -2570,10 +3068,13 @@ void wxDataViewColumn::Init(wxAlignment align, int flags, int width)
     gtk_box_pack_end( GTK_BOX(box), GTK_WIDGET(m_label), FALSE, FALSE, 1 );
     gtk_tree_view_column_set_widget( column, box );
 
     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 );
+    wxDataViewRenderer * const colRenderer = GetRenderer();
+    GtkCellRenderer * const cellRenderer = colRenderer->GetGtkHandle();

 
 

-    gtk_tree_view_column_set_cell_data_func( column, renderer,
-        wxGtkTreeCellDataFunc, (gpointer) GetRenderer(), NULL );
+    colRenderer->GtkPackIntoColumn(column);
+
+    gtk_tree_view_column_set_cell_data_func( column, cellRenderer,
+        wxGtkTreeCellDataFunc, (gpointer) colRenderer, NULL );

 }
 
 void wxDataViewColumn::OnInternalIdle()
 }
 
 void wxDataViewColumn::OnInternalIdle()


@@ -2581,7 +3082,7 @@ void wxDataViewColumn::OnInternalIdle()
     if (m_isConnected)
         return;
 
     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)
     {
         GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
         if (column->button)


@@ -2589,6 +3090,9 @@ void wxDataViewColumn::OnInternalIdle()
             g_signal_connect(column->button, "button_press_event",
                       G_CALLBACK (gtk_dataview_header_button_press_callback), this);
 
             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;
         }
     }
             m_isConnected = true;
         }
     }


@@ -2626,7 +3130,7 @@ void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap )
 {
     wxDataViewColumnBase::SetBitmap( bitmap );
 
 {
     wxDataViewColumnBase::SetBitmap( bitmap );
 

-    if (bitmap.Ok())
+    if (bitmap.IsOk())

     {
         GtkImage *gtk_image = GTK_IMAGE(m_image);
 
     {
         GtkImage *gtk_image = GTK_IMAGE(m_image);
 


@@ -2657,9 +3161,9 @@ void wxDataViewColumn::SetHidden( bool hidden )
     gtk_tree_view_column_set_visible( GTK_TREE_VIEW_COLUMN(m_column), !hidden );
 }
 
     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::SetAlignment( wxAlignment align )


@@ -2775,23 +3279,20 @@ int wxDataViewColumn::GetWidth() const
 
 void wxDataViewColumn::SetWidth( int width )
 {
 
 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 );
         gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_AUTOSIZE );

-#endif

     }
     else
     {
     }
     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 );
     }
 }
         gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), width );
     }
 }


@@ -2810,6 +3311,36 @@ bool wxDataViewColumn::IsReorderable() const
 // wxGtkTreeModelNode
 //-----------------------------------------------------------------------------
 
 // 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( wxDataViewItem(**data1), wxDataViewItem(**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();
 void wxGtkTreeModelNode::Resort()
 {
     size_t child_count = GetChildCount();


@@ -2818,24 +3349,78 @@ void wxGtkTreeModelNode::Resort()
 
     size_t node_count = GetNodesCount();
 
 
     size_t node_count = GetNodesCount();
 

-    if (child_count == 1)
+    if (child_count == 1)
+    {
+        if (node_count == 1)
+        {
+            wxGtkTreeModelNode *node = m_nodes.Item( 0 );
+            node->Resort();
+        }
+        return;
+    }
+
+    gint *new_order = new gint[child_count];
+
+#if 1
+    // m_children has the original *void
+    // ptrs points to these
+    wxGtkTreeModelChildrenPtr ptrs;
+    size_t i;
+    for (i = 0; i < child_count; i++)
+       ptrs.Add( &(m_children[i]) );
+    // Sort the ptrs
+    gs_internal = m_internal;
+    ptrs.Sort( &wxGtkTreeModelChildPtrCmp );
+
+    wxGtkTreeModelChildren temp;
+    void** base_ptr = &(m_children[0]);
+    // Transfer positions to new_order array and
+    // IDs to temp
+    for (i = 0; i < child_count; i++)
+    {
+        new_order[i] = ptrs[i] - base_ptr;
+        temp.Add( *ptrs[i] );
+    }
+
+    // Transfer IDs back to m_children
+    m_children.Clear();
+    WX_APPEND_ARRAY( temp, m_children );
+#endif
+#if 0
+    // Too slow
+
+    // Build up array with IDs and original positions
+    wxGtkTreeModelChildWithPos* temp = new wxGtkTreeModelChildWithPos[child_count];
+    size_t i;
+    for (i = 0; i < child_count; i++)

     {
     {

-        if (node_count == 1)
-        {
-            wxGtkTreeModelNode *node = m_nodes.Item( 0 );
-            node->Resort();
-        }
-        return;
+       temp[i].pos = i;
+       temp[i].id = m_children[i];

     }
     }

+    // Sort array keeping original positions
+    wxQsort( temp, child_count, sizeof(wxGtkTreeModelChildWithPos),
+             &wxGtkTreeModelChildWithPosCmp, m_internal );
+    // Transfer positions to new_order array and
+    // IDs to m_children
+    m_children.Clear();
+    for (i = 0; i < child_count; i++)
+    {
+       new_order[i] = temp[i].pos;
+       m_children.Add( temp[i].id );
+    }
+    // Delete array
+    delete [] temp;
+#endif
+
+#if 0
+    // Too slow

 
     wxGtkTreeModelChildren temp;
     WX_APPEND_ARRAY( temp, m_children );
 
 
     wxGtkTreeModelChildren temp;
     WX_APPEND_ARRAY( temp, m_children );
 

-    g_internal = m_internal;
+    gs_internal = m_internal;

     m_children.Sort( &wxGtkTreeModelChildCmp );
 
     m_children.Sort( &wxGtkTreeModelChildCmp );
 

-    gint *new_order = new gint[child_count];
-

     unsigned int pos;
     for (pos = 0; pos < child_count; pos++)
     {
     unsigned int pos;
     for (pos = 0; pos < child_count; pos++)
     {


@@ -2843,6 +3428,7 @@ void wxGtkTreeModelNode::Resort()
         int old_pos = temp.Index( id );
         new_order[pos] = old_pos;
     }
         int old_pos = temp.Index( id );
         new_order[pos] = old_pos;
     }

+#endif

 
     GtkTreeModel *gtk_tree_model = GTK_TREE_MODEL( m_internal->GetGtkModel() );
 
 
     GtkTreeModel *gtk_tree_model = GTK_TREE_MODEL( m_internal->GetGtkModel() );
 


@@ -2850,14 +3436,12 @@ void wxGtkTreeModelNode::Resort()
     iter.user_data = GetItem().GetID();
     iter.stamp = m_internal->GetGtkModel()->stamp;
 
     iter.user_data = GetItem().GetID();
     iter.stamp = m_internal->GetGtkModel()->stamp;
 

-    GtkTreePath *path = m_internal->get_path( &iter );
-
-    gtk_tree_model_rows_reordered( gtk_tree_model, path, &iter, new_order );
-
-    gtk_tree_path_free (path);
+    gtk_tree_model_rows_reordered( gtk_tree_model,
+            wxGtkTreePath(m_internal->get_path(&iter)), &iter, new_order );

 
     delete [] new_order;
 
 
     delete [] new_order;
 

+    unsigned int pos;

     for (pos = 0; pos < node_count; pos++)
     {
         wxGtkTreeModelNode *node = m_nodes.Item( pos );
     for (pos = 0; pos < node_count; pos++)
     {
         wxGtkTreeModelNode *node = m_nodes.Item( pos );


@@ -2869,32 +3453,65 @@ void wxGtkTreeModelNode::Resort()
 // wxDataViewCtrlInternal
 //-----------------------------------------------------------------------------
 
 // 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_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_dataview_sort_column = NULL;
     m_root = NULL;
     m_sort_order = GTK_SORT_ASCENDING;
     m_sort_column = -1;
     m_dataview_sort_column = NULL;

-    
+

     m_dragDataObject = NULL;
     m_dropDataObject = NULL;
 
     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();
     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()
 {
 }
 
 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 );
     g_object_unref( m_gtk_model );

-    
+

     delete m_dragDataObject;
     delete m_dropDataObject;
 }
 
     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;
 void wxDataViewCtrlInternal::InitTree()
 {
     wxDataViewItem item;


@@ -2909,6 +3526,7 @@ void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node )
     {
         wxDataViewItemArray children;
         unsigned int count = m_wx_model->GetChildren( node->GetItem(), children );
     {
         wxDataViewItemArray children;
         unsigned int count = m_wx_model->GetChildren( node->GetItem(), children );

+

         unsigned int pos;
         for (pos = 0; pos < count; pos++)
         {
         unsigned int pos;
         for (pos = 0; pos < count; pos++)
         {


@@ -2930,14 +3548,29 @@ bool wxDataViewCtrlInternal::EnableDragSource( const wxDataFormat &format )
 {
     wxGtkString atom_str( gdk_atom_name( format  ) );
     m_dragSourceTargetEntryTarget = wxCharBuffer( atom_str );
 {
     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<guint>(-1);
     m_dragSourceTargetEntry.target =  m_dragSourceTargetEntryTarget.data();
     m_dragSourceTargetEntry.flags = 0;
     m_dragSourceTargetEntry.info = static_cast<guint>(-1);

-    
+

     gtk_tree_view_enable_model_drag_source( GTK_TREE_VIEW(m_owner->GtkGetTreeView() ),
        GDK_BUTTON1_MASK, &m_dragSourceTargetEntry, 1, (GdkDragAction) GDK_ACTION_COPY );
     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<guint>(-1);
+
+    gtk_tree_view_enable_model_drag_dest( GTK_TREE_VIEW(m_owner->GtkGetTreeView() ),
+       &m_dropTargetTargetEntry, 1, (GdkDragAction) GDK_ACTION_COPY );
+

     return true;
 }
 
     return true;
 }
 


@@ -2945,26 +3578,31 @@ gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag
     GtkTreePath *path )
 {
     delete m_dragDataObject;
     GtkTreePath *path )
 {
     delete m_dragDataObject;

-    
-    GtkTreeIter iter;
-    if (!get_iter( &iter, path )) return FALSE;
-    wxDataViewItem item( (void*) iter.user_data );
+    m_dragDataObject = NULL;
+
+    wxDataViewItem item(GetOwner()->GTKPathToItem(path));
+    if ( !item )
+        return FALSE;

 
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() );
 
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() );

+    event.SetEventObject( m_owner );

     event.SetItem( item );
     event.SetModel( m_wx_model );
     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 (!m_owner->HandleWindowEvent( event ))
         return FALSE;

-        
+

     if (!event.IsAllowed())
         return FALSE;
     if (!event.IsAllowed())
         return FALSE;

-        
+

     wxDataObject *obj = event.GetDataObject();
     if (!obj)
         return FALSE;
     wxDataObject *obj = event.GetDataObject();
     if (!obj)
         return FALSE;

-    
+

     m_dragDataObject = obj;
     m_dragDataObject = obj;

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -2978,25 +3616,26 @@ wxDataViewCtrlInternal::drag_data_delete(GtkTreeDragSource *WXUNUSED(drag_source
 gboolean wxDataViewCtrlInternal::drag_data_get( GtkTreeDragSource *WXUNUSED(drag_source),
     GtkTreePath *path, GtkSelectionData *selection_data )
 {
 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 );
+    wxDataViewItem item(GetOwner()->GTKPathToItem(path));
+    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;
 
         return FALSE;
 

-    size_t size = m_dragDataObject->GetDataSize( selection_data->target );
+    size_t size = m_dragDataObject->GetDataSize(target);

     if (size == 0)
         return FALSE;
     if (size == 0)
         return FALSE;

-       
+

     void *buf = malloc( size );
     void *buf = malloc( size );

-    
+

     gboolean res = FALSE;
     gboolean res = FALSE;

-    if (m_dragDataObject->GetDataHere( selection_data->target, buf ))
+    if (m_dragDataObject->GetDataHere(target, buf))

     {
         res = TRUE;
     {
         res = TRUE;

-    
-        gtk_selection_data_set( selection_data, selection_data->target,
+
+        gtk_selection_data_set(selection_data, target,

             8, (const guchar*) buf, size );
     }
 
             8, (const guchar*) buf, size );
     }
 


@@ -3007,18 +3646,50 @@ gboolean wxDataViewCtrlInternal::drag_data_get( GtkTreeDragSource *WXUNUSED(drag
 
 gboolean
 wxDataViewCtrlInternal::drag_data_received(GtkTreeDragDest *WXUNUSED(drag_dest),
 
 gboolean
 wxDataViewCtrlInternal::drag_data_received(GtkTreeDragDest *WXUNUSED(drag_dest),

-                                           GtkTreePath *WXUNUSED(dest),
-                                           GtkSelectionData *WXUNUSED(selection_data))
+                                           GtkTreePath *path,
+                                           GtkSelectionData *selection_data)

 {
 {

-    return FALSE;
+    wxDataViewItem item(GetOwner()->GTKPathToItem(path));
+    if ( !item )
+        return FALSE;
+
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, m_owner->GetId() );
+    event.SetEventObject( m_owner );
+    event.SetItem( item );
+    event.SetModel( m_wx_model );
+    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;
+
+    if (!event.IsAllowed())
+        return FALSE;
+
+    return TRUE;

 }
 
 gboolean
 wxDataViewCtrlInternal::row_drop_possible(GtkTreeDragDest *WXUNUSED(drag_dest),
 }
 
 gboolean
 wxDataViewCtrlInternal::row_drop_possible(GtkTreeDragDest *WXUNUSED(drag_dest),

-                                          GtkTreePath *WXUNUSED(dest_path),
-                                          GtkSelectionData *WXUNUSED(selection_data))
+                                          GtkTreePath *path,
+                                          GtkSelectionData *selection_data)

 {
 {

-    return FALSE;
+    wxDataViewItem item(GetOwner()->GTKPathToItem(path));
+    if ( !item )
+        return FALSE;
+
+    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(gtk_selection_data_get_target(selection_data));
+    if (!m_owner->HandleWindowEvent( event ))
+        return FALSE;
+
+    if (!event.IsAllowed())
+        return FALSE;
+
+    return TRUE;

 }
 
 // notifications from wxDataViewModel
 }
 
 // notifications from wxDataViewModel


@@ -3028,13 +3699,12 @@ bool wxDataViewCtrlInternal::Cleared()
     if (m_root)
     {
         delete m_root;
     if (m_root)
     {
         delete m_root;

-        InitTree();
+        m_root = NULL;

     }
 
     }
 

-    // Create new GTK model
-    g_object_unref( m_gtk_model );
-    m_gtk_model = wxgtk_tree_model_new();
-    m_gtk_model->internal = this;
+    InitTree();
+
+    ScheduleRefresh();

 
     return true;
 }
 
     return true;
 }


@@ -3043,6 +3713,8 @@ void wxDataViewCtrlInternal::Resort()
 {
     if (!m_wx_model->IsVirtualListModel())
         m_root->Resort();
 {
     if (!m_wx_model->IsVirtualListModel())
         m_root->Resort();

+
+    ScheduleRefresh();

 }
 
 bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
 }
 
 bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )


@@ -3050,12 +3722,17 @@ bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDa
     if (!m_wx_model->IsVirtualListModel())
     {
         wxGtkTreeModelNode *parent_node = FindNode( parent );
     if (!m_wx_model->IsVirtualListModel())
     {
         wxGtkTreeModelNode *parent_node = FindNode( parent );

+        wxASSERT_MSG(parent_node,
+            "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel");
+

         if (m_wx_model->IsContainer( item ))
             parent_node->AddNode( new wxGtkTreeModelNode( parent_node, item, this ) );
         else
             parent_node->AddLeave( item.GetID() );
     }
 
         if (m_wx_model->IsContainer( item ))
             parent_node->AddNode( new wxGtkTreeModelNode( parent_node, item, this ) );
         else
             parent_node->AddLeave( item.GetID() );
     }
 

+    ScheduleRefresh();
+

     return true;
 }
 
     return true;
 }
 


@@ -3064,9 +3741,14 @@ bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wx
     if (!m_wx_model->IsVirtualListModel())
     {
         wxGtkTreeModelNode *parent_node = FindNode( parent );
     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() );
     }
 
         parent_node->DeleteChild( item.GetID() );
     }
 

+    ScheduleRefresh();
+

     return true;
 }
 
     return true;
 }
 


@@ -3081,13 +3763,13 @@ bool wxDataViewCtrlInternal::ItemChanged( const wxDataViewItem &item )
     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() );
 {
     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 );
 
     event.SetItem( item );
     m_owner->HandleWindowEvent( event );
 


@@ -3098,26 +3780,32 @@ bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned
 
 GtkTreeModelFlags wxDataViewCtrlInternal::get_flags()
 {
 
 GtkTreeModelFlags wxDataViewCtrlInternal::get_flags()
 {

-    if (m_wx_model->IsVirtualListModel())
-        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 )
 {
 }
 
 gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path )
 {

+

     if (m_wx_model->IsVirtualListModel())
     {
     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];
 
 
         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;
             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;
     }
 
         return TRUE;
     }


@@ -3164,12 +3852,19 @@ gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path
 
 GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter )
 {
 
 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->IsVirtualListModel())
     {
     GtkTreePath *retval = gtk_tree_path_new ();
 
     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
         gtk_tree_path_append_index (retval, i);
     }
     else


@@ -3195,30 +3890,43 @@ gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter )
 {
     if (m_wx_model->IsVirtualListModel())
     {
 {
     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)
 
         if (n == -1)

+        {
+            iter->user_data = NULL;

             return FALSE;
             return FALSE;

+        }

 
 

-        if (n >= (int) wx_model->GetLastIndex())
+        if (n >= (int) wx_model->GetCount()-1)
+        {
+            iter->user_data = NULL;

             return FALSE;
             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 )
     }
     else
     {
         wxGtkTreeModelNode *parent = FindParentNode( iter );
         if( parent == NULL )

+        {
+            iter->user_data = NULL;

             return FALSE;
             return FALSE;

+        }

 
         int pos = parent->GetChildren().Index( iter->user_data );
 
         if (pos == (int) parent->GetChildCount()-1)
 
         int pos = parent->GetChildren().Index( iter->user_data );
 
         if (pos == (int) parent->GetChildCount()-1)

+        {
+            iter->user_data = NULL;

             return FALSE;
             return FALSE;

+        }

 
 

-        iter->stamp = m_gtk_model->stamp;

         iter->user_data = parent->GetChildren().Item( pos+1 );
     }
 
         iter->user_data = parent->GetChildren().Item( pos+1 );
     }
 


@@ -3234,18 +3942,32 @@ gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *
             return FALSE;
 
         iter->stamp = m_gtk_model->stamp;
             return FALSE;
 
         iter->stamp = m_gtk_model->stamp;

-        iter->user_data = (gpointer) -1;
+        iter->user_data = (gpointer) 1;

 
         return TRUE;
     }
     else
     {
 
         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 );
 
         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)
         BuildBranch( parent_node );
 
         if (parent_node->GetChildCount() == 0)


@@ -3262,11 +3984,19 @@ gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter )
 {
     if (m_wx_model->IsVirtualListModel())
     {
 {
     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
     {
         // 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 );
         wxDataViewItem item( (void*) iter->user_data );
 
         bool is_container = m_wx_model->IsContainer( item );


@@ -3275,6 +4005,9 @@ gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter )
             return FALSE;
 
         wxGtkTreeModelNode *node = FindNode( 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);
         BuildBranch( node );
 
         return (node->GetChildCount() > 0);


@@ -3285,24 +4018,28 @@ gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter )
 {
     if (m_wx_model->IsVirtualListModel())
     {
 {
     if (m_wx_model->IsVirtualListModel())
     {

-        wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
+        wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model;

 
         if (iter == NULL)
 
         if (iter == NULL)

-            return (gint) wx_model->GetLastIndex() + 1;
+            return (gint) wx_model->GetCount();

 
         return 0;
     }
     else
     {
 
         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 );
         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();
     }
 
         return parent_node->GetChildCount();
     }


@@ -3312,7 +4049,7 @@ gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter
 {
     if (m_wx_model->IsVirtualListModel())
     {
 {
     if (m_wx_model->IsVirtualListModel())
     {

-        wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
+        wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model;

 
         if (parent)
             return FALSE;
 
         if (parent)
             return FALSE;


@@ -3320,11 +4057,12 @@ gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter
         if (n < 0)
             return FALSE;
 
         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;
             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;
     }
 
         return TRUE;
     }


@@ -3338,9 +4076,10 @@ gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter
             return FALSE;
 
         wxGtkTreeModelNode *parent_node = FindNode( parent );
             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 );
 
         iter->stamp = m_gtk_model->stamp;
         iter->user_data = parent_node->GetChildren().Item( n );


@@ -3368,6 +4107,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 )
 {
 static wxGtkTreeModelNode*
 wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item )
 {


@@ -3391,7 +4152,7 @@ wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *tr
         if( node && node->GetNodes().GetCount() != 0 )
         {
             int len = node->GetNodes().GetCount();
         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 ++)
             {
             int j = 0;
             for( ; j < len; j ++)
             {


@@ -3425,12 +4186,15 @@ wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( GtkTreeIter *iter )
 
     wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item );
 
 
     wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item );
 

+/*

     if (!result)
     {
         wxLogDebug( "Not found %p", iter->user_data );
         char *crash = NULL;
         *crash = 0;
     }
     if (!result)
     {
         wxLogDebug( "Not found %p", iter->user_data );
         char *crash = NULL;
         *crash = 0;
     }

+    // TODO: remove this code
+*/

 
     return result;
 }
 
     return result;
 }


@@ -3442,12 +4206,15 @@ wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( const wxDataViewItem &item
 
     wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item );
 
 
     wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item );
 

+/*

     if (!result)
     {
         wxLogDebug( "Not found %p", item.GetID() );
         char *crash = NULL;
         *crash = 0;
     }
     if (!result)
     {
         wxLogDebug( "Not found %p", item.GetID() );
         char *crash = NULL;
         *crash = 0;
     }

+    // TODO: remove this code
+*/

 
     return result;
 }
 
     return result;
 }


@@ -3533,7 +4300,7 @@ wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( const wxDataViewItem
 static void
 wxdataview_selection_changed_callback( GtkTreeSelection* WXUNUSED(selection), wxDataViewCtrl *dv )
 {
 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() );
         return;
 
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, dv->GetId() );


@@ -3548,9 +4315,7 @@ wxdataview_row_activated_callback( GtkTreeView* WXUNUSED(treeview), GtkTreePath
 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, dv->GetId() );
 
 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, dv->GetId() );
 

-    GtkTreeIter iter;
-    dv->GtkGetInternal()->get_iter( &iter, path );
-    wxDataViewItem item( (void*) iter.user_data );;
+    wxDataViewItem item(dv->GTKPathToItem(path));

     event.SetItem( item );
     event.SetModel( dv->GetModel() );
     dv->HandleWindowEvent( event );
     event.SetItem( item );
     event.SetModel( dv->GetModel() );
     dv->HandleWindowEvent( event );


@@ -3617,7 +4382,7 @@ void wxDataViewCtrl::AddChildGTK(wxWindowGTK* child)
     GtkWidget* treeview = GtkGetTreeView();
 
     // Insert widget in GtkTreeView
     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 );
         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 );


@@ -3667,14 +4432,14 @@ gtk_dataview_motion_notify_callback( GtkWidget *WXUNUSED(widget),
         gdk_event->y = y;
     }
 
         gdk_event->y = y;
     }
 

-    GtkTreePath *path = NULL;
+    wxGtkTreePath path;

     GtkTreeViewColumn *column = NULL;
     gint cell_x = 0;
     gint cell_y = 0;
     if (gtk_tree_view_get_path_at_pos(
         GTK_TREE_VIEW(dv->GtkGetTreeView()),
         (int) gdk_event->x, (int) gdk_event->y,
     GtkTreeViewColumn *column = NULL;
     gint cell_x = 0;
     gint cell_y = 0;
     if (gtk_tree_view_get_path_at_pos(
         GTK_TREE_VIEW(dv->GtkGetTreeView()),
         (int) gdk_event->x, (int) gdk_event->y,

-        &path,
+        path.ByRef(),

         &column,
         &cell_x,
         &cell_y))
         &column,
         &cell_x,
         &cell_y))


@@ -3683,10 +4448,6 @@ gtk_dataview_motion_notify_callback( GtkWidget *WXUNUSED(widget),
         {
             GtkTreeIter iter;
             dv->GtkGetInternal()->get_iter( &iter, path );
         {
             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 );

         }
     }
 
         }
     }
 


@@ -3705,30 +4466,24 @@ gtk_dataview_button_press_callback( GtkWidget *WXUNUSED(widget),
 {
     if ((gdk_event->button == 3) && (gdk_event->type == GDK_BUTTON_PRESS))
     {
 {
     if ((gdk_event->button == 3) && (gdk_event->type == GDK_BUTTON_PRESS))
     {

-        GtkTreePath *path = NULL;
+        wxGtkTreePath path;

         GtkTreeViewColumn *column = NULL;
         gint cell_x = 0;
         gint cell_y = 0;
         if (gtk_tree_view_get_path_at_pos(
             GTK_TREE_VIEW(dv->GtkGetTreeView()),
             (int) gdk_event->x, (int) gdk_event->y,
         GtkTreeViewColumn *column = NULL;
         gint cell_x = 0;
         gint cell_y = 0;
         if (gtk_tree_view_get_path_at_pos(
             GTK_TREE_VIEW(dv->GtkGetTreeView()),
             (int) gdk_event->x, (int) gdk_event->y,

-            &path,
+            path.ByRef(),

             &column,
             &cell_x,
             &cell_y))
         {
             if (path)
             {
             &column,
             &cell_x,
             &cell_y))
         {
             if (path)
             {

-                GtkTreeIter iter;
-                dv->GtkGetInternal()->get_iter( &iter, path );
-

                 wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, dv->GetId() );
                 wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, dv->GetId() );

-                wxDataViewItem item( (void*) iter.user_data );;
-                event.SetItem( item );
+                event.SetItem(dv->GTKPathToItem(path));

                 event.SetModel( dv->GetModel() );
                 event.SetModel( dv->GetModel() );

-                bool ret = dv->HandleWindowEvent( event );
-                gtk_tree_path_free( path );
-                return ret;
+                return dv->HandleWindowEvent( event );

              }
         }
     }
              }
         }
     }


@@ -3740,34 +4495,46 @@ IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
 
 wxDataViewCtrl::~wxDataViewCtrl()
 {
 
 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()
 {
 
     delete m_internal;
 }
 
 void wxDataViewCtrl::Init()
 {

-    m_notifier = NULL;

     m_internal = NULL;
 
     m_cols.DeleteContents( true );
     m_internal = NULL;
 
     m_cols.DeleteContents( true );

+
+    m_uniformRowHeight = -1;

 }
 
 }
 

-bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos, const wxSize& size,
-           long style, const wxValidator& validator )
+bool wxDataViewCtrl::Create(wxWindow *parent,
+                            wxWindowID id,
+                            const wxPoint& pos,
+                            const wxSize& size,
+                            long style,
+                            const wxValidator& validator,
+                            const wxString& name)

 {
 {

-    Init();
-

     if (!PreCreation( parent, pos, size ) ||
     if (!PreCreation( parent, pos, size ) ||

-        !CreateBase( parent, id, pos, size, style, validator ))
+        !CreateBase( parent, id, pos, size, style, validator, name ))

     {
         wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") );
         return false;
     {
         wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") );
         return false;


@@ -3776,7 +4543,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
     m_widget = gtk_scrolled_window_new (NULL, NULL);
     g_object_ref(m_widget);
 
     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);
 
     m_treeview = gtk_tree_view_new();
     gtk_container_add (GTK_CONTAINER (m_widget), m_treeview);


@@ -3821,7 +4588,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_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 );
     gtk_widget_show (m_treeview);
 
     m_parent->DoAddChild( this );


@@ -3854,10 +4621,20 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
     return true;
 }
 
     return true;
 }
 

+wxDataViewItem wxDataViewCtrl::GTKPathToItem(GtkTreePath *path) const
+{
+    GtkTreeIter iter;
+    return wxDataViewItem(path && m_internal->get_iter(&iter, path)
+                            ? iter.user_data
+                            : NULL);
+}
+

 void wxDataViewCtrl::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();
 
 void wxDataViewCtrl::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();
 

+    m_internal->OnInternalIdle();
+

     unsigned int cols = GetColumnCount();
     unsigned int i;
     for (i = 0; i < cols; i++)
     unsigned int cols = GetColumnCount();
     unsigned int i;
     for (i = 0; i < cols; i++)


@@ -3865,18 +4642,21 @@ void wxDataViewCtrl::OnInternalIdle()
         wxDataViewColumn *col = GetColumn( i );
         col->OnInternalIdle();
     }
         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 )
 {
 }
 
 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;
 
     if (!wxDataViewCtrlBase::AssociateModel( model ))
         return false;


@@ -3889,18 +4669,7 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
     }
 #endif
 
     }
 #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 true;
 }


@@ -3910,6 +4679,11 @@ bool wxDataViewCtrl::EnableDragSource( const wxDataFormat &format )
     return m_internal->EnableDragSource( 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))
 bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
 {
     if (!wxDataViewCtrlBase::AppendColumn(col))


@@ -3981,10 +4755,9 @@ unsigned int wxDataViewCtrl::GetColumnCount() const
     return m_cols.GetCount();
 }
 
     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;
         return NULL;
 
     wxDataViewColumnList::const_iterator iter;


@@ -3997,9 +4770,18 @@ wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
         }
     }
 
         }
     }
 

+    wxFAIL_MSG( "No matching column?" );
+

     return NULL;
 }
 
     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),
 bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
 {
     gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview),


@@ -4027,7 +4809,7 @@ bool wxDataViewCtrl::ClearColumns()
 
 int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
 {
 
 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) );
 
 
     GList *list = gtk_tree_view_get_columns( GTK_TREE_VIEW(m_treeview) );
 


@@ -4047,29 +4829,88 @@ void wxDataViewCtrl::Expand( const wxDataViewItem & item )
 {
     GtkTreeIter iter;
     iter.user_data = item.GetID();
 {
     GtkTreeIter iter;
     iter.user_data = item.GetID();

-    GtkTreePath *path = m_internal->get_path( &iter );
+    wxGtkTreePath path(m_internal->get_path( &iter ));

     gtk_tree_view_expand_row( GTK_TREE_VIEW(m_treeview), path, false );
     gtk_tree_view_expand_row( GTK_TREE_VIEW(m_treeview), path, false );

-    gtk_tree_path_free( path );

 }
 
 void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
 {
     GtkTreeIter iter;
     iter.user_data = item.GetID();
 }
 
 void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
 {
     GtkTreeIter iter;
     iter.user_data = item.GetID();

-    GtkTreePath *path = m_internal->get_path( &iter );
+    wxGtkTreePath path(m_internal->get_path( &iter ));

     gtk_tree_view_collapse_row( GTK_TREE_VIEW(m_treeview), path );
     gtk_tree_view_collapse_row( GTK_TREE_VIEW(m_treeview), path );

-    gtk_tree_path_free( path );

 }
 
 bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
 {
     GtkTreeIter iter;
     iter.user_data = item.GetID();
 }
 
 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 );
+    wxGtkTreePath path(m_internal->get_path( &iter ));
+    return gtk_tree_view_row_expanded( GTK_TREE_VIEW(m_treeview), path );
+}
+
+wxDataViewItem wxDataViewCtrl::DoGetCurrentItem() const
+{
+    // The tree doesn't have any current item if it hadn't been created yet but
+    // it's arguably not an error to call this function in this case so just
+    // return an invalid item without asserting.
+    if ( !m_treeview )
+        return wxDataViewItem();
+
+    wxGtkTreePath path;
+    gtk_tree_view_get_cursor(GTK_TREE_VIEW(m_treeview), path.ByRef(), NULL);
+
+    return GTKPathToItem(path);
+}
+
+void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item)
+{
+    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);
+
+    // 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, 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);

     
     

-    return res;
+    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
 }
 
 wxDataViewItem wxDataViewCtrl::GetSelection() const


@@ -4085,14 +4926,13 @@ wxDataViewItem wxDataViewCtrl::GetSelection() const
         if (list)
         {
             GtkTreePath *path = (GtkTreePath*) list->data;
         if (list)
         {
             GtkTreePath *path = (GtkTreePath*) list->data;

-            GtkTreeIter iter;
-            m_internal->get_iter( &iter, path );
+            wxDataViewItem item(GTKPathToItem(path));

 
             // delete list
             g_list_foreach( list, (GFunc) gtk_tree_path_free, NULL );
             g_list_free( list );
 
 
             // delete list
             g_list_foreach( list, (GFunc) gtk_tree_path_free, NULL );
             g_list_free( list );
 

-            return wxDataViewItem( (void*) iter.user_data );
+            return item;

         }
     }
     else
         }
     }
     else


@@ -4100,7 +4940,7 @@ wxDataViewItem wxDataViewCtrl::GetSelection() const
         GtkTreeIter iter;
         if (gtk_tree_selection_get_selected( selection, NULL, &iter ))
         {
         GtkTreeIter iter;
         if (gtk_tree_selection_get_selected( selection, NULL, &iter ))
         {

-            wxDataViewItem item( (void*) iter.user_data );
+            wxDataViewItem item( iter.user_data );

             return item;
         }
     }
             return item;
         }
     }


@@ -4123,10 +4963,7 @@ int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const
         {
             GtkTreePath *path = (GtkTreePath*) list->data;
 
         {
             GtkTreePath *path = (GtkTreePath*) list->data;
 

-            GtkTreeIter iter;
-            m_internal->get_iter( &iter, path );
-
-            sel.Add( wxDataViewItem( (void*) iter.user_data ) );
+            sel.Add(GTKPathToItem(path));

 
             list = g_list_next( list );
             count++;
 
             list = g_list_next( list );
             count++;


@@ -4250,21 +5087,63 @@ void wxDataViewCtrl::UnselectAll()
 void wxDataViewCtrl::EnsureVisible(const wxDataViewItem& item,
                                    const wxDataViewColumn *WXUNUSED(column))
 {
 void wxDataViewCtrl::EnsureVisible(const wxDataViewItem& item,
                                    const wxDataViewColumn *WXUNUSED(column))
 {

+    m_ensureVisibleDefered = item;

     ExpandAncestors(item);
 
     GtkTreeIter iter;
     iter.user_data = (gpointer) item.GetID();
     ExpandAncestors(item);
 
     GtkTreeIter iter;
     iter.user_data = (gpointer) item.GetID();

-    GtkTreePath *path = m_internal->get_path( &iter );
+    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 );
     gtk_tree_view_scroll_to_cell( GTK_TREE_VIEW(m_treeview), path, NULL, false, 0.0, 0.0 );

-    gtk_tree_path_free( path );

 }
 
 }
 

-void wxDataViewCtrl::HitTest(const wxPoint& WXUNUSED(point),
+void wxDataViewCtrl::HitTest(const wxPoint& point,

                              wxDataViewItem& item,
                              wxDataViewColumn *& column) const
 {
                              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
 }
 
 wxRect


@@ -4274,6 +5153,12 @@ wxDataViewCtrl::GetItemRect(const wxDataViewItem& WXUNUSED(item),
     return wxRect();
 }
 
     return wxRect();
 }
 

+bool wxDataViewCtrl::SetRowHeight(int rowHeight)
+{
+    m_uniformRowHeight = rowHeight;
+    return true;
+}
+

 void wxDataViewCtrl::DoSetExpanderColumn()
 {
     gtk_tree_view_set_expander_column( GTK_TREE_VIEW(m_treeview),
 void wxDataViewCtrl::DoSetExpanderColumn()
 {
     gtk_tree_view_set_expander_column( GTK_TREE_VIEW(m_treeview),


@@ -4298,6 +5183,10 @@ void wxDataViewCtrl::GtkEnableSelectionEvents()
                             G_CALLBACK (wxdataview_selection_changed_callback), this);
 }
 
                             G_CALLBACK (wxdataview_selection_changed_callback), this);
 }
 

+// ----------------------------------------------------------------------------
+// visual attributes stuff
+// ----------------------------------------------------------------------------
+

 // static
 wxVisualAttributes
 wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 // static
 wxVisualAttributes
 wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))


@@ -4305,9 +5194,12 @@ wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
     return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new);
 }
 
     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