]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/dataview.cpp
add GetLo/Hi() test
[wxWidgets.git] / src / gtk / dataview.cpp
index f8b13806ccb3da1c14293e9fde01905678643b52..697d1cf9cc962e13636c5ae6394a53e7375b295a 100644 (file)
     #include "wx/log.h"
     #include "wx/dcclient.h"
     #include "wx/sizer.h"
+    #include "wx/icon.h"
+    #include "wx/list.h"
+    #include "wx/settings.h"
+    #include "wx/dataobj.h"
+    #include "wx/crt.h"
 #endif
 
 #include "wx/stockitem.h"
 #include "wx/calctrl.h"
 #include "wx/popupwin.h"
-#include "wx/icon.h"
-
+#include "wx/listimpl.cpp"
 
 #include "wx/gtk/private.h"
-#include "wx/gtk/win_gtk.h"
+#include "wx/gtk/dc.h"
+#include "wx/gtk/dcclient.h"
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+
+class wxDataViewCtrlInternal;
+
+wxDataViewCtrlInternal *g_internal = NULL;
+
+class wxGtkTreeModelNode;
+
+extern "C" {
+typedef struct _GtkWxTreeModel       GtkWxTreeModel;
+}
+
+//-----------------------------------------------------------------------------
+// wxDataViewCtrlInternal
+//-----------------------------------------------------------------------------
+
+WX_DECLARE_LIST(wxDataViewItem, ItemList);
+WX_DEFINE_LIST(ItemList)
+
+class wxDataViewCtrlInternal
+{
+public:
+    wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model );
+    ~wxDataViewCtrlInternal();
+
+    // model iface
+    GtkTreeModelFlags get_flags();
+    gboolean get_iter( GtkTreeIter *iter, GtkTreePath *path );
+    GtkTreePath *get_path( GtkTreeIter *iter);
+    gboolean iter_next( GtkTreeIter *iter );
+    gboolean iter_children( GtkTreeIter *iter, GtkTreeIter *parent);
+    gboolean iter_has_child( GtkTreeIter *iter );
+    gint iter_n_children( GtkTreeIter *iter );
+    gboolean iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n );
+    gboolean iter_parent( GtkTreeIter *iter, GtkTreeIter *child );
+
+    // dnd iface
+    gboolean row_draggable( GtkTreeDragSource *drag_source, GtkTreePath *path );
+    gboolean drag_data_delete( GtkTreeDragSource *drag_source, GtkTreePath* path );
+    gboolean drag_data_get( GtkTreeDragSource *drag_source, GtkTreePath *path,
+        GtkSelectionData *selection_data );
+    gboolean drag_data_received( GtkTreeDragDest *drag_dest, GtkTreePath *dest,
+        GtkSelectionData *selection_data );
+    gboolean row_drop_possible( GtkTreeDragDest *drag_dest, GtkTreePath *dest_path,
+        GtkSelectionData *selection_data );
+
+    // notifactions from wxDataViewModel
+    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 Cleared();
+    void Resort();
+
+    // sorting interface
+    void SetSortOrder( GtkSortType sort_order ) { m_sort_order = sort_order; }
+    GtkSortType GetSortOrder()                  { return m_sort_order; }
+
+    void SetSortColumn( int column )            { m_sort_column = column; }
+    int GetSortColumn()                         { return m_sort_column; }
+
+    void SetDataViewSortColumn( wxDataViewColumn *column ) { m_dataview_sort_column = column; }
+    wxDataViewColumn *GetDataViewSortColumn()   { return m_dataview_sort_column; }
+
+    bool IsSorted()                             { return (m_sort_column >= 0); }
+
+    // accessors
+    wxDataViewModel* GetDataViewModel() { return m_wx_model; }
+    wxDataViewCtrl* GetOwner()          { return m_owner; }
+    GtkWxTreeModel* GetGtkModel()       { return m_gtk_model; }
+
+protected:
+    void InitTree();
+    wxGtkTreeModelNode *FindNode( const wxDataViewItem &item );
+    wxGtkTreeModelNode *FindNode( GtkTreeIter *iter );
+    wxGtkTreeModelNode *FindParentNode( const wxDataViewItem &item );
+    wxGtkTreeModelNode *FindParentNode( GtkTreeIter *iter );
+    void BuildBranch( wxGtkTreeModelNode *branch );
 
-#include <gobject/gvaluecollector.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreednd.h>
+private:
+    wxGtkTreeModelNode   *m_root;
+    wxDataViewModel      *m_wx_model;
+    GtkWxTreeModel       *m_gtk_model;
+    wxDataViewCtrl       *m_owner;
+    GtkSortType           m_sort_order;
+    wxDataViewColumn     *m_dataview_sort_column;
+    int                   m_sort_column;
+};
 
-#include <gdk/gdkkeysyms.h>
 
 //-----------------------------------------------------------------------------
-// classes
+// wxGtkTreeModelNode
 //-----------------------------------------------------------------------------
 
-class wxDataViewCtrl;
+int LINKAGEMODE wxGtkTreeModelChildCmp( void** id1, void** id2 )
+{
+    int ret = g_internal->GetDataViewModel()->Compare( *id1, *id2,
+        g_internal->GetSortColumn(), (g_internal->GetSortOrder() == GTK_SORT_ASCENDING) );
+
+    return ret;
+}
+
+WX_DEFINE_ARRAY_PTR( wxGtkTreeModelNode*, wxGtkTreeModelNodes );
+WX_DEFINE_ARRAY_PTR( void*, wxGtkTreeModelChildren );
+
+class wxGtkTreeModelNode
+{
+public:
+    wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item,
+      wxDataViewCtrlInternal *internal )
+    {
+        m_parent = parent;
+        m_item = item;
+        m_internal = internal;
+    }
+
+    ~wxGtkTreeModelNode()
+    {
+        size_t count = m_nodes.GetCount();
+        size_t i;
+        for (i = 0; i < count; i++)
+        {
+            wxGtkTreeModelNode *child = m_nodes.Item( i );
+            delete child;
+        }
+    }
+
+    unsigned int AddNode( wxGtkTreeModelNode* child )
+        {
+            m_nodes.Add( child );
+
+            void *id = child->GetItem().GetID();
+
+            m_children.Add( id );
+
+            if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare())
+            {
+                g_internal = m_internal;
+                m_children.Sort( &wxGtkTreeModelChildCmp );
+                return m_children.Index( id );
+            }
+
+            return m_children.GetCount()-1;
+        }
+
+    unsigned int AddLeave( void* id )
+        {
+            m_children.Add( id );
+
+            if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare())
+            {
+                g_internal = m_internal;
+                m_children.Sort( &wxGtkTreeModelChildCmp );
+                return m_children.Index( id );
+            }
+
+            return m_children.GetCount()-1;
+        }
+
+    void DeleteChild( void* id )
+        {
+            m_children.Remove( id );
+
+            unsigned int count = m_nodes.GetCount();
+            unsigned int pos;
+            for (pos = 0; pos < count; pos++)
+            {
+                wxGtkTreeModelNode *node = m_nodes.Item( pos );
+                if (node->GetItem().GetID() == id)
+                {
+                    m_nodes.RemoveAt( pos );
+                    delete node;
+                    break;
+                }
+            }
+
+        }
+
+    wxGtkTreeModelNode* GetParent()
+        { return m_parent; }
+    wxGtkTreeModelNodes &GetNodes()
+        { return m_nodes; }
+    wxGtkTreeModelChildren &GetChildren()
+        { return m_children; }
+
+    unsigned int GetChildCount() { return m_children.GetCount(); }
+    unsigned int GetNodesCount() { return m_nodes.GetCount(); }
+
+    wxDataViewItem &GetItem() { return m_item; }
+    wxDataViewCtrlInternal *GetInternal() { return m_internal; }
+
+    void Resort();
+
+private:
+    wxGtkTreeModelNode         *m_parent;
+    wxGtkTreeModelNodes         m_nodes;
+    wxGtkTreeModelChildren      m_children;
+    wxDataViewItem              m_item;
+    wxDataViewCtrlInternal     *m_internal;
+};
+
 
 //-----------------------------------------------------------------------------
 // data
@@ -50,159 +246,247 @@ class wxDataViewCtrl;
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
-// define new GTK+ class wxGtkListStore
+// define new GTK+ class wxGtkTreeModel
 //-----------------------------------------------------------------------------
 
 extern "C" {
 
-#define GTK_TYPE_WX_LIST_STORE               (gtk_wx_list_store_get_type ())
-#define GTK_WX_LIST_STORE(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_LIST_STORE, GtkWxListStore))
-#define GTK_WX_LIST_STORE_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WX_LIST_STORE, GtkWxListStoreClass))
-#define GTK_IS_WX_LIST_STORE(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_LIST_STORE))
-#define GTK_IS_WX_LIST_STORE_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_LIST_STORE))
-#define GTK_WX_LIST_STORE_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WX_LIST_STORE, GtkWxListStoreClass))
+#define GTK_TYPE_WX_TREE_MODEL               (gtk_wx_tree_model_get_type ())
+#define GTK_WX_TREE_MODEL(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_TREE_MODEL, GtkWxTreeModel))
+#define GTK_WX_TREE_MODEL_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WX_TREE_MODEL, GtkWxTreeModelClass))
+#define GTK_IS_WX_TREE_MODEL(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_TREE_MODEL))
+#define GTK_IS_WX_TREE_MODEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_TREE_MODEL))
+#define GTK_WX_TREE_MODEL_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WX_TREE_MODEL, GtkWxTreeModelClass))
 
-GType         gtk_wx_list_store_get_type         (void);
+GType         gtk_wx_tree_model_get_type         (void);
 
-typedef struct _GtkWxListStore       GtkWxListStore;
-typedef struct _GtkWxListStoreClass  GtkWxListStoreClass;
+typedef struct _GtkWxTreeModelClass  GtkWxTreeModelClass;
 
-struct _GtkWxListStore
+struct _GtkWxTreeModel
 {
   GObject parent;
 
   /*< private >*/
   gint stamp;
-  wxDataViewListModel *model;
+  wxDataViewCtrlInternal *internal;
 };
 
-struct _GtkWxListStoreClass
+struct _GtkWxTreeModelClass
 {
   GObjectClass list_parent_class;
 };
 
-static GtkWxListStore *wxgtk_list_store_new          (void);
-static void         wxgtk_list_store_init            (GtkWxListStore      *list_store);
-static void         wxgtk_list_store_class_init      (GtkWxListStoreClass *klass);
-static void         wxgtk_list_store_tree_model_init (GtkTreeModelIface *iface);
-static void         wxgtk_list_store_finalize        (GObject           *object);
-static GtkTreeModelFlags wxgtk_list_store_get_flags  (GtkTreeModel      *tree_model);
-static gint         wxgtk_list_store_get_n_columns   (GtkTreeModel      *tree_model);
-static GType        wxgtk_list_store_get_column_type (GtkTreeModel      *tree_model,
+static GtkWxTreeModel *wxgtk_tree_model_new          (void);
+static void         wxgtk_tree_model_init            (GtkWxTreeModel       *tree_model);
+static void         wxgtk_tree_model_class_init      (GtkWxTreeModelClass  *klass);
+
+static void         wxgtk_tree_model_tree_model_init (GtkTreeModelIface       *iface);
+static void         wxgtk_tree_model_sortable_init   (GtkTreeSortableIface    *iface);
+static void         wxgtk_tree_model_drag_source_init(GtkTreeDragSourceIface  *iface);
+static void         wxgtk_tree_model_drag_dest_init  (GtkTreeDragDestIface    *iface);
+
+static void         wxgtk_tree_model_finalize        (GObject           *object);
+static GtkTreeModelFlags wxgtk_tree_model_get_flags  (GtkTreeModel      *tree_model);
+static gint         wxgtk_tree_model_get_n_columns   (GtkTreeModel      *tree_model);
+static GType        wxgtk_tree_model_get_column_type (GtkTreeModel      *tree_model,
                                                       gint               index);
-static gboolean     wxgtk_list_store_get_iter        (GtkTreeModel      *tree_model,
+static gboolean     wxgtk_tree_model_get_iter        (GtkTreeModel      *tree_model,
                                                       GtkTreeIter       *iter,
                                                       GtkTreePath       *path);
-static GtkTreePath *wxgtk_list_store_get_path        (GtkTreeModel      *tree_model,
+static GtkTreePath *wxgtk_tree_model_get_path        (GtkTreeModel      *tree_model,
                                                       GtkTreeIter       *iter);
-static void         wxgtk_list_store_get_value       (GtkTreeModel      *tree_model,
+static void         wxgtk_tree_model_get_value       (GtkTreeModel      *tree_model,
                                                       GtkTreeIter       *iter,
                                                       gint               column,
                                                       GValue            *value);
-static gboolean     wxgtk_list_store_iter_next       (GtkTreeModel      *tree_model,
+static gboolean     wxgtk_tree_model_iter_next       (GtkTreeModel      *tree_model,
                                                       GtkTreeIter       *iter);
-static gboolean     wxgtk_list_store_iter_children   (GtkTreeModel      *tree_model,
+static gboolean     wxgtk_tree_model_iter_children   (GtkTreeModel      *tree_model,
                                                       GtkTreeIter       *iter,
                                                       GtkTreeIter       *parent);
-static gboolean     wxgtk_list_store_iter_has_child  (GtkTreeModel      *tree_model,
+static gboolean     wxgtk_tree_model_iter_has_child  (GtkTreeModel      *tree_model,
                                                       GtkTreeIter       *iter);
-static gint         wxgtk_list_store_iter_n_children (GtkTreeModel      *tree_model,
+static gint         wxgtk_tree_model_iter_n_children (GtkTreeModel      *tree_model,
                                                       GtkTreeIter       *iter);
-static gboolean     wxgtk_list_store_iter_nth_child  (GtkTreeModel      *tree_model,
+static gboolean     wxgtk_tree_model_iter_nth_child  (GtkTreeModel      *tree_model,
                                                       GtkTreeIter       *iter,
                                                       GtkTreeIter       *parent,
                                                       gint               n);
-static gboolean     wxgtk_list_store_iter_parent     (GtkTreeModel      *tree_model,
+static gboolean     wxgtk_tree_model_iter_parent     (GtkTreeModel      *tree_model,
                                                       GtkTreeIter       *iter,
                                                       GtkTreeIter       *child);
 
+/* sortable */
+static gboolean wxgtk_tree_model_get_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);
+static void     wxgtk_tree_model_set_sort_func         (GtkTreeSortable       *sortable,
+                                                        gint                   sort_column_id,
+                                                        GtkTreeIterCompareFunc func,
+                                                        gpointer               data,
+                                                        GtkDestroyNotify       destroy);
+static void     wxgtk_tree_model_set_default_sort_func (GtkTreeSortable       *sortable,
+                                                        GtkTreeIterCompareFunc func,
+                                                        gpointer               data,
+                                                        GtkDestroyNotify       destroy);
+static gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable       *sortable);
+
+/* drag'n'drop */
+static gboolean wxgtk_tree_model_row_draggable         (GtkTreeDragSource     *drag_source,
+                                                        GtkTreePath           *path);
+static gboolean wxgtk_tree_model_drag_data_delete      (GtkTreeDragSource     *drag_source,
+                                                        GtkTreePath           *path);
+static gboolean wxgtk_tree_model_drag_data_get         (GtkTreeDragSource     *drag_source,
+                                                        GtkTreePath           *path,
+                                                        GtkSelectionData      *selection_data);
+static gboolean wxgtk_tree_model_drag_data_received    (GtkTreeDragDest       *drag_dest,
+                                                        GtkTreePath           *dest,
+                                                        GtkSelectionData      *selection_data);
+static gboolean wxgtk_tree_model_row_drop_possible     (GtkTreeDragDest       *drag_dest,
+                                                        GtkTreePath           *dest_path,
+                                                       GtkSelectionData      *selection_data);
+
+
 static GObjectClass *list_parent_class = NULL;
 
 GType
-gtk_wx_list_store_get_type (void)
+gtk_wx_tree_model_get_type (void)
 {
-    static GType list_store_type = 0;
+    static GType tree_model_type = 0;
 
-    if (!list_store_type)
+    if (!tree_model_type)
     {
-        const GTypeInfo list_store_info =
+        const GTypeInfo tree_model_info =
         {
-            sizeof (GtkWxListStoreClass),
+            sizeof (GtkWxTreeModelClass),
             NULL,   /* base_init */
             NULL,   /* base_finalize */
-            (GClassInitFunc) wxgtk_list_store_class_init,
+            (GClassInitFunc) wxgtk_tree_model_class_init,
             NULL,   /* class_finalize */
             NULL,   /* class_data */
-            sizeof (GtkWxListStore),
+            sizeof (GtkWxTreeModel),
             0,
-            (GInstanceInitFunc) wxgtk_list_store_init,
+            (GInstanceInitFunc) wxgtk_tree_model_init,
+        };
+
+        static const GInterfaceInfo tree_model_iface_info =
+        {
+            (GInterfaceInitFunc) wxgtk_tree_model_tree_model_init,
+            NULL,
+            NULL
+        };
+
+        static const GInterfaceInfo sortable_iface_info =
+        {
+            (GInterfaceInitFunc) wxgtk_tree_model_sortable_init,
+            NULL,
+            NULL
         };
 
-      static const GInterfaceInfo tree_model_info =
-      {
-          (GInterfaceInitFunc) wxgtk_list_store_tree_model_init,
-          NULL,
-          NULL
-      };
+        static const GInterfaceInfo drag_source_iface_info =
+        {
+            (GInterfaceInitFunc) wxgtk_tree_model_drag_source_init,
+            NULL,
+            NULL
+        };
 
-      list_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkWxListStore",
-                                                &list_store_info, (GTypeFlags)0 );
+        static const GInterfaceInfo drag_dest_iface_info =
+        {
+            (GInterfaceInitFunc) wxgtk_tree_model_drag_dest_init,
+            NULL,
+            NULL
+        };
 
-      g_type_add_interface_static (list_store_type,
-                                   GTK_TYPE_TREE_MODEL,
-                                   &tree_model_info);
+        tree_model_type = g_type_register_static (G_TYPE_OBJECT, "GtkWxTreeModel",
+                                                &tree_model_info, (GTypeFlags)0 );
+
+        g_type_add_interface_static (tree_model_type,
+                                     GTK_TYPE_TREE_MODEL,
+                                     &tree_model_iface_info);
+        g_type_add_interface_static (tree_model_type,
+                                     GTK_TYPE_TREE_SORTABLE,
+                                     &sortable_iface_info);
+        g_type_add_interface_static (tree_model_type,
+                                     GTK_TYPE_TREE_DRAG_DEST,
+                                     &drag_dest_iface_info);
+        g_type_add_interface_static (tree_model_type,
+                                     GTK_TYPE_TREE_DRAG_SOURCE,
+                                     &drag_source_iface_info);
     }
 
-  return list_store_type;
+    return tree_model_type;
 }
 
-static GtkWxListStore *
-wxgtk_list_store_new(void)
+static GtkWxTreeModel *
+wxgtk_tree_model_new(void)
 {
-    GtkWxListStore *retval = (GtkWxListStore *) g_object_new (GTK_TYPE_WX_LIST_STORE, NULL);
+    GtkWxTreeModel *retval = (GtkWxTreeModel *) g_object_new (GTK_TYPE_WX_TREE_MODEL, NULL);
     return retval;
 }
 
 static void
-wxgtk_list_store_class_init (GtkWxListStoreClass *klass)
+wxgtk_tree_model_class_init (GtkWxTreeModelClass *klass)
 {
     list_parent_class = (GObjectClass*) g_type_class_peek_parent (klass);
     GObjectClass *object_class = (GObjectClass*) klass;
-    object_class->finalize = wxgtk_list_store_finalize;
+    object_class->finalize = wxgtk_tree_model_finalize;
 }
 
 static void
-wxgtk_list_store_tree_model_init (GtkTreeModelIface *iface)
-{
-    iface->get_flags = wxgtk_list_store_get_flags;
-    iface->get_n_columns = wxgtk_list_store_get_n_columns;
-    iface->get_column_type = wxgtk_list_store_get_column_type;
-    iface->get_iter = wxgtk_list_store_get_iter;
-    iface->get_path = wxgtk_list_store_get_path;
-    iface->get_value = wxgtk_list_store_get_value;
-    iface->iter_next = wxgtk_list_store_iter_next;
-    iface->iter_children = wxgtk_list_store_iter_children;
-    iface->iter_has_child = wxgtk_list_store_iter_has_child;
-    iface->iter_n_children = wxgtk_list_store_iter_n_children;
-    iface->iter_nth_child = wxgtk_list_store_iter_nth_child;
-    iface->iter_parent = wxgtk_list_store_iter_parent;
+wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface)
+{
+    iface->get_flags = wxgtk_tree_model_get_flags;
+    iface->get_n_columns = wxgtk_tree_model_get_n_columns;
+    iface->get_column_type = wxgtk_tree_model_get_column_type;
+    iface->get_iter = wxgtk_tree_model_get_iter;
+    iface->get_path = wxgtk_tree_model_get_path;
+    iface->get_value = wxgtk_tree_model_get_value;
+    iface->iter_next = wxgtk_tree_model_iter_next;
+    iface->iter_children = wxgtk_tree_model_iter_children;
+    iface->iter_has_child = wxgtk_tree_model_iter_has_child;
+    iface->iter_n_children = wxgtk_tree_model_iter_n_children;
+    iface->iter_nth_child = wxgtk_tree_model_iter_nth_child;
+    iface->iter_parent = wxgtk_tree_model_iter_parent;
+}
+
+static void
+wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface)
+{
+    iface->get_sort_column_id = wxgtk_tree_model_get_sort_column_id;
+    iface->set_sort_column_id = wxgtk_tree_model_set_sort_column_id;
+    iface->set_sort_func = wxgtk_tree_model_set_sort_func;
+    iface->set_default_sort_func = wxgtk_tree_model_set_default_sort_func;
+    iface->has_default_sort_func = wxgtk_tree_model_has_default_sort_func;
 }
 
 static void
-wxgtk_list_store_init (GtkWxListStore *list_store)
+wxgtk_tree_model_drag_source_init(GtkTreeDragSourceIface  *iface)
 {
-    list_store->model = NULL;
-    list_store->stamp = g_random_int();
+    iface->row_draggable = wxgtk_tree_model_row_draggable;
+    iface->drag_data_delete = wxgtk_tree_model_drag_data_delete;
+    iface->drag_data_get = wxgtk_tree_model_drag_data_get;
 }
 
 static void
-wxgtk_list_store_finalize (GObject *object)
+wxgtk_tree_model_drag_dest_init  (GtkTreeDragDestIface    *iface)
 {
-    /* GtkWxListStore *list_store = GTK_WX_LIST_STORE (object); */
+    iface->drag_data_received = wxgtk_tree_model_drag_data_received;
+    iface->row_drop_possible = wxgtk_tree_model_row_drop_possible;
+}
 
-    /* we need to sort out, which class deletes what */
-    /* delete list_store->model; */
+static void
+wxgtk_tree_model_init (GtkWxTreeModel *tree_model)
+{
+    tree_model->internal = NULL;
+    tree_model->stamp = g_random_int();
+}
 
+static void
+wxgtk_tree_model_finalize (GObject *object)
+{
     /* must chain up */
     (* list_parent_class->finalize) (object);
 }
@@ -210,111 +494,92 @@ wxgtk_list_store_finalize (GObject *object)
 } // extern "C"
 
 //-----------------------------------------------------------------------------
-// implement callbacks from wxGtkListStore class by letting
-// them call the methods of wxWidgets' wxDataViewListModel
+// implement callbacks from wxGtkTreeModel class by letting
+// them call the methods of wxWidgets' wxDataViewModel
 //-----------------------------------------------------------------------------
 
 static GtkTreeModelFlags
-wxgtk_list_store_get_flags (GtkTreeModel *tree_model)
+wxgtk_tree_model_get_flags (GtkTreeModel *tree_model)
 {
-    g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), (GtkTreeModelFlags)0 );
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), (GtkTreeModelFlags)0 );
 
-    // GTK+ list store uses a linked list for storing the
-    // items and a pointer to a child is used as the member
-    // field of a GtkTreeIter. This means that the iter is
-    // valid in the GtkListStore as long as the child exists.
-    // We use the index of the row and since the index of a
-    // specific row will change if a row above is deleted,
-    // the iter does not persist
-    return /* GTK_TREE_MODEL_ITERS_PERSIST | */ GTK_TREE_MODEL_LIST_ONLY;
+    return wxtree_model->internal->get_flags();
 }
 
 static gint
-wxgtk_list_store_get_n_columns (GtkTreeModel *tree_model)
+wxgtk_tree_model_get_n_columns (GtkTreeModel *tree_model)
 {
-    GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
-    g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), 0);
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), 0);
 
-    return list_store->model->GetColumnCount();
+    return wxtree_model->internal->GetDataViewModel()->GetColumnCount();
 }
 
 static GType
-wxgtk_list_store_get_column_type (GtkTreeModel *tree_model,
+wxgtk_tree_model_get_column_type (GtkTreeModel *tree_model,
                                   gint          index)
 {
-    GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
-    g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), G_TYPE_INVALID);
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), G_TYPE_INVALID);
 
     GType gtype = G_TYPE_INVALID;
 
-    wxString wxtype = list_store->model->GetColumnType( (unsigned int) index );
+    wxString wxtype = wxtree_model->internal->GetDataViewModel()->GetColumnType( (unsigned int) index );
 
     if (wxtype == wxT("string"))
         gtype = G_TYPE_STRING;
     else
     {
-        wxFAIL_MSG( _T("non-string columns not supported yet") );
+        gtype = G_TYPE_STRING;
+        // wxFAIL_MSG( _T("non-string columns not supported yet") );
     }
 
     return gtype;
 }
 
 static gboolean
-wxgtk_list_store_get_iter (GtkTreeModel *tree_model,
+wxgtk_tree_model_get_iter (GtkTreeModel *tree_model,
                            GtkTreeIter  *iter,
                            GtkTreePath  *path)
 {
-    GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
-    g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_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 (gtk_tree_path_get_depth (path) > 0, FALSE);
 
-    unsigned int i = (unsigned int)gtk_tree_path_get_indices (path)[0];
-
-    if (i >= list_store->model->GetRowCount())
-        return FALSE;
-
-    iter->stamp = list_store->stamp;
-    // user_data is just the index
-    iter->user_data = (gpointer) i;
-
-    return TRUE;
+    return wxtree_model->internal->get_iter( iter, path );
 }
 
 static GtkTreePath *
-wxgtk_list_store_get_path (GtkTreeModel *tree_model,
+wxgtk_tree_model_get_path (GtkTreeModel *tree_model,
                            GtkTreeIter  *iter)
 {
-    g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), NULL);
-    g_return_val_if_fail (iter->stamp == GTK_WX_LIST_STORE (tree_model)->stamp, NULL);
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), NULL);
+    g_return_val_if_fail (iter->stamp == GTK_WX_TREE_MODEL (wxtree_model)->stamp, NULL);
 
-    GtkTreePath *retval = gtk_tree_path_new ();
-    // user_data is just the index
-    int i = (wxUIntPtr) iter->user_data;
-    gtk_tree_path_append_index (retval, i);
-    return retval;
+    return wxtree_model->internal->get_path( iter );
 }
 
 static void
-wxgtk_list_store_get_value (GtkTreeModel *tree_model,
+wxgtk_tree_model_get_value (GtkTreeModel *tree_model,
                             GtkTreeIter  *iter,
                             gint          column,
                             GValue       *value)
 {
-    GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
-    g_return_if_fail (GTK_IS_WX_LIST_STORE (tree_model) );
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+    g_return_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model) );
 
-    wxDataViewListModel *model = list_store->model;
+    wxDataViewModel *model = wxtree_model->internal->GetDataViewModel();
     wxString mtype = model->GetColumnType( (unsigned int) column );
     if (mtype == wxT("string"))
     {
         wxVariant variant;
         g_value_init( value, G_TYPE_STRING );
-        model->GetValue( variant,
-                         (unsigned int) column,
-                         (unsigned int) iter->user_data );
+        wxDataViewItem item( (void*) iter->user_data );
+        model->GetValue( variant, item, (unsigned int) column );
 
-        // FIXME: we should support different encodings here
-        g_value_set_string( value, wxGTK_CONV_SYS(variant.GetString()) );
+        g_value_set_string( value, variant.GetString().utf8_str() );
     }
     else
     {
@@ -323,96 +588,236 @@ wxgtk_list_store_get_value (GtkTreeModel *tree_model,
 }
 
 static gboolean
-wxgtk_list_store_iter_next (GtkTreeModel  *tree_model,
+wxgtk_tree_model_iter_next (GtkTreeModel  *tree_model,
                             GtkTreeIter   *iter)
 {
-    g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
-    GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
-
-    g_return_val_if_fail (list_store->stamp == iter->stamp, FALSE);
-
-    int n = (wxUIntPtr) iter->user_data;
-
-    if (n == -1)
-        return FALSE;
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
 
-    if (n >= (int) list_store->model->GetRowCount()-1)
-        return FALSE;
+    if (wxtree_model->stamp != iter->stamp)
+       wxPrintf( "crash\n" );
 
-    iter->user_data = (gpointer) ++n;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+    g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE);
 
-    return TRUE;
+    return wxtree_model->internal->iter_next( iter );
 }
 
 static gboolean
-wxgtk_list_store_iter_children (GtkTreeModel *tree_model,
+wxgtk_tree_model_iter_children (GtkTreeModel *tree_model,
                                 GtkTreeIter  *iter,
                                 GtkTreeIter  *parent)
 {
-    g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
-    GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
-
-    // this is a list, nodes have no children
-    if (parent)
-        return 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);
 
-    iter->stamp = list_store->stamp;
-    iter->user_data = (gpointer) -1;
-
-    return TRUE;
+    return wxtree_model->internal->iter_children( iter, parent );
 }
 
 static gboolean
-wxgtk_list_store_iter_has_child (GtkTreeModel *tree_model,
+wxgtk_tree_model_iter_has_child (GtkTreeModel *tree_model,
                                  GtkTreeIter  *iter)
 {
-    return 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 == iter->stamp, FALSE);
+
+    return wxtree_model->internal->iter_has_child( iter );
 }
 
 static gint
-wxgtk_list_store_iter_n_children (GtkTreeModel *tree_model,
+wxgtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
                                   GtkTreeIter  *iter)
 {
-    g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), -1);
-    GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+    g_return_val_if_fail (wxtree_model->stamp == iter->stamp, 0);
 
-    if (iter == NULL)
-        return (gint) list_store->model->GetRowCount();
-
-    g_return_val_if_fail (list_store->stamp == iter->stamp, -1);
-
-    return 0;
+    return wxtree_model->internal->iter_n_children( iter );
 }
 
 static gboolean
-wxgtk_list_store_iter_nth_child (GtkTreeModel *tree_model,
+wxgtk_tree_model_iter_nth_child (GtkTreeModel *tree_model,
                                  GtkTreeIter  *iter,
                                  GtkTreeIter  *parent,
                                  gint          n)
 {
-    g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
-    GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
 
-    if (parent)
-        return FALSE;
+    return wxtree_model->internal->iter_nth_child( iter, parent, n );
+}
 
-    if (n < 0)
-        return FALSE;
+static gboolean
+wxgtk_tree_model_iter_parent (GtkTreeModel *tree_model,
+                              GtkTreeIter  *iter,
+                              GtkTreeIter  *child)
+{
+    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 == child->stamp, FALSE);
 
-    if (n >= (gint) list_store->model->GetRowCount())
-        return FALSE;
+    return wxtree_model->internal->iter_parent( iter, child );
+}
 
-    iter->stamp = list_store->stamp;
-    iter->user_data = (gpointer) n;
+/* drag'n'drop iface */
+static gboolean
+wxgtk_tree_model_row_draggable (GtkTreeDragSource *drag_source,
+                                GtkTreePath       *path)
+{
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
 
-    return TRUE;
+    return wxtree_model->internal->row_draggable( drag_source, path );
 }
 
 static gboolean
-wxgtk_list_store_iter_parent (GtkTreeModel *tree_model,
-                              GtkTreeIter  *iter,
-                              GtkTreeIter  *child)
+wxgtk_tree_model_drag_data_delete (GtkTreeDragSource *drag_source,
+                                   GtkTreePath       *path)
+{
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+
+    return wxtree_model->internal->drag_data_delete( drag_source, path );
+}
+
+static gboolean
+wxgtk_tree_model_drag_data_get (GtkTreeDragSource *drag_source,
+                                GtkTreePath       *path,
+                                GtkSelectionData  *selection_data)
+{
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+
+#if 0
+    wxPrintf( "drag_get_data\n");
+
+    wxGtkString atom_selection(gdk_atom_name(selection_data->selection));
+    wxPrintf( "selection %s\n", wxString::FromAscii(atom_selection) );
+
+    wxGtkString atom_target(gdk_atom_name(selection_data->target));
+    wxPrintf( "target %s\n", wxString::FromAscii(atom_target) );
+
+    wxGtkString atom_type(gdk_atom_name(selection_data->type));
+    wxPrintf( "type %s\n", wxString::FromAscii(atom_type) );
+
+    wxPrintf( "format %d\n", selection_data->format );
+#endif
+
+    return wxtree_model->internal->drag_data_get( drag_source, path, selection_data );
+}
+
+static gboolean
+wxgtk_tree_model_drag_data_received (GtkTreeDragDest  *drag_dest,
+                                     GtkTreePath      *dest,
+                                     GtkSelectionData *selection_data)
+{
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_dest;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+
+    return wxtree_model->internal->drag_data_received( drag_dest, dest, selection_data );
+}
+
+static gboolean
+wxgtk_tree_model_row_drop_possible (GtkTreeDragDest  *drag_dest,
+                                    GtkTreePath      *dest_path,
+                                   GtkSelectionData *selection_data)
+{
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_dest;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+
+    return wxtree_model->internal->row_drop_possible( drag_dest, dest_path, selection_data );
+}
+
+/* sortable iface */
+static gboolean
+wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortable,
+                                     gint            *sort_column_id,
+                                     GtkSortType     *order)
+{
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) sortable;
+
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE);
+
+    if (!wxtree_model->internal->IsSorted())
+    {
+        if (sort_column_id)
+            *sort_column_id = -1;
+
+        return TRUE;
+    }
+
+
+    if (sort_column_id)
+        *sort_column_id = wxtree_model->internal->GetSortColumn();
+
+    if (order)
+        *order = wxtree_model->internal->GetSortOrder();
+
+    return TRUE;
+}
+
+wxDataViewColumn *gs_lastLeftClickHeader = NULL;
+
+static void
+wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable,
+                                     gint             sort_column_id,
+                                     GtkSortType      order)
+{
+    GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable;
+    g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
+
+    tree_model->internal->SetDataViewSortColumn( gs_lastLeftClickHeader );
+
+    if ((sort_column_id != (gint) tree_model->internal->GetSortColumn()) ||
+        (order != tree_model->internal->GetSortOrder()))
+    {
+        tree_model->internal->SetSortColumn( sort_column_id );
+        tree_model->internal->SetSortOrder( order );
+
+        gtk_tree_sortable_sort_column_changed (sortable);
+
+        tree_model->internal->GetDataViewModel()->Resort();
+    }
+
+    if (gs_lastLeftClickHeader)
+    {
+        wxDataViewCtrl *dv = tree_model->internal->GetOwner();
+        wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, dv->GetId() );
+        event.SetDataViewColumn( gs_lastLeftClickHeader );
+        event.SetModel( dv->GetModel() );
+        dv->HandleWindowEvent( event );
+    }
+
+    gs_lastLeftClickHeader = NULL;
+}
+
+static void
+wxgtk_tree_model_set_sort_func (GtkTreeSortable        *sortable,
+                                gint                    WXUNUSED(sort_column_id),
+                                GtkTreeIterCompareFunc  func,
+                                gpointer                WXUNUSED(data),
+                                GtkDestroyNotify        WXUNUSED(destroy) )
+{
+    g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
+    g_return_if_fail (func != NULL);
+}
+
+void     wxgtk_tree_model_set_default_sort_func (GtkTreeSortable          *sortable,
+                                                GtkTreeIterCompareFunc    func,
+                                                gpointer                  WXUNUSED(data),
+                                                GtkDestroyNotify          WXUNUSED(destroy) )
+{
+    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" );
+}
+
+gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable        *sortable)
 {
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE );
+
     return FALSE;
 }
 
@@ -561,17 +966,23 @@ gtk_wx_cell_renderer_new (void)
 
 static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
                         GtkCellRenderer         *renderer,
-                        GdkEvent                *event,
+                        GdkEvent                *WXUNUSED(event),
                         GtkWidget               *widget,
                         const gchar             *path,
-                        GdkRectangle            *background_area,
+                        GdkRectangle            *WXUNUSED(background_area),
                         GdkRectangle            *cell_area,
-                        GtkCellRendererState     flags )
+                        GtkCellRendererState     WXUNUSED(flags) )
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
     wxDataViewCustomRenderer *cell = wxrenderer->cell;
+    
+    // Renderer doesn't support in-place editing
     if (!cell->HasEditorCtrl())
         return NULL;
+        
+    // An in-place editing control is still around
+    if (cell->GetEditorCtrl())
+        return NULL;
 
     GdkRectangle rect;
     gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
@@ -588,20 +999,20 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
 //    wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
     wxRect renderrect( cell_area->x, cell_area->y, cell_area->width, cell_area->height );
 
-    wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
-
     GtkTreePath *treepath = gtk_tree_path_new_from_string( path );
-    unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (treepath)[0];
+    GtkTreeIter iter;
+    cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, treepath );
+    wxDataViewItem item( (void*) iter.user_data );
     gtk_tree_path_free( treepath );
 
-    cell->StartEditing( model_row, renderrect );
+    cell->StartEditing( item, renderrect );
 
     return NULL;
 }
 
 static void
 gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
-                               GtkWidget       *widget,
+                               GtkWidget       *WXUNUSED(widget),
                                GdkRectangle    *cell_area,
                                gint            *x_offset,
                                gint            *y_offset,
@@ -657,6 +1068,13 @@ gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
     wxDataViewCustomRenderer *cell = wxrenderer->cell;
 
+    cell->window = window;
+    cell->widget = widget;
+    cell->background_area = (void*) background_area;
+    cell->cell_area = (void*) cell_area;
+    cell->expose_area = (void*) expose_area;
+    cell->flags = (int) flags;
+
     GdkRectangle rect;
     gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
                                    &rect.x,
@@ -668,16 +1086,17 @@ gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
     rect.y += cell_area->y;
     rect.width  -= renderer->xpad * 2;
     rect.height -= renderer->ypad * 2;
-
+        
     GdkRectangle dummy;
     if (gdk_rectangle_intersect (expose_area, &rect, &dummy))
     {
         wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
         wxWindowDC* dc = (wxWindowDC*) cell->GetDC();
-        if (dc->m_window == NULL)
+        wxWindowDCImpl *impl = (wxWindowDCImpl *) dc->GetImpl();
+        if (impl->m_gdkwindow == NULL)
         {
-            dc->m_window = window;
-            dc->SetUpDC();
+            impl->m_gdkwindow = window;
+            impl->SetUpDC();
         }
 
         int state = 0;
@@ -701,9 +1120,9 @@ gtk_wx_cell_renderer_activate(
                         GdkEvent                *event,
                         GtkWidget               *widget,
                         const gchar             *path,
-                        GdkRectangle            *background_area,
+                        GdkRectangle            *WXUNUSED(background_area),
                         GdkRectangle            *cell_area,
-                        GtkCellRendererState     flags )
+                        GtkCellRendererState     WXUNUSED(flags) )
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
     wxDataViewCustomRenderer *cell = wxrenderer->cell;
@@ -722,10 +1141,13 @@ gtk_wx_cell_renderer_activate(
 
     wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
 
-    wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
+    wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel();
 
     GtkTreePath *treepath = gtk_tree_path_new_from_string( path );
-    unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (treepath)[0];
+
+    GtkTreeIter iter;
+    cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, treepath );
+    wxDataViewItem item( iter.user_data );
     gtk_tree_path_free( treepath );
 
     unsigned int model_col = cell->GetOwner()->GetModelColumn();
@@ -735,7 +1157,7 @@ gtk_wx_cell_renderer_activate(
         bool ret = false;
 
         // activated by <ENTER>
-        if (cell->Activate( renderrect, model, model_col, model_row ))
+        if (cell->Activate( renderrect, model, item, model_col ))
                     ret = true;
 
         return ret;
@@ -749,19 +1171,13 @@ gtk_wx_cell_renderer_activate(
         bool ret = false;
         if (button_event->button == 1)
         {
-            if (cell->LeftClick( pt, renderrect, model, model_col, model_row ))
+            if (cell->LeftClick( pt, renderrect, model, item, model_col ))
                 ret = true;
             // TODO: query system double-click time
             if (button_event->time - wxrenderer->last_click < 400)
-                if (cell->Activate( renderrect, model, model_col, model_row ))
+                if (cell->Activate( renderrect, model, item, model_col ))
                     ret = true;
         }
-        if (button_event->button == 3)
-        {
-            if (cell->RightClick( pt, renderrect, model, model_col, model_row ))
-                ret = true;
-        }
-
         wxrenderer->last_click = button_event->time;
 
         return ret;
@@ -771,173 +1187,158 @@ gtk_wx_cell_renderer_activate(
 }
 
 // ---------------------------------------------------------
-// wxGtkDataViewListModelNotifier
+// wxGtkDataViewModelNotifier
 // ---------------------------------------------------------
 
-class wxGtkDataViewListModelNotifier: public wxDataViewListModelNotifier
+class wxGtkDataViewModelNotifier: public wxDataViewModelNotifier
 {
 public:
-    wxGtkDataViewListModelNotifier( GtkWxListStore* gtk_store, wxDataViewListModel *wx_model );
-
-    virtual bool RowAppended();
-    virtual bool RowPrepended();
-    virtual bool RowInserted( unsigned int before );
-    virtual bool RowDeleted( unsigned int row );
-    virtual bool RowChanged( unsigned int row );
-    virtual bool ValueChanged( unsigned int col, unsigned int row );
-    virtual bool RowsReordered( unsigned int *new_order );
+    wxGtkDataViewModelNotifier( GtkWxTreeModel  *wxgtk_model,
+                                wxDataViewModel *wx_model,
+                                wxDataViewCtrl  *ctrl );
+    ~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 Cleared();
+    virtual void Resort();
 
-    virtual bool Freed()
-    {
-        m_wx_model = NULL;
-        m_gtk_store = NULL;
-        return wxDataViewListModelNotifier::Freed();
-    }
+    void SetGtkModel( GtkWxTreeModel *model ) { m_wxgtk_model = model; }
 
-    GtkWxListStore      *m_gtk_store;
-    wxDataViewListModel *m_wx_model;
+private:
+    GtkWxTreeModel      *m_wxgtk_model;
+    wxDataViewModel     *m_wx_model;
+    wxDataViewCtrl      *m_owner;
 };
 
 // ---------------------------------------------------------
 // wxGtkDataViewListModelNotifier
 // ---------------------------------------------------------
 
-wxGtkDataViewListModelNotifier::wxGtkDataViewListModelNotifier(
-    GtkWxListStore* gtk_store, wxDataViewListModel *wx_model )
+wxGtkDataViewModelNotifier::wxGtkDataViewModelNotifier(
+    GtkWxTreeModel* wxgtk_model, wxDataViewModel *wx_model,
+    wxDataViewCtrl *ctrl )
 {
-    m_gtk_store = gtk_store;
+    m_wxgtk_model = wxgtk_model;
     m_wx_model = wx_model;
+    m_owner = ctrl;
 }
 
-bool wxGtkDataViewListModelNotifier::RowAppended()
+wxGtkDataViewModelNotifier::~wxGtkDataViewModelNotifier()
 {
-    unsigned int pos = m_wx_model->GetRowCount()-1;
-
-    GtkTreeIter iter;
-    iter.stamp = m_gtk_store->stamp;
-    iter.user_data = (gpointer) pos;
-
-    GtkTreePath *path = gtk_tree_path_new ();
-    gtk_tree_path_append_index (path, (gint) pos);
-    gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter);
-    gtk_tree_path_free (path);
-
-    return true;
+    m_wx_model = NULL;
+    m_wxgtk_model = NULL;
 }
 
-bool wxGtkDataViewListModelNotifier::RowPrepended()
+bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
 {
+    m_owner->GtkGetInternal()->ItemAdded( parent, item );
+
     GtkTreeIter iter;
-    iter.stamp = m_gtk_store->stamp;
-    iter.user_data = (gpointer) 0;
+    iter.stamp = m_wxgtk_model->stamp;
+    iter.user_data = (gpointer) item.GetID();
 
-    GtkTreePath *path = gtk_tree_path_new ();
-    gtk_tree_path_append_index (path, (gint) 0);
-    gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter);
+    GtkTreePath *path = wxgtk_tree_model_get_path(
+        GTK_TREE_MODEL(m_wxgtk_model), &iter );
+    gtk_tree_model_row_inserted(
+        GTK_TREE_MODEL(m_wxgtk_model), path, &iter);
     gtk_tree_path_free (path);
 
     return true;
 }
 
-bool wxGtkDataViewListModelNotifier::RowInserted( unsigned int before )
+bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
 {
     GtkTreeIter iter;
-    iter.stamp = m_gtk_store->stamp;
-    iter.user_data = (gpointer) before;
+    iter.stamp = m_wxgtk_model->stamp;
+    iter.user_data = (gpointer) item.GetID();
 
-    GtkTreePath *path = gtk_tree_path_new ();
-    gtk_tree_path_append_index (path, (gint) before);
-    gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter);
+    GtkTreePath *path = wxgtk_tree_model_get_path(
+        GTK_TREE_MODEL(m_wxgtk_model), &iter );
+    gtk_tree_model_row_deleted(
+        GTK_TREE_MODEL(m_wxgtk_model), path );
     gtk_tree_path_free (path);
 
+    m_owner->GtkGetInternal()->ItemDeleted( parent, item );
+
     return true;
 }
 
-bool wxGtkDataViewListModelNotifier::RowDeleted( unsigned int row )
+void wxGtkDataViewModelNotifier::Resort()
 {
-    GtkTreePath *path = gtk_tree_path_new ();
-    gtk_tree_path_append_index (path, (gint) row);
-    gtk_tree_model_row_deleted (GTK_TREE_MODEL (m_gtk_store), path);
-    gtk_tree_path_free (path);
-
-    return true;
+    m_owner->GtkGetInternal()->Resort();
 }
 
-bool wxGtkDataViewListModelNotifier::RowChanged( unsigned int row )
+bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item )
 {
     GtkTreeIter iter;
-    iter.stamp = m_gtk_store->stamp;
-    iter.user_data = (gpointer) row;
-    GtkTreePath *path = gtk_tree_model_get_path (GTK_TREE_MODEL (m_gtk_store), &iter);
-    gtk_tree_model_row_changed (GTK_TREE_MODEL (m_gtk_store), path, &iter);
+    iter.stamp = m_wxgtk_model->stamp;
+    iter.user_data = (gpointer) item.GetID();
+
+    GtkTreePath *path = wxgtk_tree_model_get_path(
+        GTK_TREE_MODEL(m_wxgtk_model), &iter );
+    gtk_tree_model_row_changed(
+        GTK_TREE_MODEL(m_wxgtk_model), path, &iter );
     gtk_tree_path_free (path);
 
+    m_owner->GtkGetInternal()->ItemChanged( item );
+
     return true;
 }
 
-bool wxGtkDataViewListModelNotifier::ValueChanged( unsigned int model_col, unsigned int model_row )
+bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsigned int model_col )
 {
     // This adds GTK+'s missing MVC logic for ValueChanged
-    wxObjectList::compatibility_iterator
-        node = GetOwner()->m_viewingColumns.GetFirst();
-    while (node)
+    unsigned int index;
+    for (index = 0; index < m_owner->GetColumnCount(); index++)
     {
-        wxDataViewViewingColumn* viewing_column = (wxDataViewViewingColumn*) node->GetData();
-        if (viewing_column->m_modelColumn == model_col)
+        wxDataViewColumn *column = m_owner->GetColumn( index );
+        if (column->GetModelColumn() == model_col)
         {
-            GtkTreeView *widget = GTK_TREE_VIEW(viewing_column->m_viewColumn->GetOwner()->m_treeview);
-            GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(viewing_column->m_viewColumn->GetGtkHandle());
+            GtkTreeView *widget = GTK_TREE_VIEW(m_owner->m_treeview);
+            GtkTreeViewColumn *gcolumn = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle());
 
             // Get cell area
-            GtkTreePath *path = gtk_tree_path_new();
-            gtk_tree_path_append_index( path, model_row );
+            GtkTreeIter iter;
+            iter.stamp = m_wxgtk_model->stamp;
+            iter.user_data = (gpointer) item.GetID();
+            GtkTreePath *path = wxgtk_tree_model_get_path(
+                GTK_TREE_MODEL(m_wxgtk_model), &iter );
             GdkRectangle cell_area;
-            gtk_tree_view_get_cell_area( widget, path, column, &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 );
             int xdiff = (int) d;
 
-            int ydiff = column->button->allocation.height;
+            int ydiff = gcolumn->button->allocation.height;
             // Redraw
             gtk_widget_queue_draw_area( GTK_WIDGET(widget),
                 cell_area.x - xdiff, ydiff + cell_area.y, cell_area.width, cell_area.height );
-        }
 
-        node = node->GetNext();
+            m_owner->GtkGetInternal()->ValueChanged( item, model_col );
+
+            return true;
+        }
     }
 
-    return true;
+    return false;
 }
 
-bool wxGtkDataViewListModelNotifier::RowsReordered( unsigned int *new_order )
+bool wxGtkDataViewModelNotifier::Cleared()
 {
-    // Assume sizeof(unsigned int)= == sizeof(gint)
+    gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->m_treeview), NULL );
 
-    GtkTreePath *path = gtk_tree_path_new ();
-    gtk_tree_model_rows_reordered (GTK_TREE_MODEL (m_gtk_store), path, NULL, (gint*)new_order);
-    gtk_tree_path_free (path);
-
-    // This adds GTK+'s missing MVC logic for RowsReordered
-    wxObjectList::compatibility_iterator
-        node = GetOwner()->m_viewingColumns.GetFirst();
-    while (node)
-    {
-        wxDataViewViewingColumn* viewing_column = (wxDataViewViewingColumn*) node->GetData();
-        GtkTreeView *widget = GTK_TREE_VIEW(viewing_column->m_viewColumn->GetOwner()->m_treeview);
-        // Doesn't work yet...
-        gtk_widget_queue_draw( GTK_WIDGET(widget) );
+    // this will create a new GTK model
+    m_owner->GtkGetInternal()->Cleared();
 
-        node = node->GetNext();
-    }
+    SetGtkModel( m_owner->GtkGetInternal()->GetGtkModel() );
 
-    return true;
-}
+    gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->m_treeview), GTK_TREE_MODEL(m_wxgtk_model) );
 
-bool wxGtkDataViewListModelNotifier::Cleared()
-{
     return false;
 }
 
@@ -945,6 +1346,51 @@ bool wxGtkDataViewListModelNotifier::Cleared()
 // wxDataViewRenderer
 // ---------------------------------------------------------
 
+static gpointer s_user_data = NULL;
+
+static void
+wxgtk_cell_editable_editing_done( GtkCellEditable *WXUNUSED(editable),
+                                  wxDataViewRenderer *wxrenderer )
+{
+    wxDataViewColumn *column = wxrenderer->GetOwner();
+    wxDataViewCtrl *dv = column->GetOwner();
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, dv->GetId() );
+    event.SetDataViewColumn( column );
+    event.SetModel( dv->GetModel() );
+    wxDataViewItem item( s_user_data );
+    event.SetItem( item );
+    dv->HandleWindowEvent( event );
+}
+
+static void
+wxgtk_renderer_editing_started( GtkCellRenderer *WXUNUSED(cell), GtkCellEditable *editable,
+                                gchar *path, wxDataViewRenderer *wxrenderer )
+{
+    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 );
+    event.SetItem( item );
+    dv->HandleWindowEvent( event );
+
+    if (GTK_IS_CELL_EDITABLE(editable))
+    {
+        s_user_data = iter.user_data;
+
+        g_signal_connect (GTK_CELL_EDITABLE (editable), "editing_done",
+            G_CALLBACK (wxgtk_cell_editable_editing_done),
+            (gpointer) wxrenderer );
+
+    }
+}
+
+
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase)
 
 wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode,
@@ -957,22 +1403,39 @@ wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewC
     //       after the m_renderer pointer has been initialized
 }
 
-void wxDataViewRenderer::SetMode( wxDataViewCellMode mode )
+void wxDataViewRenderer::GtkInitHandlers()
 {
-    GtkCellRendererMode gtkMode;
-    switch (mode)
+    if (!gtk_check_version(2,6,0))
     {
-    case wxDATAVIEW_CELL_INERT:
-        gtkMode = GTK_CELL_RENDERER_MODE_INERT;
-        break;
-    case wxDATAVIEW_CELL_ACTIVATABLE:
-        gtkMode = GTK_CELL_RENDERER_MODE_ACTIVATABLE;
-        break;
-    case wxDATAVIEW_CELL_EDITABLE:
-        gtkMode = GTK_CELL_RENDERER_MODE_EDITABLE;
-        break;
+        g_signal_connect (GTK_CELL_RENDERER(m_renderer), "editing_started",
+                   G_CALLBACK (wxgtk_renderer_editing_started),
+                   this);
     }
+}
 
+void wxDataViewRenderer::SetMode( wxDataViewCellMode mode )
+{
+    GtkCellRendererMode gtkMode;
+    switch (mode)
+    {
+        case wxDATAVIEW_CELL_INERT:
+            gtkMode = GTK_CELL_RENDERER_MODE_INERT;
+            break;
+
+        case wxDATAVIEW_CELL_ACTIVATABLE:
+            gtkMode = GTK_CELL_RENDERER_MODE_ACTIVATABLE;
+            break;
+
+        case wxDATAVIEW_CELL_EDITABLE:
+            gtkMode = GTK_CELL_RENDERER_MODE_EDITABLE;
+            break;
+
+        default:
+            wxFAIL_MSG( "unknown wxDataViewCellMode value" );
+            return;
+    }
+
+    // This value is most often ignored in GtkTreeView
     GValue gvalue = { 0, };
     g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() );
     g_value_set_enum( &gvalue, gtkMode );
@@ -989,15 +1452,21 @@ wxDataViewCellMode wxDataViewRenderer::GetMode() const
 
     switch (g_value_get_enum(&gvalue))
     {
-    case GTK_CELL_RENDERER_MODE_INERT:
-        ret = wxDATAVIEW_CELL_INERT;
-        break;
-    case GTK_CELL_RENDERER_MODE_ACTIVATABLE:
-        ret = wxDATAVIEW_CELL_ACTIVATABLE;
-        break;
-    case GTK_CELL_RENDERER_MODE_EDITABLE:
-        ret = wxDATAVIEW_CELL_EDITABLE;
-        break;
+        default:
+            wxFAIL_MSG( "unknown GtkCellRendererMode value" );
+            // fall through (we have to return something)
+
+        case GTK_CELL_RENDERER_MODE_INERT:
+            ret = wxDATAVIEW_CELL_INERT;
+            break;
+
+        case GTK_CELL_RENDERER_MODE_ACTIVATABLE:
+            ret = wxDATAVIEW_CELL_ACTIVATABLE;
+            break;
+
+        case GTK_CELL_RENDERER_MODE_EDITABLE:
+            ret = wxDATAVIEW_CELL_EDITABLE;
+            break;
     }
 
     g_value_unset( &gvalue );
@@ -1005,8 +1474,21 @@ wxDataViewCellMode wxDataViewRenderer::GetMode() const
     return ret;
 }
 
-void wxDataViewRenderer::SetAlignment( int align )
+void wxDataViewRenderer::GtkUpdateAlignment()
 {
+    int align = m_alignment;
+    
+    // query alignment from column ?
+    if (align == -1)
+    {
+        // None there yet
+        if (GetOwner() == NULL)
+            return;
+        
+        align = GetOwner()->GetAlignment();
+        align |= wxALIGN_CENTRE_VERTICAL;
+    }
+    
     // horizontal alignment:
 
     gfloat xalign = 0.0;
@@ -1036,40 +1518,16 @@ void wxDataViewRenderer::SetAlignment( int align )
     g_value_unset( &gvalue2 );
 }
 
-int wxDataViewRenderer::GetAlignment() const
+void wxDataViewRenderer::SetAlignment( int align )
 {
-    int ret = 0;
-    GValue gvalue;
-
-    // horizontal alignment:
-
-    g_object_get( G_OBJECT(m_renderer), "xalign", &gvalue, NULL );
-    float xalign = g_value_get_float( &gvalue );
-    if (xalign < 0.5)
-        ret |= wxALIGN_LEFT;
-    else if (xalign == 0.5)
-        ret |= wxALIGN_CENTER_HORIZONTAL;
-    else
-        ret |= wxALIGN_RIGHT;
-    g_value_unset( &gvalue );
-
-
-    // vertical alignment:
-
-    g_object_get( G_OBJECT(m_renderer), "yalign", &gvalue, NULL );
-    float yalign = g_value_get_float( &gvalue );
-    if (yalign < 0.5)
-        ret |= wxALIGN_TOP;
-    else if (yalign == 0.5)
-        ret |= wxALIGN_CENTER_VERTICAL;
-    else
-        ret |= wxALIGN_BOTTOM;
-    g_value_unset( &gvalue );
-
-    return ret;
+    m_alignment = align;
+    GtkUpdateAlignment();
 }
 
-
+int wxDataViewRenderer::GetAlignment() const
+{
+    return m_alignment;
+}
 
 // ---------------------------------------------------------
 // wxDataViewTextRenderer
@@ -1080,7 +1538,7 @@ static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
     gchar *arg1, gchar *arg2, gpointer user_data );
 }
 
-static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
+static void wxGtkTextRendererEditedCallback( GtkCellRendererText *WXUNUSED(renderer),
     gchar *arg1, gchar *arg2, gpointer user_data )
 {
     wxDataViewTextRenderer *cell = (wxDataViewTextRenderer*) user_data;
@@ -1090,16 +1548,18 @@ static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
     if (!cell->Validate( value ))
         return;
 
-    wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
+    wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel();
 
     GtkTreePath *path = gtk_tree_path_new_from_string( arg1 );
-    unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (path)[0];
+    GtkTreeIter iter;
+    cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, path );
+    wxDataViewItem item( (void*) iter.user_data );;
     gtk_tree_path_free( path );
 
     unsigned int model_col = cell->GetOwner()->GetModelColumn();
 
-    model->SetValue( value, model_col, model_row );
-    model->ValueChanged( model_col, model_row );
+    model->SetValue( value, item, model_col );
+    model->ValueChanged( item, model_col );
 }
 
 IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer)
@@ -1108,7 +1568,7 @@ wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxD
                                                 int align ) :
     wxDataViewRenderer( varianttype, mode, align )
 {
-    m_renderer = (GtkWidget*) gtk_cell_renderer_text_new();
+    m_renderer = (GtkCellRenderer*) gtk_cell_renderer_text_new();
 
     if (mode & wxDATAVIEW_CELL_EDITABLE)
     {
@@ -1119,6 +1579,8 @@ wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxD
         g_value_unset( &gvalue );
 
         g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this );
+
+        GtkInitHandlers();
     }
 
     SetMode(mode);
@@ -1143,8 +1605,7 @@ bool wxDataViewTextRenderer::GetValue( wxVariant &value ) const
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_STRING );
     g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );
-    wxString tmp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ),
-        wx_const_cast(wxDataViewTextRenderer*, this)->GetOwner()->GetOwner()->GetFont() );
+    wxString tmp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ), wx_const_cast(wxDataViewTextRenderer*, this)->GetOwner()->GetOwner()->GetFont() );
     g_value_unset( &gvalue );
 
     value = tmp;
@@ -1173,6 +1634,18 @@ void wxDataViewTextRenderer::SetAlignment( int align )
     g_value_unset( &gvalue );
 }
 
+// ---------------------------------------------------------
+// wxDataViewTextRendererAttr
+// ---------------------------------------------------------
+
+IMPLEMENT_CLASS(wxDataViewTextRendererAttr,wxDataViewTextRenderer)
+
+wxDataViewTextRendererAttr::wxDataViewTextRendererAttr( const wxString &varianttype,
+                            wxDataViewCellMode mode, int align ) :
+   wxDataViewTextRenderer( varianttype, mode, align )
+{
+}
+
 // ---------------------------------------------------------
 // wxDataViewBitmapRenderer
 // ---------------------------------------------------------
@@ -1183,7 +1656,7 @@ wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype,
                                                     int align ) :
     wxDataViewRenderer( varianttype, mode, align )
 {
-    m_renderer = (GtkWidget*) gtk_cell_renderer_pixbuf_new();
+    m_renderer = (GtkCellRenderer*) gtk_cell_renderer_pixbuf_new();
 
     SetMode(mode);
     SetAlignment(align);
@@ -1230,7 +1703,7 @@ bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value )
     return false;
 }
 
-bool wxDataViewBitmapRenderer::GetValue( wxVariant &value ) const
+bool wxDataViewBitmapRenderer::GetValue( wxVariant &WXUNUSED(value) ) const
 {
     return false;
 }
@@ -1262,16 +1735,18 @@ static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
     if (!cell->Validate( value ))
         return;
 
-    wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
+    wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel();
 
     GtkTreePath *gtk_path = gtk_tree_path_new_from_string( path );
-    unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (gtk_path)[0];
+    GtkTreeIter iter;
+    cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, gtk_path );
+    wxDataViewItem item( (void*) iter.user_data );;
     gtk_tree_path_free( gtk_path );
 
     unsigned int model_col = cell->GetOwner()->GetModelColumn();
 
-    model->SetValue( value, model_col, model_row );
-    model->ValueChanged( model_col, model_row );
+    model->SetValue( value, item, model_col );
+    model->ValueChanged( item, model_col );
 }
 
 IMPLEMENT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer)
@@ -1280,7 +1755,7 @@ wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype,
                                                     wxDataViewCellMode mode, int align ) :
     wxDataViewRenderer( varianttype, mode, align )
 {
-    m_renderer = (GtkWidget*) gtk_cell_renderer_toggle_new();
+    m_renderer = (GtkCellRenderer*) gtk_cell_renderer_toggle_new();
 
     if (mode & wxDATAVIEW_CELL_ACTIVATABLE)
     {
@@ -1330,14 +1805,17 @@ bool wxDataViewToggleRenderer::GetValue( wxVariant &value ) const
 // wxDataViewCustomRenderer
 // ---------------------------------------------------------
 
-class wxDataViewCtrlDC: public wxWindowDC
+class wxDataViewCtrlDCImpl: public wxWindowDCImpl
 {
 public:
-    wxDataViewCtrlDC( wxDataViewCtrl *window )
-    {
+   wxDataViewCtrlDCImpl( wxDC *owner, wxDataViewCtrl *window ) :
+       wxWindowDCImpl( owner )
+   {
         GtkWidget *widget = window->m_treeview;
         // Set later
-        m_window = NULL;
+        m_gdkwindow = NULL;
+
+        m_window = window;
 
         m_context = window->GtkGetPangoDefaultContext();
         m_layout = pango_layout_new( m_context );
@@ -1345,12 +1823,20 @@ public:
 
         m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget );
 
-        // Set m_window later
+        // Set m_gdkwindow later
         // SetUpDC();
-        // m_owner = window;
     }
 };
 
+class wxDataViewCtrlDC: public wxWindowDC
+{
+public:
+    wxDataViewCtrlDC( wxDataViewCtrl *window ) :
+        wxWindowDC( new wxDataViewCtrlDCImpl( this, window ) )
+        { }
+};
+
+
 // ---------------------------------------------------------
 // wxDataViewCustomRenderer
 // ---------------------------------------------------------
@@ -1363,6 +1849,7 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
     wxDataViewRenderer( varianttype, mode, align )
 {
     m_dc = NULL;
+    m_text_renderer = NULL;
 
     if (no_init)
         m_renderer = NULL;
@@ -1370,16 +1857,54 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
         Init(mode, align);
 }
 
+void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset,
+                                           wxRect WXUNUSED(cell), wxDC *WXUNUSED(dc), int WXUNUSED(state) )
+{
+#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();
+
+    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_value_unset( &gvalue );
+
+    ((GdkRectangle*) cell_area)->x += xoffset;
+    ((GdkRectangle*) cell_area)->width -= xoffset;
+
+    gtk_cell_renderer_render( m_text_renderer,
+        window,
+        widget,
+        (GdkRectangle*) background_area,
+        (GdkRectangle*) cell_area,
+        (GdkRectangle*) expose_area,
+        (GtkCellRendererState) flags );
+
+    ((GdkRectangle*) cell_area)->x -= xoffset;
+    ((GdkRectangle*) cell_area)->width += xoffset;
+#endif
+}
+
 bool wxDataViewCustomRenderer::Init(wxDataViewCellMode mode, int align)
 {
     GtkWxCellRenderer *renderer = (GtkWxCellRenderer *) gtk_wx_cell_renderer_new();
     renderer->cell = this;
 
-    m_renderer = (GtkWidget*) renderer;
+    m_renderer = (GtkCellRenderer*) renderer;
 
     SetMode(mode);
     SetAlignment(align);
 
+    GtkInitHandlers();
+
     return true;
 }
 
@@ -1387,6 +1912,9 @@ wxDataViewCustomRenderer::~wxDataViewCustomRenderer()
 {
     if (m_dc)
         delete m_dc;
+
+    if (m_text_renderer)
+        gtk_object_sink( GTK_OBJECT(m_text_renderer) );
 }
 
 wxDC *wxDataViewCustomRenderer::GetDC()
@@ -1419,13 +1947,12 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label,
 #ifdef __WXGTK26__
     if (!gtk_check_version(2,6,0))
     {
-        m_renderer = (GtkWidget*) gtk_cell_renderer_progress_new();
+        m_renderer = (GtkCellRenderer*) gtk_cell_renderer_progress_new();
 
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_STRING );
 
-        // FIXME: font encoding support
-        g_value_set_string( &gvalue, wxGTK_CONV_SYS(m_label) );
+        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 );
 
@@ -1468,12 +1995,12 @@ bool wxDataViewProgressRenderer::SetValue( const wxVariant &value )
     return true;
 }
 
-bool wxDataViewProgressRenderer::GetValue( wxVariant &value ) const
+bool wxDataViewProgressRenderer::GetValue( wxVariant &WXUNUSED(value) ) const
 {
     return false;
 }
 
-bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int state )
+bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
 {
     double pct = (double)m_value / 100.0;
     wxRect bar = cell;
@@ -1502,12 +2029,12 @@ class wxDataViewDateRendererPopupTransient: public wxPopupTransientWindow
 {
 public:
     wxDataViewDateRendererPopupTransient( wxWindow* parent, wxDateTime *value,
-        wxDataViewListModel *model, unsigned int col, unsigned int row ) :
+        wxDataViewModel *model, const wxDataViewItem &item, unsigned int col ) :
         wxPopupTransientWindow( parent, wxBORDER_SIMPLE )
     {
         m_model = model;
+        m_item = item;
         m_col = col;
-        m_row = row;
         m_cal = new wxCalendarCtrl( this, -1, *value );
         wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
         sizer->Add( m_cal, 1, wxGROW );
@@ -1521,10 +2048,10 @@ public:
 
     void OnCalendar( wxCalendarEvent &event );
 
-    wxCalendarCtrl      *m_cal;
-    wxDataViewListModel *m_model;
-    unsigned int               m_col;
-    unsigned int               m_row;
+    wxCalendarCtrl   *m_cal;
+    wxDataViewModel  *m_model;
+    wxDataViewItem    m_item;
+    unsigned int      m_col;
 
 private:
     DECLARE_EVENT_TABLE()
@@ -1538,8 +2065,8 @@ void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event )
 {
     wxDateTime date = event.GetDate();
     wxVariant value = date;
-    m_model->SetValue( value, m_col, m_row );
-    m_model->ValueChanged( m_col, m_row );
+    m_model->SetValue( value, m_item, m_col );
+    m_model->ValueChanged( m_item, m_col );
     DismissAndNotify();
 }
 
@@ -1560,7 +2087,7 @@ bool wxDataViewDateRenderer::SetValue( const wxVariant &value )
     return true;
 }
 
-bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const
+bool wxDataViewDateRenderer::GetValue( wxVariant &WXUNUSED(value) ) const
 {
     return false;
 }
@@ -1569,8 +2096,7 @@ bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state )
 {
     dc->SetFont( GetOwner()->GetOwner()->GetFont() );
     wxString tmp = m_date.FormatDate();
-    dc->DrawText( tmp, cell.x, cell.y );
-
+    RenderText( tmp, 0, cell, dc, state );
     return true;
 }
 
@@ -1582,15 +2108,15 @@ wxSize wxDataViewDateRenderer::GetSize() const
     return wxSize(x,y+d);
 }
 
-bool wxDataViewDateRenderer::Activate( wxRect cell, wxDataViewListModel *model,
-                                       unsigned int col, unsigned int row )
+bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *model,
+                                       const wxDataViewItem &item, unsigned int col )
 {
     wxVariant variant;
-    model->GetValue( variant, col, row );
+    model->GetValue( variant, item, col );
     wxDateTime value = variant.GetDateTime();
 
     wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient(
-        GetOwner()->GetOwner()->GetParent(), &value, model, col, row );
+        GetOwner()->GetOwner()->GetParent(), &value, model, item, col );
     wxPoint pos = wxGetMousePosition();
     popup->Move( pos );
     popup->Layout();
@@ -1599,29 +2125,112 @@ bool wxDataViewDateRenderer::Activate( wxRect cell, wxDataViewListModel *model,
     return true;
 }
 
+
+// ---------------------------------------------------------
+// wxDataViewIconTextRenderer
+// ---------------------------------------------------------
+
+IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer)
+
+wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(
+  const wxString &varianttype, wxDataViewCellMode mode, int align ) :
+    wxDataViewCustomRenderer( varianttype, mode, align )
+{
+    SetMode(mode);
+    SetAlignment(align);
+}
+
+wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer()
+{
+}
+
+bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )
+{
+    m_value << value;
+    return true;
+}
+
+bool wxDataViewIconTextRenderer::GetValue( wxVariant &WXUNUSED(value) ) const
+{
+    return false;
+}
+
+bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state )
+{
+    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;
+    }
+
+    RenderText( m_value.GetText(), offset, cell, dc, state );
+
+    return true;
+}
+
+wxSize wxDataViewIconTextRenderer::GetSize() 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;
+}
+
+wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl(
+    wxWindow *WXUNUSED(parent), wxRect WXUNUSED(labelRect), const wxVariant &WXUNUSED(value) )
+{
+    return NULL;
+}
+
+bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl(
+   wxControl* WXUNUSED(editor), wxVariant &WXUNUSED(value) )
+{
+    return false;
+}
+
 // ---------------------------------------------------------
 // wxDataViewColumn
 // ---------------------------------------------------------
 
 
 static gboolean
-gtk_dataview_header_button_press_callback( GtkWidget *widget,
+gtk_dataview_header_button_press_callback( GtkWidget *WXUNUSED(widget),
                                            GdkEventButton *gdk_event,
                                            wxDataViewColumn *column )
 {
     if (gdk_event->type != GDK_BUTTON_PRESS)
-        return TRUE;
+        return FALSE;
 
     if (gdk_event->button == 1)
     {
+        gs_lastLeftClickHeader = column;
+
         wxDataViewCtrl *dv = column->GetOwner();
         wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() );
         event.SetDataViewColumn( column );
         event.SetModel( dv->GetModel() );
-        dv->GetEventHandler()->ProcessEvent( event );
+        if (dv->HandleWindowEvent( event ))
+            return FALSE;
     }
 
-    return TRUE;
+    if (gdk_event->button == 3)
+    {
+        wxDataViewCtrl *dv = column->GetOwner();
+        wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, dv->GetId() );
+        event.SetDataViewColumn( column );
+        event.SetModel( dv->GetModel() );
+        if (dv->HandleWindowEvent( event ))
+            return FALSE;
+    }
+
+    return FALSE;
 }
 
 extern "C" {
@@ -1633,21 +2242,58 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
 }
 
 
-static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
+static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column),
                             GtkCellRenderer *renderer,
                             GtkTreeModel *model,
                             GtkTreeIter *iter,
                             gpointer data )
 {
-    g_return_if_fail (GTK_IS_WX_LIST_STORE (model));
-    GtkWxListStore *list_store = (GtkWxListStore *) model;
+    g_return_if_fail (GTK_IS_WX_TREE_MODEL (model));
+    GtkWxTreeModel *tree_model = (GtkWxTreeModel *) model;
 
     wxDataViewRenderer *cell = (wxDataViewRenderer*) data;
 
-    unsigned int model_row = (unsigned int) iter->user_data;
+    wxDataViewItem item( (void*) iter->user_data );
+
+    wxDataViewModel *wx_model = tree_model->internal->GetDataViewModel();
+
+    if (!wx_model->IsVirtualListModel())
+    {
+
+    if (wx_model->IsContainer( item ))
+    {
+        if (wx_model->HasContainerColumns( item ) || (cell->GetOwner()->GetModelColumn() == 0))
+        {
+            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 );
+        }
+        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;
+        }
+    }
+    else
+    {
+        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 );
+    }
+
+    }
 
     wxVariant value;
-    list_store->model->GetValue( value, cell->GetOwner()->GetModelColumn(), model_row );
+    wx_model->GetValue( value, item, cell->GetOwner()->GetModelColumn() );
 
     if (value.GetType() != cell->GetVariantType())
         wxLogError( wxT("Wrong type, required: %s but: %s"),
@@ -1655,10 +2301,111 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
                     cell->GetVariantType().c_str() );
 
     cell->SetValue( value );
+
+    if (cell->GtkHasAttributes())
+    {
+        wxDataViewItemAttr attr;
+        bool colour_set = false;
+        bool style_set = false;
+        bool weight_set = false;
+
+        if (wx_model->GetAttr( item, cell->GetOwner()->GetModelColumn(), attr ))
+        {
+            // this must be a GtkCellRendererText
+            wxColour colour = attr.GetColour();
+            if (colour.IsOk())
+            {
+                const GdkColor * const gcol = colour.GetColor();
+
+                GValue gvalue = { 0, };
+                g_value_init( &gvalue, GDK_TYPE_COLOR );
+                g_value_set_boxed( &gvalue, gcol );
+                g_object_set_property( G_OBJECT(renderer), "foreground_gdk", &gvalue );
+                g_value_unset( &gvalue );
+
+                colour_set = true;
+            }
+
+            if (attr.GetItalic())
+            {
+                GValue gvalue = { 0, };
+                g_value_init( &gvalue, PANGO_TYPE_STYLE );
+                g_value_set_enum( &gvalue, PANGO_STYLE_ITALIC );
+                g_object_set_property( G_OBJECT(renderer), "style", &gvalue );
+                g_value_unset( &gvalue );
+
+                style_set = true;
+            }
+
+            if (attr.GetBold())
+            {
+                GValue gvalue = { 0, };
+                g_value_init( &gvalue, PANGO_TYPE_WEIGHT );
+                g_value_set_enum( &gvalue, PANGO_WEIGHT_BOLD );
+                g_object_set_property( G_OBJECT(renderer), "weight", &gvalue );
+                g_value_unset( &gvalue );
+
+                weight_set = true;
+            }
+        }
+
+        if (!style_set)
+        {
+            GValue gvalue = { 0, };
+            g_value_init( &gvalue, G_TYPE_BOOLEAN );
+            g_value_set_boolean( &gvalue, FALSE );
+            g_object_set_property( G_OBJECT(renderer), "style-set", &gvalue );
+            g_value_unset( &gvalue );
+        }
+
+        if (!weight_set)
+        {
+            GValue gvalue = { 0, };
+            g_value_init( &gvalue, G_TYPE_BOOLEAN );
+            g_value_set_boolean( &gvalue, FALSE );
+            g_object_set_property( G_OBJECT(renderer), "weight-set", &gvalue );
+            g_value_unset( &gvalue );
+        }
+
+        if (!colour_set)
+        {
+            GValue gvalue = { 0, };
+            g_value_init( &gvalue, G_TYPE_BOOLEAN );
+            g_value_set_boolean( &gvalue, FALSE );
+            g_object_set_property( G_OBJECT(renderer), "foreground-set", &gvalue );
+            g_value_unset( &gvalue );
+        }
+    }
+
+#if 0
+    if (attr.HasBackgroundColour())
+    {
+        wxColour colour = attr.GetBackgroundColour();
+        const GdkColor * const gcol = colour.GetColor();
+
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, GDK_TYPE_COLOR );
+        g_value_set_boxed( &gvalue, gcol );
+        g_object_set_property( G_OBJECT(renderer), "cell-background_gdk", &gvalue );
+        g_value_unset( &gvalue );
+    }
+    else
+    {
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, G_TYPE_BOOLEAN );
+        g_value_set_boolean( &gvalue, FALSE );
+        g_object_set_property( G_OBJECT(renderer), "cell-background-set", &gvalue );
+        g_value_unset( &gvalue );
+    }
+#endif
+
 }
 
 IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
 
+#include <wx/listimpl.cpp>
+WX_DEFINE_LIST(wxDataViewColumnList)
+
 wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell,
                                     unsigned int model_column, int width,
                                     wxAlignment align, int flags ) :
@@ -1691,15 +2438,18 @@ void wxDataViewColumn::Init(wxAlignment align, int flags, int width)
     SetFlags( flags );
     SetAlignment( align );
 
-    // NOTE: we prefer not to call SetMinWidth(wxDVC_DEFAULT_MINWIDTH);
-    //       as GTK+ is smart and unless explicitely told, will set the minimal
-    //       width to the title's lenght, which is a better default
-
-    // the GTK_TREE_VIEW_COLUMN_FIXED is required by the "fixed height" mode
-    // that we use for the wxDataViewCtrl
-    gtk_tree_view_column_set_fixed_width( column, width < 0 ? wxDVC_DEFAULT_WIDTH : width );
-    gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED );
-
+    SetWidth( width );
+
+    // Create container for icon and label
+    GtkWidget *box = gtk_hbox_new( FALSE, 1 );
+    gtk_widget_show( box );
+    // gtk_container_set_border_width((GtkContainer*)box, 2);
+    m_image = gtk_image_new();
+    gtk_box_pack_start(GTK_BOX(box), m_image, FALSE, FALSE, 1);
+    m_label = gtk_label_new("");
+    gtk_box_pack_end( GTK_BOX(box), GTK_WIDGET(m_label), FALSE, FALSE, 1 );
+    gtk_tree_view_column_set_widget( column, box );
+    
     gtk_tree_view_column_pack_end( column, renderer, TRUE );
 
     gtk_tree_view_column_set_cell_data_func( column, renderer,
@@ -1739,39 +2489,30 @@ void wxDataViewColumn::SetOwner( wxDataViewCtrl *owner )
 
 void wxDataViewColumn::SetTitle( const wxString &title )
 {
-    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
-
-    if (m_isConnected)
-    {
-        // disconnect before column->button gets recreated
-        g_signal_handlers_disconnect_by_func( column->button,
-                      (GtkWidget*) gtk_dataview_header_button_press_callback, this);
-
-        m_isConnected = false;
-    }
-
-    // FIXME: can it really happen that we don't have the owner here??
     wxDataViewCtrl *ctrl = GetOwner();
-    gtk_tree_view_column_set_title( column, ctrl ? wxGTK_CONV_FONT(title, ctrl->GetFont())
+    gtk_label_set_text( GTK_LABEL(m_label), ctrl ? wxGTK_CONV_FONT(title, ctrl->GetFont())
                                                  : wxGTK_CONV_SYS(title) );
-
-    gtk_tree_view_column_set_widget( column, NULL );
+    if (title.empty())
+        gtk_widget_hide( m_label );
+    else
+        gtk_widget_show( m_label );
 }
 
 wxString wxDataViewColumn::GetTitle() const
 {
-    const gchar *str = gtk_tree_view_column_get_title( GTK_TREE_VIEW_COLUMN(m_column) );
-    return wxConvFileName->cMB2WX(str);
+    return wxGTK_CONV_BACK_FONT(
+            gtk_label_get_text( GTK_LABEL(m_label) ),
+            GetOwner()->GetFont()
+           );
 }
 
 void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap )
 {
     wxDataViewColumnBase::SetBitmap( bitmap );
 
-    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
     if (bitmap.Ok())
     {
-        GtkImage *gtk_image = GTK_IMAGE( gtk_image_new() );
+        GtkImage *gtk_image = GTK_IMAGE(m_image);
 
         GdkBitmap *mask = (GdkBitmap *) NULL;
         if (bitmap.GetMask())
@@ -1787,13 +2528,11 @@ void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap )
             gtk_image_set_from_pixmap(GTK_IMAGE(gtk_image),
                                       bitmap.GetPixmap(), mask);
         }
-        gtk_widget_show( GTK_WIDGET(gtk_image) );
-
-        gtk_tree_view_column_set_widget( column, GTK_WIDGET(gtk_image) );
+        gtk_widget_show( m_image );
     }
     else
     {
-        gtk_tree_view_column_set_widget( column, NULL );
+        gtk_widget_hide( m_image );
     }
 }
 
@@ -1819,6 +2558,9 @@ void wxDataViewColumn::SetAlignment( wxAlignment align )
         xalign = 0.5;
 
     gtk_tree_view_column_set_alignment( column, xalign );
+    
+    if (m_renderer && m_renderer->GetAlignment() == -1)
+        m_renderer->GtkUpdateAlignment();
 }
 
 wxAlignment wxDataViewColumn::GetAlignment() const
@@ -1836,13 +2578,22 @@ wxAlignment wxDataViewColumn::GetAlignment() const
 void wxDataViewColumn::SetSortable( bool sortable )
 {
     GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
-    gtk_tree_view_column_set_sort_indicator( column, sortable );
+
+    if (sortable)
+    {
+        gtk_tree_view_column_set_sort_column_id( column, GetModelColumn() );
+    }
+    else
+    {
+        gtk_tree_view_column_set_sort_column_id( column, -1 );
+        gtk_tree_view_column_set_sort_indicator( column, FALSE );
+    }
 }
 
 bool wxDataViewColumn::IsSortable() const
 {
     GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
-    return gtk_tree_view_column_get_sort_indicator( column );
+    return (gtk_tree_view_column_get_sort_column_id( column ) != -1);
 }
 
 bool wxDataViewColumn::IsResizeable() const
@@ -1865,6 +2616,8 @@ void wxDataViewColumn::SetSortOrder( bool ascending )
         gtk_tree_view_column_set_sort_order( column, GTK_SORT_ASCENDING );
     else
         gtk_tree_view_column_set_sort_order( column, GTK_SORT_DESCENDING );
+
+    gtk_tree_view_column_set_sort_indicator( column, TRUE );
 }
 
 bool wxDataViewColumn::IsSortOrderAscending() const
@@ -1891,101 +2644,956 @@ int wxDataViewColumn::GetWidth() const
 
 void wxDataViewColumn::SetWidth( int width )
 {
-    gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), width );
-}
-
+    if (width < 0)
+    {
+#if 1
+        gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_FIXED );
+
+        // TODO find a better calculation
+        gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), wxDVC_DEFAULT_WIDTH );
+#else
+        // this is unpractical for large numbers of items and disables
+        // user resizing, which is totally unexpected
+        gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_AUTOSIZE );
+#endif
+    }
+    else
+    {
+        gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_FIXED );
 
-//-----------------------------------------------------------------------------
-// wxDataViewCtrl signal callbacks
-//-----------------------------------------------------------------------------
+        gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), width );
+    }
+}
 
-static void
-wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCtrl *dv )
+void wxDataViewColumn::SetReorderable( bool reorderable )
 {
-    if (!GTK_WIDGET_REALIZED(dv->m_widget))
-        return;
-
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ROW_SELECTED, dv->GetId() );
-    event.SetRow( dv->GetSelection() );
-    event.SetModel( dv->GetModel() );
-    dv->GetEventHandler()->ProcessEvent( event );
+    gtk_tree_view_column_set_reorderable( GTK_TREE_VIEW_COLUMN(m_column), reorderable );
 }
 
-static void
-wxdataview_row_activated_callback( GtkTreeView* treeview, GtkTreePath *path,
-                                   GtkTreeViewColumn *column, wxDataViewCtrl *dv )
+bool wxDataViewColumn::IsReorderable() const
 {
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ROW_ACTIVATED, dv->GetId() );
-    unsigned int row = (unsigned int)gtk_tree_path_get_indices (path)[0];
-    event.SetRow( row );
-    event.SetModel( dv->GetModel() );
-    dv->GetEventHandler()->ProcessEvent( event );
+    return gtk_tree_view_column_get_reorderable( GTK_TREE_VIEW_COLUMN(m_column) );
 }
 
 //-----------------------------------------------------------------------------
-// wxDataViewCtrl
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// InsertChild for wxDataViewCtrl
+// wxGtkTreeModelNode
 //-----------------------------------------------------------------------------
 
-static void wxInsertChildInDataViewCtrl( wxWindowGTK* parent, wxWindowGTK* child )
+void wxGtkTreeModelNode::Resort()
 {
-    wxDataViewCtrl * dvc = (wxDataViewCtrl*) parent;
-    GtkWidget *treeview = dvc->GtkGetTreeView();
-
-    // Insert widget in GtkTreeView
-    if (GTK_WIDGET_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 );
-}
+    size_t child_count = GetChildCount();
+    if (child_count == 0)
+        return;
 
-static
-void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget),
-                                     GtkAllocation *alloc,
-                                     wxDataViewCtrl *win )
-{
+    size_t node_count = GetNodesCount();
 
-    wxWindowList::Node *node = win->GetChildren().GetFirst();
-    while (node)
+    if (child_count == 1)
     {
-        wxWindow *child = node->GetData();
+        if (node_count == 1)
+        {
+            wxGtkTreeModelNode *node = m_nodes.Item( 0 );
+            node->Resort();
+        }
+        return;
+    }
 
-        GtkRequisition req;
-        gtk_widget_size_request( child->m_widget, &req );
+    wxGtkTreeModelChildren temp;
+    WX_APPEND_ARRAY( temp, m_children );
 
-        GtkAllocation alloc;
-        alloc.x = child->m_x;
-        alloc.y = child->m_y;
-        alloc.width = child->m_width;
-        alloc.height = child->m_height;
-        gtk_widget_size_allocate( child->m_widget, &alloc );
+    g_internal = m_internal;
+    m_children.Sort( &wxGtkTreeModelChildCmp );
 
-        node = node->GetNext();
+    gint *new_order = new gint[child_count];
+
+    unsigned int pos;
+    for (pos = 0; pos < child_count; pos++)
+    {
+        void *id = m_children.Item( pos );
+        int old_pos = temp.Index( id );
+        new_order[pos] = old_pos;
     }
-}
 
+    GtkTreeModel *gtk_tree_model = GTK_TREE_MODEL( m_internal->GetGtkModel() );
 
+    GtkTreeIter iter;
+    iter.user_data = GetItem().GetID();
+    iter.stamp = m_internal->GetGtkModel()->stamp;
 
-IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
+    GtkTreePath *path = m_internal->get_path( &iter );
 
-wxDataViewCtrl::~wxDataViewCtrl()
-{
-    if (m_notifier)
+    gtk_tree_model_rows_reordered( gtk_tree_model, path, &iter, new_order );
+
+    gtk_tree_path_free (path);
+
+    delete [] new_order;
+
+    for (pos = 0; pos < node_count; pos++)
+    {
+        wxGtkTreeModelNode *node = m_nodes.Item( pos );
+        node->Resort();
+    }
+}
+
+//-----------------------------------------------------------------------------
+// wxDataViewCtrlInternal
+//-----------------------------------------------------------------------------
+
+wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner,
+    wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model )
+{
+    m_owner = owner;
+    m_wx_model = wx_model;
+    m_gtk_model = gtk_model;
+    m_root = NULL;
+    m_sort_order = GTK_SORT_ASCENDING;
+    m_sort_column = -1;
+    m_dataview_sort_column = NULL;
+
+    if (!m_wx_model->IsVirtualListModel())
+        InitTree();
+}
+
+wxDataViewCtrlInternal::~wxDataViewCtrlInternal()
+{
+    g_object_unref( m_gtk_model );
+}
+
+void wxDataViewCtrlInternal::InitTree()
+{
+    wxDataViewItem item;
+    m_root = new wxGtkTreeModelNode( NULL, item, this );
+
+    BuildBranch( m_root );
+}
+
+void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node )
+{
+    if (node->GetChildCount() == 0)
+    {
+        wxDataViewItemArray children;
+        unsigned int count = m_wx_model->GetChildren( node->GetItem(), children );
+        unsigned int pos;
+        for (pos = 0; pos < count; pos++)
+        {
+            wxDataViewItem child = children[pos];
+
+            if (m_wx_model->IsContainer( child ))
+                node->AddNode( new wxGtkTreeModelNode( node, child, this ) );
+            else
+                node->AddLeave( child.GetID() );
+
+            // Don't send any events here
+        }
+    }
+}
+
+// GTK+ dnd iface
+
+gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag_source),
+    GtkTreePath *path )
+{
+    GtkTreeIter iter;
+    if (!get_iter( &iter, path )) return FALSE;
+
+    wxDataViewItem item( (void*) iter.user_data );
+
+    return m_wx_model->IsDraggable( item );
+}
+
+gboolean
+wxDataViewCtrlInternal::drag_data_delete(GtkTreeDragSource *WXUNUSED(drag_source),
+                                         GtkTreePath *WXUNUSED(path))
+{
+    return FALSE;
+}
+
+gboolean wxDataViewCtrlInternal::drag_data_get( GtkTreeDragSource *WXUNUSED(drag_source),
+    GtkTreePath *path, GtkSelectionData *selection_data )
+{
+    GtkTreeIter iter;
+    if (!get_iter( &iter, path )) return FALSE;
+
+    wxDataViewItem item( (void*) iter.user_data );
+
+    wxDataFormat format( selection_data->target );
+
+    size_t size = m_wx_model->GetDragDataSize( item, format );
+    if (size == 0) return FALSE;
+
+    void *data = malloc( size );
+
+    m_wx_model->GetDragData( item, format, data, size );
+
+    gtk_selection_data_set( selection_data, selection_data->target,
+        8, (const guchar*) data, size );
+
+    free( data );
+
+    return TRUE;
+}
+
+gboolean
+wxDataViewCtrlInternal::drag_data_received(GtkTreeDragDest *WXUNUSED(drag_dest),
+                                           GtkTreePath *WXUNUSED(dest),
+                                           GtkSelectionData *WXUNUSED(selection_data))
+{
+    return FALSE;
+}
+
+gboolean
+wxDataViewCtrlInternal::row_drop_possible(GtkTreeDragDest *WXUNUSED(drag_dest),
+                                          GtkTreePath *WXUNUSED(dest_path),
+                                          GtkSelectionData *WXUNUSED(selection_data))
+{
+    return FALSE;
+}
+
+// notifications from wxDataViewModel
+
+bool wxDataViewCtrlInternal::Cleared()
+{
+    if (m_root)
+    {
+        delete m_root;
+        InitTree();
+    }
+
+    // Create new GTK model
+    g_object_unref( m_gtk_model );
+    m_gtk_model = wxgtk_tree_model_new();
+    m_gtk_model->internal = this;
+
+    return true;
+}
+
+void wxDataViewCtrlInternal::Resort()
+{
+    if (!m_wx_model->IsVirtualListModel())
+        m_root->Resort();
+}
+
+bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
+{
+    if (!m_wx_model->IsVirtualListModel())
+    {
+        wxGtkTreeModelNode *parent_node = FindNode( parent );
+        if (m_wx_model->IsContainer( item ))
+            parent_node->AddNode( new wxGtkTreeModelNode( parent_node, item, this ) );
+        else
+            parent_node->AddLeave( item.GetID() );
+    }
+
+    return true;
+}
+
+bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
+{
+    if (!m_wx_model->IsVirtualListModel())
+    {
+        wxGtkTreeModelNode *parent_node = FindNode( parent );
+        parent_node->DeleteChild( item.GetID() );
+    }
+
+    return true;
+}
+
+bool wxDataViewCtrlInternal::ItemChanged( const wxDataViewItem &item )
+{
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, m_owner->GetId() );
+    event.SetEventObject( m_owner );
+    event.SetModel( m_owner->GetModel() );
+    event.SetItem( item );
+    m_owner->HandleWindowEvent( event );
+
+    return true;
+}
+
+bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned int col )
+{
+    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.SetItem( item );
+    m_owner->HandleWindowEvent( event );
+
+    return true;
+}
+
+// GTK+ model iface
+
+GtkTreeModelFlags wxDataViewCtrlInternal::get_flags()
+{
+    if (m_wx_model->IsVirtualListModel())
+        return GTK_TREE_MODEL_LIST_ONLY;
+    else
+        return GTK_TREE_MODEL_ITERS_PERSIST;
+}
+
+gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path )
+{
+    if (m_wx_model->IsVirtualListModel())
+    {
+        wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
+
+        unsigned int i = (unsigned int)gtk_tree_path_get_indices (path)[0];
+
+        if (i >= wx_model->GetLastIndex() + 1)
+            return FALSE;
+
+        iter->stamp = m_gtk_model->stamp;
+        // user_data is just the index
+        iter->user_data = (gpointer) i;
+
+        return TRUE;
+    }
+    else
+    {
+        int depth = gtk_tree_path_get_depth( path );
+
+        wxGtkTreeModelNode *node = m_root;
+
+        int i;
+        for (i = 0; i < depth; i++)
+        {
+            BuildBranch( node );
+
+            gint pos = gtk_tree_path_get_indices (path)[i];
+            if (pos < 0) return FALSE;
+            if ((size_t)pos >= node->GetChildCount()) return FALSE;
+
+            void* id = node->GetChildren().Item( (size_t) pos );
+
+            if (i == depth-1)
+            {
+                iter->stamp = m_gtk_model->stamp;
+                iter->user_data = id;
+                return TRUE;
+            }
+
+            size_t count = node->GetNodes().GetCount();
+            size_t pos2;
+            for (pos2 = 0; pos2 < count; pos2++)
+            {
+                wxGtkTreeModelNode *child_node = node->GetNodes().Item( pos2 );
+                if (child_node->GetItem().GetID() == id)
+                {
+                    node = child_node;
+                    break;
+                }
+            }
+        }
+    }
+
+    return FALSE;
+}
+
+GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter )
+{
+    GtkTreePath *retval = gtk_tree_path_new ();
+
+    if (m_wx_model->IsVirtualListModel())
+    {
+        // user_data is just the index
+        int i = (wxUIntPtr) iter->user_data;
+        gtk_tree_path_append_index (retval, i);
+    }
+    else
+    {
+        void *id = iter->user_data;
+
+        wxGtkTreeModelNode *node = FindParentNode( iter );
+        while (node)
+        {
+            int pos = node->GetChildren().Index( id );
+
+            gtk_tree_path_prepend_index( retval, pos );
+
+            id = node->GetItem().GetID();
+            node = node->GetParent();
+        }
+    }
+
+    return retval;
+}
+
+gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter )
+{
+    if (m_wx_model->IsVirtualListModel())
+    {
+        wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
+
+        int n = (wxUIntPtr) iter->user_data;
+
+        if (n == -1)
+            return FALSE;
+
+        if (n >= (int) wx_model->GetLastIndex())
+            return FALSE;
+
+        iter->user_data = (gpointer) ++n;
+    }
+    else
+    {
+        wxGtkTreeModelNode *parent = FindParentNode( iter );
+        if( parent == NULL )
+            return FALSE;
+
+        int pos = parent->GetChildren().Index( iter->user_data );
+
+        if (pos == (int) parent->GetChildCount()-1)
+            return FALSE;
+
+        iter->stamp = m_gtk_model->stamp;
+        iter->user_data = parent->GetChildren().Item( pos+1 );
+    }
+
+    return TRUE;
+}
+
+gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *parent )
+{
+    if (m_wx_model->IsVirtualListModel())
+    {
+        // this is a list, nodes have no children
+        if (parent)
+            return FALSE;
+
+        iter->stamp = m_gtk_model->stamp;
+        iter->user_data = (gpointer) -1;
+
+        return TRUE;
+    }
+    else
+    {
+        wxDataViewItem item( (void*) parent->user_data );
+
+        if (!m_wx_model->IsContainer( item ))
+            return FALSE;
+
+        wxGtkTreeModelNode *parent_node = FindNode( parent );
+        BuildBranch( parent_node );
+
+        if (parent_node->GetChildCount() == 0)
+            return FALSE;
+
+        iter->stamp = m_gtk_model->stamp;
+        iter->user_data = (gpointer) parent_node->GetChildren().Item( 0 );
+    }
+
+    return TRUE;
+}
+
+gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter )
+{
+    if (m_wx_model->IsVirtualListModel())
+    {
+        // this is a list, nodes have no children
+        return FALSE;
+    }
+    else
+    {
+        wxDataViewItem item( (void*) iter->user_data );
+
+        bool is_container = m_wx_model->IsContainer( item );
+
+        if (!is_container)
+            return FALSE;
+
+        wxGtkTreeModelNode *node = FindNode( iter );
+        BuildBranch( node );
+
+        return (node->GetChildCount() > 0);
+    }
+}
+
+gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter )
+{
+    if (m_wx_model->IsVirtualListModel())
+    {
+        wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
+
+        if (iter == NULL)
+            return (gint) wx_model->GetLastIndex() + 1;
+
+        return 0;
+    }
+    else
+    {
+        wxDataViewItem item( (void*) iter->user_data );
+
+        if (!m_wx_model->IsContainer( item ))
+            return 0;
+
+        wxGtkTreeModelNode *parent_node = FindNode( iter );
+        BuildBranch( parent_node );
+
+        // wxPrintf( "iter_n_children %d\n", parent_node->GetChildCount() );
+
+        return parent_node->GetChildCount();
+    }
+}
+
+gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n )
+{
+    if (m_wx_model->IsVirtualListModel())
+    {
+        wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
+
+        if (parent)
+            return FALSE;
+
+        if (n < 0)
+            return FALSE;
+
+        if (n >= (gint) wx_model->GetLastIndex() + 1)
+            return FALSE;
+
+        iter->stamp = m_gtk_model->stamp;
+        iter->user_data = (gpointer) n;
+
+        return TRUE;
+    }
+    else
+    {
+        void* id = NULL;
+        if (parent) id = (void*) parent->user_data;
+        wxDataViewItem item( id );
+
+        if (!m_wx_model->IsContainer( item ))
+            return FALSE;
+
+        wxGtkTreeModelNode *parent_node = FindNode( parent );
+        BuildBranch( parent_node );
+
+        // wxPrintf( "iter_nth_child %d\n", n );
+
+        iter->stamp = m_gtk_model->stamp;
+        iter->user_data = parent_node->GetChildren().Item( n );
+
+        return TRUE;
+    }
+}
+
+gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *child )
+{
+    if (m_wx_model->IsVirtualListModel())
+    {
+        return FALSE;
+    }
+    else
+    {
+        wxGtkTreeModelNode *node = FindParentNode( child );
+        if (!node)
+            return FALSE;
+
+        iter->stamp = m_gtk_model->stamp;
+        iter->user_data = (gpointer) node->GetItem().GetID();
+
+        return TRUE;
+    }
+}
+
+static wxGtkTreeModelNode*
+wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item )
+{
+    if( model == NULL )
+        return NULL;
+
+    ItemList list;
+    list.DeleteContents( true );
+    wxDataViewItem it( item );
+
+    while( it.IsOk() )
+    {
+        wxDataViewItem * pItem = new wxDataViewItem( it );
+        list.Insert( pItem );
+        it = model->GetParent( it );
+    }
+
+    wxGtkTreeModelNode * node = treeNode;
+    for( ItemList::compatibility_iterator n = list.GetFirst(); n; n = n->GetNext() )
+    {
+        if( node && node->GetNodes().GetCount() != 0 )
+        {
+            int len = node->GetNodes().GetCount();
+            wxGtkTreeModelNodes nodes = node->GetNodes();
+            int j = 0;
+            for( ; j < len; j ++)
+            {
+                if( nodes[j]->GetItem() == *(n->GetData()))
+                {
+                    node = nodes[j];
+                    break;
+                }
+            }
+
+            if( j == len )
+            {
+                return NULL;
+            }
+        }
+        else
+            return NULL;
+    }
+    return node;
+
+}
+
+wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( GtkTreeIter *iter )
+{
+    if (!iter)
+        return m_root;
+
+    wxDataViewItem item( (void*) iter->user_data );
+    if (!item.IsOk())
+        return m_root;
+
+    wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item );
+
+    if (!result)
+    {
+        wxLogDebug( "Not found %p", iter->user_data );
+        char *crash = NULL;
+        *crash = 0;
+    }
+
+    return result;
+}
+
+wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( const wxDataViewItem &item )
+{
+    if (!item.IsOk())
+        return m_root;
+
+    wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item );
+
+    if (!result)
+    {
+        wxLogDebug( "Not found %p", item.GetID() );
+        char *crash = NULL;
+        *crash = 0;
+    }
+
+    return result;
+}
+
+static wxGtkTreeModelNode*
+wxDataViewCtrlInternal_FindParentNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item )
+{
+    if( model == NULL )
+        return NULL;
+
+    ItemList list;
+    list.DeleteContents( true );
+    if( !item.IsOk() )
+        return NULL;
+
+    wxDataViewItem it( model->GetParent( item ) );
+    while( it.IsOk() )
+    {
+        wxDataViewItem * pItem = new wxDataViewItem( it );
+        list.Insert( pItem );
+        it = model->GetParent( it );
+    }
+
+    wxGtkTreeModelNode * node = treeNode;
+    for( ItemList::compatibility_iterator n = list.GetFirst(); n; n = n->GetNext() )
+    {
+        if( node && node->GetNodes().GetCount() != 0 )
+        {
+            int len = node->GetNodes().GetCount();
+            wxGtkTreeModelNodes nodes = node->GetNodes();
+            int j = 0;
+            for( ; j < len; j ++)
+            {
+                if( nodes[j]->GetItem() == *(n->GetData()))
+                {
+                    node = nodes[j];
+                    break;
+                }
+            }
+
+            if( j == len )
+            {
+                return NULL;
+            }
+        }
+        else
+            return NULL;
+    }
+    //Examine whether the node is item's parent node
+    int len = node->GetChildCount();
+    for( int i = 0; i < len ; i ++ )
+    {
+        if( node->GetChildren().Item( i ) == item.GetID() )
+            return node;
+    }
+    return NULL;
+}
+
+wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( GtkTreeIter *iter )
+{
+    if (!iter)
+        return NULL;
+
+    wxDataViewItem item( (void*) iter->user_data );
+    if (!item.IsOk())
+        return NULL;
+
+    return wxDataViewCtrlInternal_FindParentNode( m_wx_model, m_root, item );
+}
+
+wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( const wxDataViewItem &item )
+{
+    if (!item.IsOk())
+        return NULL;
+
+    return wxDataViewCtrlInternal_FindParentNode( m_wx_model, m_root, item );
+}
+
+//-----------------------------------------------------------------------------
+// wxDataViewCtrl signal callbacks
+//-----------------------------------------------------------------------------
+
+static void
+wxdataview_selection_changed_callback( GtkTreeSelection* WXUNUSED(selection), wxDataViewCtrl *dv )
+{
+    if (!GTK_WIDGET_REALIZED(dv->m_widget))
+        return;
+
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, dv->GetId() );
+    event.SetItem( dv->GetSelection() );
+    event.SetModel( dv->GetModel() );
+    dv->HandleWindowEvent( event );
+}
+
+static void
+wxdataview_row_activated_callback( GtkTreeView* WXUNUSED(treeview), GtkTreePath *path,
+                                   GtkTreeViewColumn *WXUNUSED(column), wxDataViewCtrl *dv )
+{
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, dv->GetId() );
+
+    GtkTreeIter iter;
+    dv->GtkGetInternal()->get_iter( &iter, path );
+    wxDataViewItem item( (void*) iter.user_data );;
+    event.SetItem( item );
+    event.SetModel( dv->GetModel() );
+    dv->HandleWindowEvent( event );
+}
+
+static gboolean
+wxdataview_test_expand_row_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
+                                     GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )
+{
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, dv->GetId() );
+
+    wxDataViewItem item( (void*) iter->user_data );;
+    event.SetItem( item );
+    event.SetModel( dv->GetModel() );
+    dv->HandleWindowEvent( event );
+
+    return !event.IsAllowed();
+}
+
+static void
+wxdataview_row_expanded_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
+                                  GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )
+{
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, dv->GetId() );
+
+    wxDataViewItem item( (void*) iter->user_data );;
+    event.SetItem( item );
+    event.SetModel( dv->GetModel() );
+    dv->HandleWindowEvent( event );
+}
+
+static gboolean
+wxdataview_test_collapse_row_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
+                                       GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )
+{
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, dv->GetId() );
+
+    wxDataViewItem item( (void*) iter->user_data );;
+    event.SetItem( item );
+    event.SetModel( dv->GetModel() );
+    dv->HandleWindowEvent( event );
+
+    return !event.IsAllowed();
+}
+
+static void
+wxdataview_row_collapsed_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
+                                   GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )
+{
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, dv->GetId() );
+
+    wxDataViewItem item( (void*) iter->user_data );;
+    event.SetItem( item );
+    event.SetModel( dv->GetModel() );
+    dv->HandleWindowEvent( event );
+}
+
+//-----------------------------------------------------------------------------
+    // wxDataViewCtrl
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// InsertChild for wxDataViewCtrl
+//-----------------------------------------------------------------------------
+
+static void wxInsertChildInDataViewCtrl( wxWindowGTK* parent, wxWindowGTK* child )
+{
+    wxDataViewCtrl * dvc = (wxDataViewCtrl*) parent;
+    GtkWidget *treeview = dvc->GtkGetTreeView();
+
+    // Insert widget in GtkTreeView
+    if (GTK_WIDGET_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 );
+}
+
+static
+void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget),
+                                     GtkAllocation *WXUNUSED(gtk_alloc),
+                                     wxDataViewCtrl *win )
+{
+    wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
+    while (node)
+    {
+        wxWindow *child = node->GetData();
+
+        GtkRequisition req;
+        gtk_widget_size_request( child->m_widget, &req );
+
+        GtkAllocation alloc;
+        alloc.x = child->m_x;
+        alloc.y = child->m_y;
+        alloc.width = child->m_width;
+        alloc.height = child->m_height;
+        gtk_widget_size_allocate( child->m_widget, &alloc );
+
+        node = node->GetNext();
+    }
+}
+
+
+//-----------------------------------------------------------------------------
+// "motion_notify_event"
+//-----------------------------------------------------------------------------
+
+static gboolean
+gtk_dataview_motion_notify_callback( GtkWidget *WXUNUSED(widget),
+                                     GdkEventMotion *gdk_event,
+                                     wxDataViewCtrl *dv )
+{
+    if (gdk_event->is_hint)
+    {
+        int x = 0;
+        int y = 0;
+        GdkModifierType state;
+        gdk_window_get_pointer(gdk_event->window, &x, &y, &state);
+        gdk_event->x = x;
+        gdk_event->y = y;
+    }
+
+    GtkTreePath *path = NULL;
+    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,
+        &column,
+        &cell_x,
+        &cell_y))
+    {
+        if (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 );
+        }
+    }
+
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "button_press_event"
+//-----------------------------------------------------------------------------
+
+static gboolean
+gtk_dataview_button_press_callback( GtkWidget *WXUNUSED(widget),
+                                    GdkEventButton *gdk_event,
+                                    wxDataViewCtrl *dv )
+{
+    if ((gdk_event->button == 3) && (gdk_event->type == GDK_BUTTON_PRESS))
+    {
+        GtkTreePath *path = NULL;
+        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,
+            &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() );
+                wxDataViewItem item( (void*) iter.user_data );;
+                event.SetItem( item );
+                event.SetModel( dv->GetModel() );
+                bool ret = dv->HandleWindowEvent( event );
+                gtk_tree_path_free( path );
+                return ret;
+             }
+        }
+    }
+
+    return FALSE;
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
+
+wxDataViewCtrl::~wxDataViewCtrl()
+{
+    if (m_notifier)
         GetModel()->RemoveNotifier( m_notifier );
 
+    m_cols.Clear();
+
     // remove the model from the GtkTreeView before it gets destroyed by the
     // wxDataViewCtrlBase's dtor
     gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), NULL );
+
+    delete m_internal;
 }
 
 void wxDataViewCtrl::Init()
 {
     m_notifier = NULL;
+    m_internal = NULL;
+    
+    m_cols.DeleteContents( true );
 }
 
+static GtkTargetEntry gs_target;
+
 bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator )
@@ -2011,9 +3619,18 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
     g_signal_connect (m_treeview, "size_allocate",
                      G_CALLBACK (gtk_dataviewctrl_size_callback), this);
 
+    gs_target.target = const_cast<char *>("UTF8_STRING");
+    gs_target.flags = 0;
+    gs_target.info = static_cast<guint>(-1);
+    gtk_tree_view_enable_model_drag_source( GTK_TREE_VIEW(m_treeview),
+       GDK_BUTTON1_MASK, &gs_target, 1, (GdkDragAction) GDK_ACTION_COPY );
+
 #ifdef __WXGTK26__
     if (!gtk_check_version(2,6,0))
-        gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), TRUE );
+    {
+        bool fixed = (style & wxDV_VARIABLE_LINE_HEIGHT) == 0;
+        gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed );
+    }
 #endif
 
     if (style & wxDV_MULTIPLE)
@@ -2037,13 +3654,12 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
         else if (style & wxDV_HORIZ_RULES)
             grid = GTK_TREE_VIEW_GRID_LINES_HORIZONTAL;
 
-        gtk_tree_view_set_grid_lines( GTK_TREE_VIEW(m_treeview), grid );
+        if (grid != GTK_TREE_VIEW_GRID_LINES_NONE)
+            gtk_tree_view_set_grid_lines( GTK_TREE_VIEW(m_treeview), grid );
     }
-    else
 #endif
-    {
-        gtk_tree_view_set_rules_hint( GTK_TREE_VIEW(m_treeview), (style & wxDV_HORIZ_RULES) != 0 );
-    }
+
+    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);
@@ -2053,12 +3669,29 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
 
     PostCreation(size);
 
-    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
-    g_signal_connect_after (selection, "changed",
-                            G_CALLBACK (wxdataview_selection_changed_callback), this);
-    g_signal_connect_after (m_treeview, "row_activated",
+    GtkEnableSelectionEvents();
+
+    g_signal_connect_after (m_treeview, "row-activated",
                             G_CALLBACK (wxdataview_row_activated_callback), this);
 
+    g_signal_connect (m_treeview, "test-collapse-row",
+                            G_CALLBACK (wxdataview_test_collapse_row_callback), this);
+
+    g_signal_connect_after (m_treeview, "row-collapsed",
+                            G_CALLBACK (wxdataview_row_collapsed_callback), this);
+
+    g_signal_connect (m_treeview, "test-expand-row",
+                            G_CALLBACK (wxdataview_test_expand_row_callback), this);
+
+    g_signal_connect_after (m_treeview, "row-expanded",
+                            G_CALLBACK (wxdataview_row_expanded_callback), this);
+
+    g_signal_connect (m_treeview, "motion_notify_event",
+                      G_CALLBACK (gtk_dataview_motion_notify_callback), this);
+
+    g_signal_connect (m_treeview, "button_press_event",
+                      G_CALLBACK (gtk_dataview_button_press_callback), this);
+
     return true;
 }
 
@@ -2075,20 +3708,40 @@ void wxDataViewCtrl::OnInternalIdle()
     }
 }
 
-bool wxDataViewCtrl::AssociateModel( wxDataViewListModel *model )
+bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
 {
+    if (GetModel())
+    {
+        delete m_internal;
+        m_internal = NULL;
+
+        delete m_notifier;
+        m_notifier = NULL;
+    }
+
     if (!wxDataViewCtrlBase::AssociateModel( model ))
         return false;
 
-    GtkWxListStore *gtk_store = wxgtk_list_store_new();
-    gtk_store->model = model;
+#ifdef __WXGTK26__
+    if (!gtk_check_version(2,6,0))
+    {
+        bool fixed = (((GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) == 0) || (model->IsVirtualListModel()));
+        gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed );
+    }
+#endif
+
+    GtkWxTreeModel *gtk_model = wxgtk_tree_model_new();
+    m_internal = new wxDataViewCtrlInternal( this, model, gtk_model );
+    gtk_model->internal = m_internal;
 
-    m_notifier = new wxGtkDataViewListModelNotifier( gtk_store, model );
+    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_store) );
-    g_object_unref( gtk_store );
+    gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_model) );
+
+    // unref in wxDataViewCtrlInternal
+    // g_object_unref( gtk_model );
 
     return true;
 }
@@ -2098,108 +3751,191 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
     if (!wxDataViewCtrlBase::AppendColumn(col))
         return false;
 
-    GtkTreeViewColumn *column = (GtkTreeViewColumn *)col->GetGtkHandle();
+    m_cols.Append( col );
+
+#ifdef __WXGTK26__
+    if (!gtk_check_version(2,6,0))
+    {
+        if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
+               GTK_TREE_VIEW_COLUMN_FIXED)
+           gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
+    }
+#endif
 
-    gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), column );
+    gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview),
+                                 GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) );
 
     return true;
 }
 
-void wxDataViewCtrl::SetSelection( int row )
+bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
 {
-    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+    if (!wxDataViewCtrlBase::PrependColumn(col))
+        return false;
+
+    m_cols.Insert( col );
 
-    if (row < 0)
+#ifdef __WXGTK26__
+    if (!gtk_check_version(2,6,0))
     {
-        gtk_tree_selection_unselect_all( selection );
+        if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
+               GTK_TREE_VIEW_COLUMN_FIXED)
+           gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
     }
-    else
-    {
-        GtkTreePath *path = gtk_tree_path_new ();
-        gtk_tree_path_append_index( path, row );
+#endif
+
+    gtk_tree_view_insert_column( GTK_TREE_VIEW(m_treeview),
+                                 GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()), 0 );
 
-        gtk_tree_selection_select_path( selection, path );
+    return true;
+}
+
+bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col )
+{
+    if (!wxDataViewCtrlBase::InsertColumn(pos,col))
+        return false;
+
+    m_cols.Insert( pos, col );
 
-        gtk_tree_path_free( path );
+#ifdef __WXGTK26__
+    if (!gtk_check_version(2,6,0))
+    {
+        if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
+               GTK_TREE_VIEW_COLUMN_FIXED)
+           gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
     }
+#endif
+
+    gtk_tree_view_insert_column( GTK_TREE_VIEW(m_treeview),
+                                 GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()), pos );
+
+    return true;
 }
 
-void wxDataViewCtrl::Unselect( unsigned int row )
+unsigned int wxDataViewCtrl::GetColumnCount() const
 {
-    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+    return m_cols.GetCount();
+}
 
-    GtkTreePath *path = gtk_tree_path_new ();
-    gtk_tree_path_append_index( path, row );
+wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
+{
+    GtkTreeViewColumn *gtk_col = gtk_tree_view_get_column( GTK_TREE_VIEW(m_treeview), pos );
+    if (!gtk_col)
+        return NULL;
 
-    gtk_tree_selection_unselect_path( selection, path );
+    wxDataViewColumnList::const_iterator iter;
+    for (iter = m_cols.begin(); iter != m_cols.end(); ++iter)
+    {
+        wxDataViewColumn *col = *iter;
+        if (GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) == gtk_col)
+        {
+            return col;
+        }
+    }
 
-    gtk_tree_path_free( path );
+    return NULL;
 }
 
-void wxDataViewCtrl::SetSelectionRange( unsigned int from, unsigned int to )
+bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
 {
+    gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview),
+                                 GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()) );
+
+    m_cols.DeleteObject( column );
+
+    return true;
 }
 
-void wxDataViewCtrl::SetSelections( const wxArrayInt& aSelections)
+bool wxDataViewCtrl::ClearColumns()
 {
+    wxDataViewColumnList::iterator iter;
+    for (iter = m_cols.begin(); iter != m_cols.end(); ++iter)
+    {
+        wxDataViewColumn *col = *iter;
+        gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview),
+                                     GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) );
+    }
+
+    m_cols.Clear();
+
+    return true;
 }
 
-bool wxDataViewCtrl::IsSelected( unsigned int row ) const
+int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
 {
-    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+    GtkTreeViewColumn *gtk_column = GTK_TREE_VIEW_COLUMN(column->GetConstGtkHandle());
 
-    GtkTreePath *path = gtk_tree_path_new ();
-    gtk_tree_path_append_index( path, row );
+    GList *list = gtk_tree_view_get_columns( GTK_TREE_VIEW(m_treeview) );
 
-    gboolean ret =  gtk_tree_selection_path_is_selected( selection, path );
+    gint pos = g_list_index( list, (gconstpointer)  gtk_column );
 
+    g_list_free( list );
+
+    return pos;
+}
+
+wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
+{
+    return m_internal->GetDataViewSortColumn();
+}
+
+void wxDataViewCtrl::Expand( const wxDataViewItem & item )
+{
+    GtkTreeIter iter;
+    iter.user_data = item.GetID();
+    GtkTreePath *path = m_internal->get_path( &iter );
+    gtk_tree_view_expand_row( GTK_TREE_VIEW(m_treeview), path, false );
     gtk_tree_path_free( path );
+}
 
-    return ret;
+void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
+{
+    GtkTreeIter iter;
+    iter.user_data = item.GetID();
+    GtkTreePath *path = m_internal->get_path( &iter );
+    gtk_tree_view_collapse_row( GTK_TREE_VIEW(m_treeview), path );
+    gtk_tree_path_free( path );
 }
 
-int wxDataViewCtrl::GetSelection() const
+wxDataViewItem wxDataViewCtrl::GetSelection() const
 {
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
-    if (HasFlag(wxDV_MULTIPLE))
+
+    if (m_windowStyle & wxDV_MULTIPLE)
     {
+        // Report the first one
         GtkTreeModel *model;
         GList *list = gtk_tree_selection_get_selected_rows( selection, &model );
 
-        // do something
         if (list)
         {
-            // list = g_list_nth( list, 0 );  should be a noop
             GtkTreePath *path = (GtkTreePath*) list->data;
-
-            unsigned int row = (unsigned int)gtk_tree_path_get_indices (path)[0];
+            GtkTreeIter iter;
+            m_internal->get_iter( &iter, path );
 
             // delete list
             g_list_foreach( list, (GFunc) gtk_tree_path_free, NULL );
             g_list_free( list );
 
-            return (int) row;
+            return wxDataViewItem( (void*) iter.user_data );
         }
     }
     else
     {
-
-        GtkTreeModel *model;
         GtkTreeIter iter;
-        gboolean has_selection = gtk_tree_selection_get_selected( selection, &model, &iter );
-        if (has_selection)
+        if (gtk_tree_selection_get_selected( selection, NULL, &iter ))
         {
-            unsigned int row = (wxUIntPtr) iter.user_data;
-            return (int) row;
+            wxDataViewItem item( (void*) iter.user_data );
+            return item;
         }
     }
 
-    return -1;
+    return wxDataViewItem(0);
 }
 
-int wxDataViewCtrl::GetSelections(wxArrayInt& aSelections) const
+int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const
 {
-    aSelections.Clear();
+    sel.Clear();
 
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
     if (HasFlag(wxDV_MULTIPLE))
@@ -2210,15 +3946,15 @@ int wxDataViewCtrl::GetSelections(wxArrayInt& aSelections) const
         int count = 0;
         while (list)
         {
-
-            // list = g_list_nth( list, 0 );  should be a noop
             GtkTreePath *path = (GtkTreePath*) list->data;
 
-            unsigned int row = (unsigned int)gtk_tree_path_get_indices (path)[0];
+            GtkTreeIter iter;
+            m_internal->get_iter( &iter, path );
 
-            aSelections.Add( (int) row );
+            sel.Add( wxDataViewItem( (void*) iter.user_data ) );
 
             list = g_list_next( list );
+            count++;
         }
 
         // delete list
@@ -2234,8 +3970,7 @@ int wxDataViewCtrl::GetSelections(wxArrayInt& aSelections) const
         gboolean has_selection = gtk_tree_selection_get_selected( selection, &model, &iter );
         if (has_selection)
         {
-            unsigned int row = (wxUIntPtr) iter.user_data;
-            aSelections.Add( (int) row );
+            sel.Add( wxDataViewItem( (void*) iter.user_data) );
             return 1;
         }
     }
@@ -2243,6 +3978,132 @@ int wxDataViewCtrl::GetSelections(wxArrayInt& aSelections) const
     return 0;
 }
 
+void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
+{
+    GtkDisableSelectionEvents();
+
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+
+    gtk_tree_selection_unselect_all( selection );
+
+    size_t i;
+    for (i = 0; i < sel.GetCount(); i++)
+    {
+        GtkTreeIter iter;
+        iter.user_data = (gpointer) sel[i].GetID();
+        gtk_tree_selection_select_iter( selection, &iter );
+    }
+
+    GtkEnableSelectionEvents();
+}
+
+void wxDataViewCtrl::Select( const wxDataViewItem & item )
+{
+    GtkDisableSelectionEvents();
+
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+
+    GtkTreeIter iter;
+    iter.user_data = (gpointer) item.GetID();
+    gtk_tree_selection_select_iter( selection, &iter );
+
+    GtkEnableSelectionEvents();
+}
+
+void wxDataViewCtrl::Unselect( const wxDataViewItem & item )
+{
+    GtkDisableSelectionEvents();
+
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+
+    GtkTreeIter iter;
+    iter.user_data = (gpointer) item.GetID();
+    gtk_tree_selection_unselect_iter( selection, &iter );
+
+    GtkEnableSelectionEvents();
+}
+
+bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const
+{
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+
+    GtkTreeIter iter;
+    iter.user_data = (gpointer) item.GetID();
+
+    return gtk_tree_selection_iter_is_selected( selection, &iter );
+}
+
+void wxDataViewCtrl::SelectAll()
+{
+    GtkDisableSelectionEvents();
+
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+
+    gtk_tree_selection_select_all( selection );
+
+    GtkEnableSelectionEvents();
+}
+
+void wxDataViewCtrl::UnselectAll()
+{
+    GtkDisableSelectionEvents();
+
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+
+    gtk_tree_selection_unselect_all( selection );
+
+    GtkEnableSelectionEvents();
+}
+
+void wxDataViewCtrl::EnsureVisible(const wxDataViewItem& item,
+                                   const wxDataViewColumn *WXUNUSED(column))
+{
+    GtkTreeIter iter;
+    iter.user_data = (gpointer) item.GetID();
+    GtkTreePath *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_path_free( path );
+}
+
+void wxDataViewCtrl::HitTest(const wxPoint& WXUNUSED(point),
+                             wxDataViewItem& item,
+                             wxDataViewColumn *& column) const
+{
+    item = wxDataViewItem(0);
+    column = NULL;
+}
+
+wxRect
+wxDataViewCtrl::GetItemRect(const wxDataViewItem& WXUNUSED(item),
+                            const wxDataViewColumn *WXUNUSED(column)) const
+{
+    return wxRect();
+}
+
+void wxDataViewCtrl::DoSetExpanderColumn()
+{
+    gtk_tree_view_set_expander_column( GTK_TREE_VIEW(m_treeview),
+        GTK_TREE_VIEW_COLUMN( GetExpanderColumn()->GetGtkHandle() ) );
+}
+
+void wxDataViewCtrl::DoSetIndent()
+{
+}
+
+void wxDataViewCtrl::GtkDisableSelectionEvents()
+{
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+    g_signal_handlers_disconnect_by_func( selection,
+                            (gpointer) (wxdataview_selection_changed_callback), this);
+}
+
+void wxDataViewCtrl::GtkEnableSelectionEvents()
+{
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+    g_signal_connect_after (selection, "changed",
+                            G_CALLBACK (wxdataview_selection_changed_callback), this);
+}
+
 // static
 wxVisualAttributes
 wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))