]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/dataview.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
compilation fix for Borland C++
[wxWidgets.git] / src / gtk / dataview.cpp
diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 8ac925600e5dd5a42629db2197b83137244643df..d0de7177ec3bc49a7c979c67e3750da52523e3d3 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dataview.cpp
+// Name:        src/gtk/dataview.cpp
 // Purpose:     wxDataViewCtrl GTK+2 implementation
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     wxDataViewCtrl GTK+2 implementation
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -10,33 +10,127 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_DATAVIEWCTRL
 
 #include "wx/dataview.h"
 #if wxUSE_DATAVIEWCTRL
 
 #include "wx/dataview.h"
+
+#ifndef wxUSE_GENERICDATAVIEWCTRL
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/dcclient.h"
+    #include "wx/sizer.h"
+#endif
+
 #include "wx/stockitem.h"
 #include "wx/stockitem.h"
-#include "wx/dcclient.h"
+#include "wx/calctrl.h"
+#include "wx/popupwin.h"
+#include "wx/icon.h"
+
 
 #include "wx/gtk/private.h"
 #include "wx/gtk/win_gtk.h"
 
 #include <gobject/gvaluecollector.h>
 #include <gtk/gtktreemodel.h>
 
 #include "wx/gtk/private.h"
 #include "wx/gtk/win_gtk.h"
 
 #include <gobject/gvaluecollector.h>
 #include <gtk/gtktreemodel.h>
+#include <gtk/gtktreesortable.h>
 #include <gtk/gtktreednd.h>
 
 #include <gtk/gtktreednd.h>
 
+#include <gdk/gdkkeysyms.h>
+
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
-class wxDataViewCtrl;
-
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-// idle system
+// wxGtkTreeModelNode
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+class wxGtkTreeModelNode;
+WX_DEFINE_ARRAY_PTR( wxGtkTreeModelNode*, wxGtkTreeModelNodes );
+
+class wxGtkTreeModelNode
+{
+public:
+    wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item )
+    { 
+        m_parent = parent; 
+        m_item = item;
+    }
+    
+    ~wxGtkTreeModelNode()
+    { 
+        size_t count = m_children.GetCount();
+        size_t i;
+        for (i = 0; i < count; i++)
+        {
+            wxGtkTreeModelNode *child = m_children[i];
+            delete child;
+        }
+    }
+
+    wxGtkTreeModelNode* GetParent() 
+        { return m_parent; }
+    wxGtkTreeModelNodes &GetChildren() 
+        { return m_children; }
+    wxGtkTreeModelNode* GetNthChild( unsigned int n ) 
+        { return m_children.Item( n ); }
+    void Insert( wxGtkTreeModelNode* child, unsigned int n) 
+        { m_children.Insert( child, n); }
+    void Append( wxGtkTreeModelNode* child ) 
+        { m_children.Add( child ); }
+
+    unsigned int GetChildCount() { return m_children.GetCount(); }
+
+    wxDataViewItem &GetItem() { return m_item; }
+
+    bool HasChildren() { return m_hasChildren; }
+    void SetHasChildren( bool has ) { m_hasChildren = has; }
+    
+private:
+    wxGtkTreeModelNode  *m_parent;
+    wxGtkTreeModelNodes  m_children; 
+    wxDataViewItem       m_item; 
+    bool                 m_hasChildren;
+};
+
+
+extern "C" {
+typedef struct _GtkWxTreeModel       GtkWxTreeModel;
+}
+
+class wxGtkTreeModel
+{
+public:
+    wxGtkTreeModel( wxDataViewModel *wx_model, GtkWxTreeModel *owner );
+    ~wxGtkTreeModel();
+    
+    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 );
+    
+    wxDataViewModel* GetDataViewModel() { return m_wx_model; }
+    GtkWxTreeModel* GetOwner()          { return m_owner; }
+
+    bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
+    bool ItemDeleted( const wxDataViewItem &item );
+    
+protected:
+    void InitTree();
+    wxGtkTreeModelNode *FindNode( const wxDataViewItem &item );
+    wxGtkTreeModelNode *FindNode( GtkTreeIter *iter );
+    void BuildBranch( wxGtkTreeModelNode *branch );
+    
+private:
+    wxGtkTreeModelNode   *m_root;
+    wxDataViewModel      *m_wx_model;
+    GtkWxTreeModel       *m_owner;
+};
 
 //-----------------------------------------------------------------------------
 // data
 
 //-----------------------------------------------------------------------------
 // data
@@ -45,386 +139,683 @@ extern bool g_isIdle;
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
-// define new GTK+ class wxGtkListStore
+// define new GTK+ class wxGtkTreeModel
 //-----------------------------------------------------------------------------
 
 extern "C" {
 
 //-----------------------------------------------------------------------------
 
 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;
 {
   GObject parent;
 
   /*< private >*/
   gint stamp;
-  wxDataViewListModel *model;
+  wxGtkTreeModel *model;
+  
+  gint sort_column_id;
+  GtkSortType order;
 };
 
 };
 
-struct _GtkWxListStoreClass
+struct _GtkWxTreeModelClass
 {
   GObjectClass list_parent_class;
 {
   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,
-                                                   gint               index);
-static gboolean     wxgtk_list_store_get_iter        (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter,
-                                                   GtkTreePath       *path);
-static GtkTreePath *wxgtk_list_store_get_path        (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter);
-static void         wxgtk_list_store_get_value       (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter,
-                                                   gint               column,
-                                                   GValue            *value);
-static gboolean     wxgtk_list_store_iter_next       (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter);
-static gboolean     wxgtk_list_store_iter_children   (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter,
-                                                   GtkTreeIter       *parent);
-static gboolean     wxgtk_list_store_iter_has_child  (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter);
-static gint         wxgtk_list_store_iter_n_children (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter);
-static gboolean     wxgtk_list_store_iter_nth_child  (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter,
-                                                   GtkTreeIter       *parent,
-                                                   gint               n);
-static gboolean     wxgtk_list_store_iter_parent     (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter,
-                                                   GtkTreeIter       *child);
+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_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_tree_model_get_iter        (GtkTreeModel      *tree_model,
+                                                      GtkTreeIter       *iter,
+                                                      GtkTreePath       *path);
+static GtkTreePath *wxgtk_tree_model_get_path        (GtkTreeModel      *tree_model,
+                                                      GtkTreeIter       *iter);
+static void         wxgtk_tree_model_get_value       (GtkTreeModel      *tree_model,
+                                                      GtkTreeIter       *iter,
+                                                      gint               column,
+                                                      GValue            *value);
+static gboolean     wxgtk_tree_model_iter_next       (GtkTreeModel      *tree_model,
+                                                      GtkTreeIter       *iter);
+static gboolean     wxgtk_tree_model_iter_children   (GtkTreeModel      *tree_model,
+                                                      GtkTreeIter       *iter,
+                                                      GtkTreeIter       *parent);
+static gboolean     wxgtk_tree_model_iter_has_child  (GtkTreeModel      *tree_model,
+                                                      GtkTreeIter       *iter);
+static gint         wxgtk_tree_model_iter_n_children (GtkTreeModel      *tree_model,
+                                                      GtkTreeIter       *iter);
+static gboolean     wxgtk_tree_model_iter_nth_child  (GtkTreeModel      *tree_model,
+                                                      GtkTreeIter       *iter,
+                                                      GtkTreeIter       *parent,
+                                                      gint               n);
+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);
+
+
 
 static GObjectClass *list_parent_class = NULL;
 
 GType
 
 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)
     {
     {
-      static const GTypeInfo list_store_info =
-      {
-       sizeof (GtkWxListStoreClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-        (GClassInitFunc) wxgtk_list_store_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-        sizeof (GtkWxListStore),
-       0,
-        (GInstanceInitFunc) wxgtk_list_store_init,
-      };
-
-      static const GInterfaceInfo tree_model_info =
-      {
-       (GInterfaceInitFunc) wxgtk_list_store_tree_model_init,
-       NULL,
-       NULL
-      };
-
-      list_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkWxListStore",
-                                               &list_store_info, (GTypeFlags)0 );
-
-      g_type_add_interface_static (list_store_type,
-                                  GTK_TYPE_TREE_MODEL,
-                                  &tree_model_info);
+        const GTypeInfo tree_model_info =
+        {
+            sizeof (GtkWxTreeModelClass),
+            NULL,   /* base_init */
+            NULL,   /* base_finalize */
+            (GClassInitFunc) wxgtk_tree_model_class_init,
+            NULL,   /* class_finalize */
+            NULL,   /* class_data */
+            sizeof (GtkWxTreeModel),
+            0,
+            (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
+        };
+
+        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);
     }
 
     }
 
-  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
     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;
 {
     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_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
 }
 
 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_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
 }
 
 static void
-wxgtk_list_store_init (GtkWxListStore *list_store)
+wxgtk_tree_model_init (GtkWxTreeModel *tree_model)
 {
 {
-    list_store->model = NULL;
-    list_store->stamp = g_random_int();
+    tree_model->model = NULL;
+    tree_model->stamp = g_random_int();
+    tree_model->sort_column_id = -2;
+    tree_model->order = GTK_SORT_ASCENDING;
 }
 
 static void
 }
 
 static void
-wxgtk_list_store_finalize (GObject *object)
+wxgtk_tree_model_finalize (GObject *object)
 {
 {
-    /* GtkWxListStore *list_store = GTK_WX_LIST_STORE (object); */
+    GtkWxTreeModel *tree_model = GTK_WX_TREE_MODEL(object);
 
     /* we need to sort out, which class deletes what */
 
     /* we need to sort out, which class deletes what */
-    /* delete list_store->model; */
+    delete tree_model->model;
 
     /* must chain up */
     (* list_parent_class->finalize) (object);
 }
 
     /* must chain up */
     (* list_parent_class->finalize) (object);
 }
-                        
+
 } // extern "C"
 
 //-----------------------------------------------------------------------------
 } // 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
 //-----------------------------------------------------------------------------
 
 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 );
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (tree_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 GTK_TREE_MODEL_ITERS_PERSIST;
 }
 
 static gint
 }
 
 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->GetNumberOfCols();
+    return wxtree_model->model->GetDataViewModel()->GetColumnCount();
 }
 
 static GType
 }
 
 static GType
-wxgtk_list_store_get_column_type (GtkTreeModel *tree_model,
-                               gint          index)
+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;
 
     GType gtype = G_TYPE_INVALID;
-    
-    wxString wxtype = list_store->model->GetColType( (size_t) index );
-    
+
+    wxString wxtype = wxtree_model->model->GetDataViewModel()->GetColumnType( (unsigned int) index );
+
     if (wxtype == wxT("string"))
         gtype = G_TYPE_STRING;
     if (wxtype == wxT("string"))
         gtype = G_TYPE_STRING;
+    else
+    {
+        wxFAIL_MSG( _T("non-string columns not supported yet") );
+    }
 
     return gtype;
 }
 
 static gboolean
 
     return gtype;
 }
 
 static gboolean
-wxgtk_list_store_get_iter (GtkTreeModel *tree_model,
-                        GtkTreeIter  *iter,
-                        GtkTreePath  *path)
+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);
 
     g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
 
-    size_t i = (size_t)gtk_tree_path_get_indices (path)[0];
-
-    if (i >= list_store->model->GetNumberOfRows())
-        return FALSE;
-
-    iter->stamp = list_store->stamp;
-    // user_data is just the index
-    iter->user_data = (gpointer) i;
-
-    return TRUE;
+    return wxtree_model->model->get_iter( iter, path );
 }
 
 static GtkTreePath *
 }
 
 static GtkTreePath *
-wxgtk_list_store_get_path (GtkTreeModel *tree_model,
-                        GtkTreeIter  *iter)
+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);
-  
-    GtkTreePath *retval = gtk_tree_path_new ();
-    // user_data is just the index
-    int i = (int) iter->user_data;
-    gtk_tree_path_append_index (retval, i);
-    return retval;
+    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);
+
+    return wxtree_model->model->get_path( iter );
 }
 
 static void
 }
 
 static void
-wxgtk_list_store_get_value (GtkTreeModel *tree_model,
-                         GtkTreeIter  *iter,
-                         gint          column,
-                         GValue       *value)
+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;
-    wxString mtype = model->GetColType( (size_t) column );
+    wxDataViewModel *model = wxtree_model->model->GetDataViewModel();
+    wxString mtype = model->GetColumnType( (unsigned int) column );
     if (mtype == wxT("string"))
     {
     if (mtype == wxT("string"))
     {
+        wxVariant variant;
         g_value_init( value, G_TYPE_STRING );
         g_value_init( value, G_TYPE_STRING );
-        wxVariant variant = model->GetValue( (size_t) column, (size_t) iter->user_data );
-        g_value_set_string( value, wxGTK_CONV(variant.GetString()) );
+        wxDataViewItem item( (void*) iter->user_data );
+        model->GetValue( variant, item, (unsigned int) column );
+
+        g_value_set_string( value, variant.GetString().utf8_str() );
     }
     else
     {
     }
     else
     {
+        wxFAIL_MSG( _T("non-string columns not supported yet") );
     }
     }
-    
-#if 0
-  GtkTreeDataList *list;
-  gint tmp_column = column;
+}
 
 
-  g_return_if_fail (column < GTK_LIST_STORE (tree_model)->n_columns);
-  g_return_if_fail (GTK_LIST_STORE (tree_model)->stamp == iter->stamp);
+static gboolean
+wxgtk_tree_model_iter_next (GtkTreeModel  *tree_model,
+                            GtkTreeIter   *iter)
+{
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+    g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE);
 
 
-  list = G_SLIST (iter->user_data)->data;
+    return wxtree_model->model->iter_next( iter );
+}
 
 
-  while (tmp_column-- > 0 && list)
-    list = list->next;
+static gboolean
+wxgtk_tree_model_iter_children (GtkTreeModel *tree_model,
+                                GtkTreeIter  *iter,
+                                GtkTreeIter  *parent)
+{
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+    g_return_val_if_fail (wxtree_model->stamp == parent->stamp, FALSE);
 
 
-  if (list == NULL)
-    g_value_init (value, GTK_LIST_STORE (tree_model)->column_headers[column]);
-  else
-    _gtk_tree_data_list_node_to_value (list,
-                                      GTK_LIST_STORE (tree_model)->column_headers[column],
-                                      value);
-#endif
+    return wxtree_model->model->iter_children( iter, parent );
+}
+
+static gboolean
+wxgtk_tree_model_iter_has_child (GtkTreeModel *tree_model,
+                                 GtkTreeIter  *iter)
+{
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+    g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE);
+
+    return wxtree_model->model->iter_has_child( iter );
+}
+
+static gint
+wxgtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
+                                  GtkTreeIter  *iter)
+{
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+    g_return_val_if_fail (wxtree_model->stamp == iter->stamp, 0);
 
 
+    return wxtree_model->model->iter_n_children( iter );
 }
 
 static gboolean
 }
 
 static gboolean
-wxgtk_list_store_iter_next (GtkTreeModel  *tree_model,
-                         GtkTreeIter   *iter)
+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;
-    
-    g_return_val_if_fail (list_store->stamp == iter->stamp, FALSE);
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+
+    return wxtree_model->model->iter_nth_child( iter, parent, n );
+}
 
 
-    int n = (int) iter->user_data;
+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 == -1)
+    return wxtree_model->model->iter_parent( iter, child );
+}
+
+/* sortable */
+gboolean wxgtk_tree_model_get_sort_column_id    (GtkTreeSortable        *sortable,
+                                                     gint                     *sort_column_id,
+                                                     GtkSortType              *order)
+{
+    GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable;
+
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE);
+
+    if (tree_model->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
         return FALSE;
         return FALSE;
+
+    if (sort_column_id)
+        *sort_column_id = tree_model->sort_column_id;
         
         
-    if (n >= (int) list_store->model->GetNumberOfRows()-1)
-        return FALSE;
+    if (order)
+        *order = tree_model->order;
+        
+    return TRUE;
+}
+
+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) );
+
+    if ((tree_model->sort_column_id == sort_column_id) &&
+        (tree_model->order == order))
+    return;
+
+    tree_model->sort_column_id = sort_column_id;
+    tree_model->order = order;
+
+    gtk_tree_sortable_sort_column_changed (sortable);
+
+    wxPrintf( "wxgtk_tree_model_set_column_id, sort_column_id = %d, order = %d\n", sort_column_id, (int)order );
+    // sort
+}
+
+void     wxgtk_tree_model_set_sort_func         (GtkTreeSortable        *sortable,
+                                                     gint                      sort_column_id,
+                                                     GtkTreeIterCompareFunc    func,
+                                                     gpointer                  data,
+                                                     GtkDestroyNotify          destroy)
+{
+    g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
+    g_return_if_fail (func != NULL);
+
+    wxPrintf( "wxgtk_tree_model_set_sort_func, sort_column_id = %d\n", sort_column_id );
+    // sort
+}
+
+void     wxgtk_tree_model_set_default_sort_func (GtkTreeSortable        *sortable,
+                                                     GtkTreeIterCompareFunc    func,
+                                                     gpointer                  data,
+                                                     GtkDestroyNotify          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)
+{
+    return FALSE;
+}
+
+
+//-----------------------------------------------------------------------------
+// wxGtkTreeModel
+//-----------------------------------------------------------------------------
+
+wxGtkTreeModel::wxGtkTreeModel( wxDataViewModel *wx_model, GtkWxTreeModel *owner )
+{ 
+    m_wx_model = wx_model; 
+    m_owner = owner; 
+    m_root = NULL; 
+    InitTree();
+}
+    
+wxGtkTreeModel::~wxGtkTreeModel()
+{
+}
+    
+void wxGtkTreeModel::BuildBranch( wxGtkTreeModelNode *node )
+{
+    if (node->GetChildCount() == 0)
+    {
+        wxDataViewItem child = m_wx_model->GetFirstChild( node->GetItem() );
+        while (child.IsOk())
+        {
+            // wxPrintf( "AddItem %d\n", (int) child.GetID() );
+            node->Append( new wxGtkTreeModelNode( node, child ) );
+            child = m_wx_model->GetNextSibling( child );
+        }
+    }
+}
+
+bool wxGtkTreeModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
+{
+    wxGtkTreeModelNode *parent_node = FindNode( parent );
+    parent_node->Append( new wxGtkTreeModelNode( parent_node, item ) );
+    return true;
+}
+
+bool wxGtkTreeModel::ItemDeleted( const wxDataViewItem &item )
+{
+    wxGtkTreeModelNode *node = FindNode( item );
+    wxGtkTreeModelNode *parent = node->GetParent();
+    parent->GetChildren().Remove( node );
+    delete node;
+
+    return true;
+}
+
+gboolean wxGtkTreeModel::get_iter( GtkTreeIter *iter, GtkTreePath *path )
+{
+    int depth = gtk_tree_path_get_depth( path );
+
+    wxGtkTreeModelNode *node = m_root;
+
+    int i;
+    for (i = 0; i < depth; i++)    
+    {
+        BuildBranch( node );
         
         
-    iter->user_data = (gpointer) ++n;
+        gint pos = gtk_tree_path_get_indices (path)[i];
+        if (pos < 0) return FALSE;
+        if ((size_t)pos >= node->GetChildCount()) return FALSE;
+        
+        node = node->GetChildren().Item( (size_t) pos );
+    }
+
+    iter->stamp = m_owner->stamp;
+    iter->user_data = (gpointer) node->GetItem().GetID();
 
     return TRUE;
 }
 
 
     return TRUE;
 }
 
-static gboolean
-wxgtk_list_store_iter_children (GtkTreeModel *tree_model,
-                             GtkTreeIter  *iter,
-                             GtkTreeIter  *parent)
+GtkTreePath *wxGtkTreeModel::get_path( GtkTreeIter *iter )
 {
 {
-    g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
-    GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
+    GtkTreePath *retval = gtk_tree_path_new ();
     
     
-    // this is a list, nodes have no children
-    if (parent)
+    wxGtkTreeModelNode *node = FindNode( iter );
+    while (node->GetParent())
+    {
+        wxGtkTreeModelNode *parent = node->GetParent();
+        int pos = parent->GetChildren().Index( node );
+        
+        gtk_tree_path_prepend_index( retval, pos );
+
+        node = parent;
+    }
+
+    return retval;
+}
+
+gboolean wxGtkTreeModel::iter_next( GtkTreeIter *iter )
+{
+    wxDataViewItem item( (void*) iter->user_data );
+    item = m_wx_model->GetNextSibling( item );
+    if (!item.IsOk())
         return FALSE;
 
         return FALSE;
 
-    iter->stamp = list_store->stamp;
-    iter->user_data = (gpointer) -1;
-    
+    iter->user_data = (gpointer) item.GetID();
+
     return TRUE;
 }
 
     return TRUE;
 }
 
-static gboolean
-wxgtk_list_store_iter_has_child (GtkTreeModel *tree_model,
-                              GtkTreeIter  *iter)
+gboolean wxGtkTreeModel::iter_children( GtkTreeIter *iter, GtkTreeIter *parent )
 {
 {
-    return FALSE;
+    wxDataViewItem item( (void*) parent->user_data );
+    
+    if (!m_wx_model->HasChildren( item ))
+        return FALSE;
+        
+    wxGtkTreeModelNode *parent_node = FindNode( parent );
+    BuildBranch( parent_node );
+        
+    wxGtkTreeModelNode *first_child_node = parent_node->GetChildren().Item( 0 );
+    
+    iter->stamp = m_owner->stamp;
+    iter->user_data = (gpointer) first_child_node->GetItem().GetID();
+
+    return TRUE;
 }
 
 }
 
-static gint
-wxgtk_list_store_iter_n_children (GtkTreeModel *tree_model,
-                               GtkTreeIter  *iter)
+gboolean wxGtkTreeModel::iter_has_child( GtkTreeIter *iter )
 {
 {
-    g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), -1);
-    GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
+    wxDataViewItem item( (void*) iter->user_data );
     
     
-    if (iter == NULL)
-        return (gint) list_store->model->GetNumberOfRows();
+    return m_wx_model->HasChildren( item );
+}
 
 
-    g_return_val_if_fail (list_store->stamp == iter->stamp, -1);
-  
-    return 0;
+gint wxGtkTreeModel::iter_n_children( GtkTreeIter *iter )
+{
+    wxDataViewItem item( (void*) iter->user_data );
+    
+    if (!m_wx_model->HasChildren( item ))
+        return 0;
+    
+    wxGtkTreeModelNode *parent_node = FindNode( iter );
+    BuildBranch( parent_node );
+    
+    return parent_node->GetChildCount();
 }
 
 }
 
-static gboolean
-wxgtk_list_store_iter_nth_child (GtkTreeModel *tree_model,
-                              GtkTreeIter  *iter,
-                              GtkTreeIter  *parent,
-                              gint          n)
+gboolean wxGtkTreeModel::iter_nth_child( 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;
+    void* id = NULL;
+    if (parent) id = (void*) parent->user_data;
+    wxDataViewItem item( id );
     
     
-    if (parent)
+    if (!m_wx_model->HasChildren( item ))
         return FALSE;
         return FALSE;
+    
+    wxGtkTreeModelNode *parent_node = FindNode( parent );
+    BuildBranch( parent_node );
 
 
-    if (n < 0)
-        return FALSE;
-        
-    if (n >= (gint) list_store->model->GetNumberOfRows())
+    wxGtkTreeModelNode *child_node = parent_node->GetChildren().Item( (size_t) n );
+    if (!child_node)
         return FALSE;
         return FALSE;
+    
+    iter->stamp = m_owner->stamp;
+    iter->user_data = (gpointer) child_node->GetItem().GetID();
+
+    return TRUE;
+}
 
 
-    iter->stamp = list_store->stamp;
-    iter->user_data = (gpointer) n;
+gboolean wxGtkTreeModel::iter_parent( GtkTreeIter *iter, GtkTreeIter *child )
+{
+    wxDataViewItem item( (void*) child->user_data );
+    
+    wxGtkTreeModelNode *node = FindNode( child );
+    node = node->GetParent();
+    if (!node)
+        return FALSE;
     
     
+    iter->stamp = m_owner->stamp;
+    iter->user_data = (gpointer) node->GetItem().GetID();
+
     return TRUE;
 }
     return TRUE;
 }
+    
+void wxGtkTreeModel::InitTree()
+{
+    wxDataViewItem item;
+    m_root = new wxGtkTreeModelNode( NULL, item );
+
+    BuildBranch( m_root );
+}
 
 
-static gboolean
-wxgtk_list_store_iter_parent (GtkTreeModel *tree_model,
-                           GtkTreeIter  *iter,
-                           GtkTreeIter  *child)
+static wxGtkTreeModelNode*
+wxGtkTreeModel_FindNode( wxGtkTreeModelNode *node, const wxDataViewItem &item )
 {
 {
-    return FALSE;
+    if (!node) return NULL;
+
+    size_t count = node->GetChildCount();
+    size_t i;
+    for (i = 0; i < count; i++)
+    {
+        wxGtkTreeModelNode *child = node->GetChildren().Item( i );
+        if (child->GetItem().GetID() == item.GetID())
+            return child;
+            
+        wxGtkTreeModelNode *node2 = wxGtkTreeModel_FindNode( child, item );
+        if (node2)
+            return node2;
+    }
+    
+    return NULL;
+}
+
+wxGtkTreeModelNode *wxGtkTreeModel::FindNode( GtkTreeIter *iter )
+{
+    if (!iter)
+        return m_root;
+
+    wxDataViewItem item( (void*) iter->user_data );
+    
+    wxGtkTreeModelNode *result = wxGtkTreeModel_FindNode( m_root, item );
+    
+    if (!result)
+    {
+        wxPrintf( "Not found %d\n", (int) iter->user_data );
+        char *crash = NULL;
+        *crash = 0;
+    }
+    
+    return result;
+}
+
+wxGtkTreeModelNode *wxGtkTreeModel::FindNode( const wxDataViewItem &item )
+{
+    wxGtkTreeModelNode *result = wxGtkTreeModel_FindNode( m_root, item );
+    
+    if (!result)
+    {
+        wxPrintf( "Not found %d\n", (int) item.GetID() );
+        char *crash = NULL;
+        *crash = 0;
+    }
+    
+    return result;
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------
-// define new GTK+ class wxGtkCellRenderer
+// define new GTK+ class wxGtkRendererRenderer
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {
@@ -446,7 +837,8 @@ struct _GtkWxCellRenderer
   GtkCellRenderer parent;
 
   /*< private >*/
   GtkCellRenderer parent;
 
   /*< private >*/
-  wxDataViewCustomCell *cell;
+  wxDataViewCustomRenderer *cell;
+  guint32 last_click;
 };
 
 struct _GtkWxCellRendererClass
 };
 
 struct _GtkWxCellRendererClass
@@ -464,20 +856,20 @@ static void gtk_wx_cell_renderer_finalize (
                         GObject                *object );
 static void gtk_wx_cell_renderer_get_size (
                         GtkCellRenderer         *cell,
                         GObject                *object );
 static void gtk_wx_cell_renderer_get_size (
                         GtkCellRenderer         *cell,
-                                               GtkWidget               *widget,
-                                               GdkRectangle            *rectangle,
-                                               gint                    *x_offset,
-                                               gint                    *y_offset,
-                                               gint                    *width,
-                                               gint                    *height );
+                        GtkWidget               *widget,
+                        GdkRectangle            *rectangle,
+                        gint                    *x_offset,
+                        gint                    *y_offset,
+                        gint                    *width,
+                        gint                    *height );
 static void gtk_wx_cell_renderer_render (
                         GtkCellRenderer         *cell,
 static void gtk_wx_cell_renderer_render (
                         GtkCellRenderer         *cell,
-                                               GdkWindow               *window,
-                                               GtkWidget               *widget,
-                                               GdkRectangle            *background_area,
-                                               GdkRectangle            *cell_area,
-                                               GdkRectangle            *expose_area,
-                                               GtkCellRendererState     flags );
+                        GdkWindow               *window,
+                        GtkWidget               *widget,
+                        GdkRectangle            *background_area,
+                        GdkRectangle            *cell_area,
+                        GdkRectangle            *expose_area,
+                        GtkCellRendererState     flags );
 static gboolean gtk_wx_cell_renderer_activate(
                         GtkCellRenderer         *cell,
                         GdkEvent                *event,
 static gboolean gtk_wx_cell_renderer_activate(
                         GtkCellRenderer         *cell,
                         GdkEvent                *event,
@@ -486,32 +878,41 @@ static gboolean gtk_wx_cell_renderer_activate(
                         GdkRectangle            *background_area,
                         GdkRectangle            *cell_area,
                         GtkCellRendererState     flags );
                         GdkRectangle            *background_area,
                         GdkRectangle            *cell_area,
                         GtkCellRendererState     flags );
+static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
+                        GtkCellRenderer         *cell,
+                        GdkEvent                *event,
+                        GtkWidget               *widget,
+                        const gchar             *path,
+                        GdkRectangle            *background_area,
+                        GdkRectangle            *cell_area,
+                        GtkCellRendererState     flags );
+
 
 static GObjectClass *cell_parent_class = NULL;
 
 }  // extern "C"
 
 
 static GObjectClass *cell_parent_class = NULL;
 
 }  // extern "C"
 
-GType 
+GType
 gtk_wx_cell_renderer_get_type (void)
 {
     static GType cell_wx_type = 0;
 
     if (!cell_wx_type)
     {
 gtk_wx_cell_renderer_get_type (void)
 {
     static GType cell_wx_type = 0;
 
     if (!cell_wx_type)
     {
-        static const GTypeInfo cell_wx_info =
+        const GTypeInfo cell_wx_info =
         {
             sizeof (GtkWxCellRendererClass),
         {
             sizeof (GtkWxCellRendererClass),
-            NULL,              /* base_init */
-            NULL,              /* base_finalize */
+            NULL, /* base_init */
+            NULL, /* base_finalize */
             (GClassInitFunc) gtk_wx_cell_renderer_class_init,
             (GClassInitFunc) gtk_wx_cell_renderer_class_init,
-            NULL,              /* class_finalize */
-            NULL,              /* class_data */
+            NULL, /* class_finalize */
+            NULL, /* class_data */
             sizeof (GtkWxCellRenderer),
             0,          /* n_preallocs */
             (GInstanceInitFunc) gtk_wx_cell_renderer_init,
         };
 
             sizeof (GtkWxCellRenderer),
             0,          /* n_preallocs */
             (GInstanceInitFunc) gtk_wx_cell_renderer_init,
         };
 
-        cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER, 
+        cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER,
             "GtkWxCellRenderer", &cell_wx_info, (GTypeFlags)0 );
     }
 
             "GtkWxCellRenderer", &cell_wx_info, (GTypeFlags)0 );
     }
 
@@ -522,6 +923,7 @@ static void
 gtk_wx_cell_renderer_init (GtkWxCellRenderer *cell)
 {
     cell->cell = NULL;
 gtk_wx_cell_renderer_init (GtkWxCellRenderer *cell)
 {
     cell->cell = NULL;
+    cell->last_click = 0;
 }
 
 static void
 }
 
 static void
@@ -537,6 +939,7 @@ gtk_wx_cell_renderer_class_init (GtkWxCellRendererClass *klass)
     cell_class->get_size = gtk_wx_cell_renderer_get_size;
     cell_class->render = gtk_wx_cell_renderer_render;
     cell_class->activate = gtk_wx_cell_renderer_activate;
     cell_class->get_size = gtk_wx_cell_renderer_get_size;
     cell_class->render = gtk_wx_cell_renderer_render;
     cell_class->activate = gtk_wx_cell_renderer_activate;
+    cell_class->start_editing = gtk_wx_cell_renderer_start_editing;
 }
 
 static void
 }
 
 static void
@@ -552,36 +955,79 @@ gtk_wx_cell_renderer_new (void)
     return (GtkCellRenderer*) g_object_new (GTK_TYPE_WX_CELL_RENDERER, NULL);
 }
 
     return (GtkCellRenderer*) g_object_new (GTK_TYPE_WX_CELL_RENDERER, NULL);
 }
 
-static void
-gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
-                                  GtkWidget       *widget,
-                                  GdkRectangle    *cell_area,
-                                  gint            *x_offset,
-                                  gint            *y_offset,
-                                  gint            *width,
-                                  gint            *height)
+
+
+static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
+                        GtkCellRenderer         *renderer,
+                        GdkEvent                *event,
+                        GtkWidget               *widget,
+                        const gchar             *path,
+                        GdkRectangle            *background_area,
+                        GdkRectangle            *cell_area,
+                        GtkCellRendererState     flags )
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
-    wxDataViewCustomCell *cell = wxrenderer->cell;
-  
-    wxSize size = cell->GetSize();
+    wxDataViewCustomRenderer *cell = wxrenderer->cell;
+    if (!cell->HasEditorCtrl())
+        return NULL;
 
 
-    gint calc_width  = (gint) renderer->xpad * 2 + size.x;
-    gint calc_height = (gint) renderer->ypad * 2 + size.y;
-  
-    if (x_offset) 
-        *x_offset = 0;
-    if (y_offset) 
-        *y_offset = 0;
+    GdkRectangle rect;
+    gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
+                                   &rect.x,
+                                   &rect.y,
+                                   &rect.width,
+                                   &rect.height);
+
+    rect.x += cell_area->x;
+    rect.y += cell_area->y;
+//    rect.width  -= renderer->xpad * 2;
+//    rect.height -= renderer->ypad * 2;
+
+//    wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
+    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 );
+    // TODO
+    wxDataViewItem item;
+    gtk_tree_path_free( treepath );
+
+    cell->StartEditing( item, renderrect );
+
+    return NULL;
+}
+
+static void
+gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
+                               GtkWidget       *widget,
+                               GdkRectangle    *cell_area,
+                               gint            *x_offset,
+                               gint            *y_offset,
+                               gint            *width,
+                               gint            *height)
+{
+    GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
+    wxDataViewCustomRenderer *cell = wxrenderer->cell;
+
+    wxSize size = cell->GetSize();
+
+    gint calc_width  = (gint) renderer->xpad * 2 + size.x;
+    gint calc_height = (gint) renderer->ypad * 2 + size.y;
+
+    if (x_offset)
+        *x_offset = 0;
+    if (y_offset)
+        *y_offset = 0;
 
     if (cell_area && size.x > 0 && size.y > 0)
     {
         if (x_offset)
 
     if (cell_area && size.x > 0 && size.y > 0)
     {
         if (x_offset)
-           {
+        {
             *x_offset = (gint)((renderer->xalign *
                                (cell_area->width - calc_width - 2 * renderer->xpad)));
             *x_offset = MAX (*x_offset, 0) + renderer->xpad;
             *x_offset = (gint)((renderer->xalign *
                                (cell_area->width - calc_width - 2 * renderer->xpad)));
             *x_offset = MAX (*x_offset, 0) + renderer->xpad;
-           }
+        }
         if (y_offset)
         {
             *y_offset = (gint)((renderer->yalign *
         if (y_offset)
         {
             *y_offset = (gint)((renderer->yalign *
@@ -592,43 +1038,47 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
 
     if (width)
         *width = calc_width;
 
     if (width)
         *width = calc_width;
-  
+
     if (height)
         *height = calc_height;
 }
 
 static void
 gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
     if (height)
         *height = calc_height;
 }
 
 static void
 gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
-                                GdkWindow            *window,
-                                GtkWidget            *widget,
-                                GdkRectangle         *background_area,
-                                GdkRectangle         *cell_area,
-                                GdkRectangle         *expose_area,
-                                GtkCellRendererState  flags)
+                             GdkWindow            *window,
+                             GtkWidget            *widget,
+                             GdkRectangle         *background_area,
+                             GdkRectangle         *cell_area,
+                             GdkRectangle         *expose_area,
+                             GtkCellRendererState  flags)
 
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
 
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
-    wxDataViewCustomCell *cell = wxrenderer->cell;
-    
+    wxDataViewCustomRenderer *cell = wxrenderer->cell;
+
     GdkRectangle rect;
     gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
     GdkRectangle rect;
     gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
-                                    &rect.x,
-                                    &rect.y,
-                                    &rect.width,
-                                    &rect.height);
+                                   &rect.x,
+                                   &rect.y,
+                                   &rect.width,
+                                   &rect.height);
 
     rect.x += cell_area->x;
     rect.y += cell_area->y;
     rect.width  -= renderer->xpad * 2;
     rect.height -= renderer->ypad * 2;
 
     rect.x += cell_area->x;
     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();
     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();
-        dc->m_window = window;
-        
+        if (dc->m_window == NULL)
+        {
+            dc->m_window = window;
+            dc->SetUpDC();
+        }
+
         int state = 0;
         if (flags & GTK_CELL_RENDERER_SELECTED)
             state |= wxDATAVIEW_CELL_SELECTED;
         int state = 0;
         if (flags & GTK_CELL_RENDERER_SELECTED)
             state |= wxDATAVIEW_CELL_SELECTED;
@@ -641,10 +1091,10 @@ gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
         if (flags & GTK_CELL_RENDERER_FOCUSED)
             state |= wxDATAVIEW_CELL_FOCUSED;
         cell->Render( renderrect, dc, state );
         if (flags & GTK_CELL_RENDERER_FOCUSED)
             state |= wxDATAVIEW_CELL_FOCUSED;
         cell->Render( renderrect, dc, state );
-    }   
+    }
 }
 
 }
 
-static gboolean 
+static gboolean
 gtk_wx_cell_renderer_activate(
                         GtkCellRenderer         *renderer,
                         GdkEvent                *event,
 gtk_wx_cell_renderer_activate(
                         GtkCellRenderer         *renderer,
                         GdkEvent                *event,
@@ -655,305 +1105,594 @@ gtk_wx_cell_renderer_activate(
                         GtkCellRendererState     flags )
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
                         GtkCellRendererState     flags )
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
-    wxDataViewCustomCell *cell = wxrenderer->cell;
-    
+    wxDataViewCustomRenderer *cell = wxrenderer->cell;
+
     GdkRectangle rect;
     gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
     GdkRectangle rect;
     gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
-                                    &rect.x,
-                                    &rect.y,
-                                    &rect.width,
-                                    &rect.height);
+                                   &rect.x,
+                                   &rect.y,
+                                   &rect.width,
+                                   &rect.height);
 
     rect.x += cell_area->x;
     rect.y += cell_area->y;
     rect.width  -= renderer->xpad * 2;
     rect.height -= renderer->ypad * 2;
 
     rect.x += cell_area->x;
     rect.y += cell_area->y;
     rect.width  -= renderer->xpad * 2;
     rect.height -= renderer->ypad * 2;
-    
+
     wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
     wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
-        
-    return cell->Activate( renderrect );
+
+    wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel();
+
+    GtkTreePath *treepath = gtk_tree_path_new_from_string( path );
+    // TODO
+    wxDataViewItem item;
+    gtk_tree_path_free( treepath );
+
+    unsigned int model_col = cell->GetOwner()->GetModelColumn();
+
+    if (!event)
+    {
+        bool ret = false;
+
+        // activated by <ENTER>
+        if (cell->Activate( renderrect, model, item, model_col ))
+                    ret = true;
+
+        return ret;
+    }
+    else if (event->type == GDK_BUTTON_PRESS)
+    {
+        GdkEventButton *button_event = (GdkEventButton*) event;
+        wxPoint pt( ((int) button_event->x) - renderrect.x,
+                    ((int) button_event->y) - renderrect.y );
+
+        bool ret = false;
+        if (button_event->button == 1)
+        {
+            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, item, model_col ))
+                    ret = true;
+        }
+        if (button_event->button == 3)
+        {
+            if (cell->RightClick( pt, renderrect, model, item, model_col ))
+                ret = true;
+        }
+
+        wxrenderer->last_click = button_event->time;
+
+        return ret;
+    }
+
+    return false;
 }
 
 }
 
-// --------------------------------------------------------- 
-// wxGtkDataViewListModelNotifier
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
+// wxGtkDataViewModelNotifier
+// ---------------------------------------------------------
 
 
-class wxGtkDataViewListModelNotifier: public wxDataViewListModelNotifier
+class wxGtkDataViewModelNotifier: public wxDataViewModelNotifier
 {
 public:
 {
 public:
-    wxGtkDataViewListModelNotifier( GtkWxListStore* gtk_store, wxDataViewListModel *wx_model );
-    
-    virtual bool RowAppended();
-    virtual bool RowPrepended();
-    virtual bool RowInserted( size_t before );
-    virtual bool RowDeleted( size_t row );
-    virtual bool RowChanged( size_t row );
-    virtual bool ValueChanged( size_t col, size_t row );
+    wxGtkDataViewModelNotifier( GtkWxTreeModel  *wxgtk_model,
+                                wxDataViewModel *wx_model,
+                                wxDataViewCtrl  *ctrl );
+    ~wxGtkDataViewModelNotifier();
+
+    virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
+    virtual bool ItemDeleted( const wxDataViewItem &item );
+    virtual bool ItemChanged( const wxDataViewItem &item );
+    virtual bool ValueChanged( const wxDataViewItem &item, unsigned int col );
     virtual bool Cleared();
     virtual bool Cleared();
-    
-    GtkWxListStore      *m_gtk_store;
-    wxDataViewListModel *m_wx_model;
+
+    GtkWxTreeModel      *m_wxgtk_model;
+    wxDataViewModel     *m_wx_model;
+    wxDataViewCtrl      *m_owner;
 };
 
 };
 
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 // wxGtkDataViewListModelNotifier
 // 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_wx_model = wx_model;
+    m_owner = ctrl;
 }
 }
-    
-bool wxGtkDataViewListModelNotifier::RowAppended()
+
+wxGtkDataViewModelNotifier::~wxGtkDataViewModelNotifier()
 {
 {
-    size_t pos = m_wx_model->GetNumberOfRows()-1;
-    
+    m_wx_model = NULL;
+    m_wxgtk_model = NULL;
+}
+
+bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
+{
+    m_wxgtk_model->model->ItemAdded( parent, item );
+
     GtkTreeIter iter;
     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);
+    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_inserted( 
+        GTK_TREE_MODEL(m_wxgtk_model), path, &iter);
     gtk_tree_path_free (path);
     gtk_tree_path_free (path);
-    
+
     return true;
 }
 
     return true;
 }
 
-bool wxGtkDataViewListModelNotifier::RowPrepended()
+bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &item )
 {
     GtkTreeIter iter;
 {
     GtkTreeIter iter;
-    iter.stamp = m_gtk_store->stamp;
-    iter.user_data = (gpointer) 0;
-    
-    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);
+    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_deleted(
+        GTK_TREE_MODEL(m_wxgtk_model), path );
     gtk_tree_path_free (path);
     gtk_tree_path_free (path);
+
+    m_wxgtk_model->model->ItemDeleted( item );
     
     return true;
 }
 
     
     return true;
 }
 
-bool wxGtkDataViewListModelNotifier::RowInserted( size_t before )
+bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item )
 {
 {
-    return false;
+    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 );
+    gtk_tree_model_row_changed(
+        GTK_TREE_MODEL(m_wxgtk_model), path, &iter );
+    gtk_tree_path_free (path);
+
+    return true;
+}
+
+bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsigned int model_col )
+{
+    // This adds GTK+'s missing MVC logic for ValueChanged
+    unsigned int index;
+    for (index = 0; index < m_owner->GetColumnCount(); index++)
+    {
+        wxDataViewColumn *column = m_owner->GetColumn( index );
+        if (column->GetModelColumn() == model_col)
+        {
+            GtkTreeView *widget = GTK_TREE_VIEW(m_owner->m_treeview);
+            GtkTreeViewColumn *gcolumn = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle());
+
+            // Get cell area
+            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, 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 = 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 );
+        }
+    }
+
+    return true;
 }
 
 }
 
-bool wxGtkDataViewListModelNotifier::RowDeleted( size_t row )
+bool wxGtkDataViewModelNotifier::Cleared()
 {
     return false;
 }
 
 {
     return false;
 }
 
-bool wxGtkDataViewListModelNotifier::RowChanged( size_t row )
+// ---------------------------------------------------------
+// wxDataViewRenderer
+// ---------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase)
+
+wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode,
+                                        int align ) :
+    wxDataViewRendererBase( varianttype, mode, align )
 {
 {
-    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);
-    gtk_tree_path_free (path);
+    m_renderer = NULL;
 
 
-    return true;
+    // NOTE: SetMode() and SetAlignment() needs to be called in the renderer's ctor,
+    //       after the m_renderer pointer has been initialized
 }
 
 }
 
-bool wxGtkDataViewListModelNotifier::ValueChanged( size_t col, size_t row )
+void wxDataViewRenderer::SetMode( wxDataViewCellMode mode )
 {
 {
-    return RowChanged( row );
+    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;
+    }
+
+    GValue gvalue = { 0, };
+    g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() );
+    g_value_set_enum( &gvalue, gtkMode );
+    g_object_set_property( G_OBJECT(m_renderer), "mode", &gvalue );
+    g_value_unset( &gvalue );
 }
 
 }
 
-bool wxGtkDataViewListModelNotifier::Cleared()
+wxDataViewCellMode wxDataViewRenderer::GetMode() const
 {
 {
-    return false;
+    wxDataViewCellMode ret;
+
+    GValue gvalue;
+    g_object_get( G_OBJECT(m_renderer), "mode", &gvalue, NULL);
+
+    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;
+    }
+
+    g_value_unset( &gvalue );
+
+    return ret;
 }
 
 }
 
-// --------------------------------------------------------- 
-// wxDataViewCell
-// --------------------------------------------------------- 
+void wxDataViewRenderer::SetAlignment( int align )
+{
+    // horizontal alignment:
+
+    gfloat xalign = 0.0;
+    if (align & wxALIGN_RIGHT)
+        xalign = 1.0;
+    else if (align & wxALIGN_CENTER_HORIZONTAL)
+        xalign = 0.5;
+
+    GValue gvalue = { 0, };
+    g_value_init( &gvalue, G_TYPE_FLOAT );
+    g_value_set_float( &gvalue, xalign );
+    g_object_set_property( G_OBJECT(m_renderer), "xalign", &gvalue );
+    g_value_unset( &gvalue );
+
+    // vertical alignment:
 
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewCell, wxDataViewCellBase)
+    gfloat yalign = 0.0;
+    if (align & wxALIGN_BOTTOM)
+        yalign = 1.0;
+    else if (align & wxALIGN_CENTER_VERTICAL)
+        yalign = 0.5;
 
 
-wxDataViewCell::wxDataViewCell( const wxString &varianttype, wxDataViewCellMode mode ) :
-    wxDataViewCellBase( varianttype, mode )
+    GValue gvalue2 = { 0, };
+    g_value_init( &gvalue2, G_TYPE_FLOAT );
+    g_value_set_float( &gvalue2, yalign );
+    g_object_set_property( G_OBJECT(m_renderer), "yalign", &gvalue2 );
+    g_value_unset( &gvalue2 );
+}
+
+int wxDataViewRenderer::GetAlignment() const
 {
 {
-    m_renderer = NULL;
+    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;
 }
 
 }
 
-// --------------------------------------------------------- 
-// wxDataViewTextCell
-// --------------------------------------------------------- 
+
+
+// ---------------------------------------------------------
+// wxDataViewTextRenderer
+// ---------------------------------------------------------
 
 extern "C" {
 
 extern "C" {
-static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer, 
+static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
     gchar *arg1, gchar *arg2, gpointer user_data );
 }
 
     gchar *arg1, gchar *arg2, gpointer user_data );
 }
 
-static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer, 
+static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
     gchar *arg1, gchar *arg2, gpointer user_data )
 {
     gchar *arg1, gchar *arg2, gpointer user_data )
 {
-    wxDataViewTextCell *cell = (wxDataViewTextCell*) user_data;
-    
-    wxString tmp = wxGTK_CONV_BACK( arg2 );
+    wxDataViewTextRenderer *cell = (wxDataViewTextRenderer*) user_data;
+
+    wxString tmp = wxGTK_CONV_BACK_FONT(arg2, cell->GetOwner()->GetOwner()->GetFont());
     wxVariant value = tmp;
     if (!cell->Validate( value ))
         return;
     wxVariant value = tmp;
     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 );
     GtkTreePath *path = gtk_tree_path_new_from_string( arg1 );
-    size_t model_row = (size_t)gtk_tree_path_get_indices (path)[0];
+    GtkTreeIter iter;
+    // TODO    
+    wxDataViewItem item;
     gtk_tree_path_free( path );
     gtk_tree_path_free( path );
-    
-    size_t model_col = cell->GetOwner()->GetModelColumn();
-    
-    model->SetValue( value, model_col, model_row );
-    model->ValueChanged( model_col, model_row );
+
+    unsigned int model_col = cell->GetOwner()->GetModelColumn();
+
+    model->SetValue( value, item, model_col );
+    model->ValueChanged( item, model_col );
 }
 
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewTextCell, wxDataViewCell)
+IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer)
 
 
-wxDataViewTextCell::wxDataViewTextCell( const wxString &varianttype, wxDataViewCellMode mode ) :
-    wxDataViewCell( varianttype, mode )
+wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode,
+                                                int align ) :
+    wxDataViewRenderer( varianttype, mode, align )
 {
 {
-    m_renderer = (void*) gtk_cell_renderer_text_new();
-    
-    if (m_mode & wxDATAVIEW_CELL_EDITABLE)
+    m_renderer = (GtkCellRenderer*) gtk_cell_renderer_text_new();
+
+    if (mode & wxDATAVIEW_CELL_EDITABLE)
     {
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_BOOLEAN );
         g_value_set_boolean( &gvalue, true );
         g_object_set_property( G_OBJECT(m_renderer), "editable", &gvalue );
         g_value_unset( &gvalue );
     {
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_BOOLEAN );
         g_value_set_boolean( &gvalue, true );
         g_object_set_property( G_OBJECT(m_renderer), "editable", &gvalue );
         g_value_unset( &gvalue );
-        
+
         g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this );
     }
         g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this );
     }
+
+    SetMode(mode);
+    SetAlignment(align);
 }
 
 }
 
-bool wxDataViewTextCell::SetValue( const wxVariant &value )
+bool wxDataViewTextRenderer::SetValue( const wxVariant &value )
 {
     wxString tmp = value;
 {
     wxString tmp = value;
-    
+
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_STRING );
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_STRING );
-    g_value_set_string( &gvalue, wxGTK_CONV( tmp ) );
+    g_value_set_string( &gvalue, wxGTK_CONV_FONT( tmp, GetOwner()->GetOwner()->GetFont() ) );
     g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
     g_value_unset( &gvalue );
     g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
     g_value_unset( &gvalue );
-    
+
     return true;
 }
 
     return true;
 }
 
-bool wxDataViewTextCell::GetValue( wxVariant &value )
+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 );
 {
     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( g_value_get_string( &gvalue ) ); 
+    wxString tmp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ),
+        wx_const_cast(wxDataViewTextRenderer*, this)->GetOwner()->GetOwner()->GetFont() );
     g_value_unset( &gvalue );
     g_value_unset( &gvalue );
-    
+
     value = tmp;
 
     return true;
 }
 
     value = tmp;
 
     return true;
 }
 
-// --------------------------------------------------------- 
-// wxDataViewToggleCell
-// --------------------------------------------------------- 
+void wxDataViewTextRenderer::SetAlignment( int align )
+{
+    wxDataViewRenderer::SetAlignment(align);
+
+    if (gtk_check_version(2,10,0))
+        return;
+
+    // horizontal alignment:
+    PangoAlignment pangoAlign = PANGO_ALIGN_LEFT;
+    if (align & wxALIGN_RIGHT)
+        pangoAlign = PANGO_ALIGN_RIGHT;
+    else if (align & wxALIGN_CENTER_HORIZONTAL)
+        pangoAlign = PANGO_ALIGN_CENTER;
+
+    GValue gvalue = { 0, };
+    g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() );
+    g_value_set_enum( &gvalue, pangoAlign );
+    g_object_set_property( G_OBJECT(m_renderer), "alignment", &gvalue );
+    g_value_unset( &gvalue );
+}
+
+// ---------------------------------------------------------
+// wxDataViewBitmapRenderer
+// ---------------------------------------------------------
+
+IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer)
+
+wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode,
+                                                    int align ) :
+    wxDataViewRenderer( varianttype, mode, align )
+{
+    m_renderer = (GtkCellRenderer*) gtk_cell_renderer_pixbuf_new();
+
+    SetMode(mode);
+    SetAlignment(align);
+}
+
+bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value )
+{
+    if (value.GetType() == wxT("wxBitmap"))
+    {
+        wxBitmap bitmap;
+        bitmap << value;
+
+        // This may create a Pixbuf representation in the
+        // wxBitmap object (and it will stay there)
+        GdkPixbuf *pixbuf = bitmap.GetPixbuf();
+
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, G_TYPE_OBJECT );
+        g_value_set_object( &gvalue, pixbuf );
+        g_object_set_property( G_OBJECT(m_renderer), "pixbuf", &gvalue );
+        g_value_unset( &gvalue );
+
+        return true;
+    }
+
+    if (value.GetType() == wxT("wxIcon"))
+    {
+        wxIcon bitmap;
+        bitmap << value;
+
+        // This may create a Pixbuf representation in the
+        // wxBitmap object (and it will stay there)
+        GdkPixbuf *pixbuf = bitmap.GetPixbuf();
+
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, G_TYPE_OBJECT );
+        g_value_set_object( &gvalue, pixbuf );
+        g_object_set_property( G_OBJECT(m_renderer), "pixbuf", &gvalue );
+        g_value_unset( &gvalue );
+
+        return true;
+    }
+
+    return false;
+}
+
+bool wxDataViewBitmapRenderer::GetValue( wxVariant &value ) const
+{
+    return false;
+}
+
+// ---------------------------------------------------------
+// wxDataViewToggleRenderer
+// ---------------------------------------------------------
 
 extern "C" {
 
 extern "C" {
-static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer, 
+static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
     gchar *path, gpointer user_data );
 }
 
     gchar *path, gpointer user_data );
 }
 
-static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer, 
+static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
     gchar *path, gpointer user_data )
 {
     gchar *path, gpointer user_data )
 {
-    wxDataViewToggleCell *cell = (wxDataViewToggleCell*) user_data;
+    wxDataViewToggleRenderer *cell = (wxDataViewToggleRenderer*) user_data;
 
 
-    // get old value    
+    // get old value
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_BOOLEAN );
     g_object_get_property( G_OBJECT(renderer), "active", &gvalue );
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_BOOLEAN );
     g_object_get_property( G_OBJECT(renderer), "active", &gvalue );
-    bool tmp = g_value_get_boolean( &gvalue ); 
+    bool tmp = g_value_get_boolean( &gvalue );
     g_value_unset( &gvalue );
     // invert it
     tmp = !tmp;
     g_value_unset( &gvalue );
     // invert it
     tmp = !tmp;
-    
+
     wxVariant value = tmp;
     if (!cell->Validate( value ))
         return;
     wxVariant value = tmp;
     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 );
     GtkTreePath *gtk_path = gtk_tree_path_new_from_string( path );
-    size_t model_row = (size_t)gtk_tree_path_get_indices (gtk_path)[0];
+    // TODO
+    wxDataViewItem item;
     gtk_tree_path_free( gtk_path );
     gtk_tree_path_free( gtk_path );
-    
-    size_t model_col = cell->GetOwner()->GetModelColumn();
-    
-    model->SetValue( value, model_col, model_row );
-    model->ValueChanged( model_col, model_row );
+
+    unsigned int model_col = cell->GetOwner()->GetModelColumn();
+
+    model->SetValue( value, item, model_col );
+    model->ValueChanged( item, model_col );
 }
 
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleCell, wxDataViewCell)
+IMPLEMENT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer)
 
 
-wxDataViewToggleCell::wxDataViewToggleCell( const wxString &varianttype, 
-                        wxDataViewCellMode mode ) :
-    wxDataViewCell( varianttype, mode )
+wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype,
+                                                    wxDataViewCellMode mode, int align ) :
+    wxDataViewRenderer( varianttype, mode, align )
 {
 {
-    m_renderer = (void*) gtk_cell_renderer_toggle_new();
-    
-    if (m_mode & wxDATAVIEW_CELL_EDITABLE)
+    m_renderer = (GtkCellRenderer*) gtk_cell_renderer_toggle_new();
+
+    if (mode & wxDATAVIEW_CELL_ACTIVATABLE)
     {
     {
-        g_signal_connect_after( m_renderer, "toggled", G_CALLBACK(wxGtkToggleRendererToggledCallback), this );
+        g_signal_connect_after( m_renderer, "toggled",
+                                G_CALLBACK(wxGtkToggleRendererToggledCallback), this );
     }
     else
     {
     }
     else
     {
-
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_BOOLEAN );
         g_value_set_boolean( &gvalue, false );
         g_object_set_property( G_OBJECT(m_renderer), "activatable", &gvalue );
         g_value_unset( &gvalue );
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_BOOLEAN );
         g_value_set_boolean( &gvalue, false );
         g_object_set_property( G_OBJECT(m_renderer), "activatable", &gvalue );
         g_value_unset( &gvalue );
-
-        GValue gvalue2 = { 0, };
-        g_value_init( &gvalue2, gtk_cell_renderer_mode_get_type() );
-        g_value_set_enum( &gvalue2, GTK_CELL_RENDERER_MODE_INERT );
-        g_object_set_property( G_OBJECT(m_renderer), "mode", &gvalue2 );
-        g_value_unset( &gvalue2 );
-
     }
     }
+
+    SetMode(mode);
+    SetAlignment(align);
 }
 
 }
 
-bool wxDataViewToggleCell::SetValue( const wxVariant &value )
+bool wxDataViewToggleRenderer::SetValue( const wxVariant &value )
 {
     bool tmp = value;
 {
     bool tmp = value;
-    
+
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_BOOLEAN );
     g_value_set_boolean( &gvalue, tmp );
     g_object_set_property( G_OBJECT(m_renderer), "active", &gvalue );
     g_value_unset( &gvalue );
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_BOOLEAN );
     g_value_set_boolean( &gvalue, tmp );
     g_object_set_property( G_OBJECT(m_renderer), "active", &gvalue );
     g_value_unset( &gvalue );
-    
+
     return true;
 }
 
     return true;
 }
 
-bool wxDataViewToggleCell::GetValue( wxVariant &value )
+bool wxDataViewToggleRenderer::GetValue( wxVariant &value ) const
 {
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_BOOLEAN );
     g_object_get_property( G_OBJECT(m_renderer), "active", &gvalue );
 {
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_BOOLEAN );
     g_object_get_property( G_OBJECT(m_renderer), "active", &gvalue );
-    bool tmp = g_value_get_boolean( &gvalue ); 
+    bool tmp = g_value_get_boolean( &gvalue );
     g_value_unset( &gvalue );
     g_value_unset( &gvalue );
-    
+
     value = tmp;
 
     return true;
 }
     value = tmp;
 
     return true;
 }
-    
-// --------------------------------------------------------- 
-// wxDataViewCustomCell
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------
+// wxDataViewCustomRenderer
+// ---------------------------------------------------------
 
 class wxDataViewCtrlDC: public wxWindowDC
 {
 
 class wxDataViewCtrlDC: public wxWindowDC
 {
@@ -963,115 +1702,121 @@ public:
         GtkWidget *widget = window->m_treeview;
         // Set later
         m_window = NULL;
         GtkWidget *widget = window->m_treeview;
         // Set later
         m_window = NULL;
-        
+
         m_context = window->GtkGetPangoDefaultContext();
         m_layout = pango_layout_new( m_context );
         m_fontdesc = pango_font_description_copy( widget->style->font_desc );
 
         m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget );
 
         m_context = window->GtkGetPangoDefaultContext();
         m_layout = pango_layout_new( m_context );
         m_fontdesc = pango_font_description_copy( widget->style->font_desc );
 
         m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget );
 
-        SetUpDC();
-
-        m_owner = window;
+        // Set m_window later
+        // SetUpDC();
+        // m_owner = window;
     }
 };
 
     }
 };
 
-// --------------------------------------------------------- 
-// wxDataViewCustomCell
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
+// wxDataViewCustomRenderer
+// ---------------------------------------------------------
 
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomCell, wxDataViewCell)
+IMPLEMENT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
 
 
-wxDataViewCustomCell::wxDataViewCustomCell( const wxString &varianttype, 
-                          wxDataViewCellMode mode, bool no_init ) :
-    wxDataViewCell( varianttype, mode )
+wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
+                                                    wxDataViewCellMode mode, int align,
+                                                    bool no_init ) :
+    wxDataViewRenderer( varianttype, mode, align )
 {
     m_dc = NULL;
 {
     m_dc = NULL;
-    
+
     if (no_init)
         m_renderer = NULL;
     else
     if (no_init)
         m_renderer = NULL;
     else
-        Init();
+        Init(mode, align);
 }
 
 }
 
-bool wxDataViewCustomCell::Init()
+bool wxDataViewCustomRenderer::Init(wxDataViewCellMode mode, int align)
 {
     GtkWxCellRenderer *renderer = (GtkWxCellRenderer *) gtk_wx_cell_renderer_new();
     renderer->cell = this;
 {
     GtkWxCellRenderer *renderer = (GtkWxCellRenderer *) gtk_wx_cell_renderer_new();
     renderer->cell = this;
-    
-    m_renderer = (void*) renderer;
-    
-    if (m_mode & wxDATAVIEW_CELL_ACTIVATABLE)
-    {
-        GValue gvalue = { 0, };
-        g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() );
-        g_value_set_enum( &gvalue, GTK_CELL_RENDERER_MODE_ACTIVATABLE );
-        g_object_set_property( G_OBJECT(m_renderer), "mode", &gvalue );
-        g_value_unset( &gvalue );
-    }
-    
+
+    m_renderer = (GtkCellRenderer*) renderer;
+
+    SetMode(mode);
+    SetAlignment(align);
+
     return true;
 }
 
     return true;
 }
 
-wxDataViewCustomCell::~wxDataViewCustomCell()
+wxDataViewCustomRenderer::~wxDataViewCustomRenderer()
 {
     if (m_dc)
         delete m_dc;
 }
 
 {
     if (m_dc)
         delete m_dc;
 }
 
-wxDC *wxDataViewCustomCell::GetDC()
+wxDC *wxDataViewCustomRenderer::GetDC()
 {
     if (m_dc == NULL)
 {
     if (m_dc == NULL)
+    {
+        if (GetOwner() == NULL)
+            return NULL;
+        if (GetOwner()->GetOwner() == NULL)
+            return NULL;
         m_dc = new wxDataViewCtrlDC( GetOwner()->GetOwner() );
         m_dc = new wxDataViewCtrlDC( GetOwner()->GetOwner() );
-        
+    }
+
     return m_dc;
 }
     return m_dc;
 }
-    
-// --------------------------------------------------------- 
-// wxDataViewProgressCell
-// --------------------------------------------------------- 
 
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressCell, wxDataViewCustomCell)
+// ---------------------------------------------------------
+// wxDataViewProgressRenderer
+// ---------------------------------------------------------
 
 
-wxDataViewProgressCell::wxDataViewProgressCell( const wxString &label, 
-    const wxString &varianttype, wxDataViewCellMode mode ) :
-    wxDataViewCustomCell( varianttype, mode, true )  
+IMPLEMENT_CLASS(wxDataViewProgressRenderer, wxDataViewCustomRenderer)
+
+wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label,
+    const wxString &varianttype, wxDataViewCellMode mode, int align ) :
+    wxDataViewCustomRenderer( varianttype, mode, align, true )
 {
     m_label = label;
     m_value = 0;
 {
     m_label = label;
     m_value = 0;
-    
+
 #ifdef __WXGTK26__
     if (!gtk_check_version(2,6,0))
     {
 #ifdef __WXGTK26__
     if (!gtk_check_version(2,6,0))
     {
-        m_renderer = (void*) gtk_cell_renderer_progress_new();
-        
+        m_renderer = (GtkCellRenderer*) gtk_cell_renderer_progress_new();
+
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_STRING );
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_STRING );
-        g_value_set_boolean( &gvalue, wxGTK_CONV(m_label) );
+
+        // FIXME: font encoding support
+        g_value_set_string( &gvalue, wxGTK_CONV_SYS(m_label) );
         g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
         g_value_unset( &gvalue );
         g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
         g_value_unset( &gvalue );
+
+        SetMode(mode);
+        SetAlignment(align);
     }
     else
 #endif
     {
         // Use custom cell code
     }
     else
 #endif
     {
         // Use custom cell code
-        wxDataViewCustomCell::Init();
+        wxDataViewCustomRenderer::Init(mode, align);
     }
 }
 
     }
 }
 
-wxDataViewProgressCell::~wxDataViewProgressCell()
+wxDataViewProgressRenderer::~wxDataViewProgressRenderer()
 {
 }
 
 {
 }
 
-bool wxDataViewProgressCell::SetValue( const wxVariant &value )
+bool wxDataViewProgressRenderer::SetValue( const wxVariant &value )
 {
 #ifdef __WXGTK26__
     if (!gtk_check_version(2,6,0))
     {
 {
 #ifdef __WXGTK26__
     if (!gtk_check_version(2,6,0))
     {
-        gint tmp = (int) value;
+        gint tmp = (long) value;
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_INT );
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_INT );
-        g_value_set_boolean( &gvalue, tmp );
+        g_value_set_int( &gvalue, tmp );
         g_object_set_property( G_OBJECT(m_renderer), "value", &gvalue );
         g_value_unset( &gvalue );
     }
         g_object_set_property( G_OBJECT(m_renderer), "value", &gvalue );
         g_value_unset( &gvalue );
     }
@@ -1079,19 +1824,24 @@ bool wxDataViewProgressCell::SetValue( const wxVariant &value )
 #endif
     {
         m_value = (long) value;
 #endif
     {
         m_value = (long) value;
-    
+
         if (m_value < 0) m_value = 0;
         if (m_value > 100) m_value = 100;
     }
         if (m_value < 0) m_value = 0;
         if (m_value > 100) m_value = 100;
     }
-    
+
     return true;
 }
     return true;
 }
-    
-bool wxDataViewProgressCell::Render( wxRect cell, wxDC *dc, int state )
+
+bool wxDataViewProgressRenderer::GetValue( wxVariant &value ) const
 {
 {
-    double pct = (double)m_value / 100.0;
-    wxRect bar = cell;
-    bar.width = (int)(cell.width * pct);
+    return false;
+}
+
+bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int state )
+{
+    double pct = (double)m_value / 100.0;
+    wxRect bar = cell;
+    bar.width = (int)(cell.width * pct);
     dc->SetPen( *wxTRANSPARENT_PEN );
     dc->SetBrush( *wxBLUE_BRUSH );
     dc->DrawRectangle( bar );
     dc->SetPen( *wxTRANSPARENT_PEN );
     dc->SetBrush( *wxBLUE_BRUSH );
     dc->DrawRectangle( bar );
@@ -1099,18 +1849,145 @@ bool wxDataViewProgressCell::Render( wxRect cell, wxDC *dc, int state )
     dc->SetBrush( *wxTRANSPARENT_BRUSH );
     dc->SetPen( *wxBLACK_PEN );
     dc->DrawRectangle( cell );
     dc->SetBrush( *wxTRANSPARENT_BRUSH );
     dc->SetPen( *wxBLACK_PEN );
     dc->DrawRectangle( cell );
-    
+
     return true;
 }
 
     return true;
 }
 
-wxSize wxDataViewProgressCell::GetSize()
+wxSize wxDataViewProgressRenderer::GetSize() const
 {
     return wxSize(40,12);
 }
 {
     return wxSize(40,12);
 }
-    
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------
+// wxDataViewDateRenderer
+// ---------------------------------------------------------
+
+class wxDataViewDateRendererPopupTransient: public wxPopupTransientWindow
+{
+public:
+    wxDataViewDateRendererPopupTransient( wxWindow* parent, wxDateTime *value,
+        wxDataViewModel *model, const wxDataViewItem &item, unsigned int col ) :
+        wxPopupTransientWindow( parent, wxBORDER_SIMPLE )
+    {
+        m_model = model;
+        m_item = item;
+        m_col = col;
+        m_cal = new wxCalendarCtrl( this, -1, *value );
+        wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
+        sizer->Add( m_cal, 1, wxGROW );
+        SetSizer( sizer );
+        sizer->Fit( this );
+    }
+
+    virtual void OnDismiss()
+    {
+    }
+
+    void OnCalendar( wxCalendarEvent &event );
+
+    wxCalendarCtrl   *m_cal;
+    wxDataViewModel  *m_model;
+    wxDataViewItem    m_item;
+    unsigned int      m_col;
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(wxDataViewDateRendererPopupTransient,wxPopupTransientWindow)
+    EVT_CALENDAR( -1, wxDataViewDateRendererPopupTransient::OnCalendar )
+END_EVENT_TABLE()
+
+void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event )
+{
+    wxDateTime date = event.GetDate();
+    wxVariant value = date;
+    m_model->SetValue( value, m_item, m_col );
+    m_model->ValueChanged( m_item, m_col );
+    DismissAndNotify();
+}
+
+IMPLEMENT_CLASS(wxDataViewDateRenderer, wxDataViewCustomRenderer)
+
+wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype,
+                        wxDataViewCellMode mode, int align ) :
+    wxDataViewCustomRenderer( varianttype, mode, align )
+{
+    SetMode(mode);
+    SetAlignment(align);
+}
+
+bool wxDataViewDateRenderer::SetValue( const wxVariant &value )
+{
+    m_date = value.GetDateTime();
+
+    return true;
+}
+
+bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const
+{
+    return false;
+}
+
+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 );
+
+    return true;
+}
+
+wxSize wxDataViewDateRenderer::GetSize() const
+{
+    wxString tmp = m_date.FormatDate();
+    wxCoord x,y,d;
+    GetView()->GetTextExtent( tmp, &x, &y, &d );
+    return wxSize(x,y+d);
+}
+
+bool wxDataViewDateRenderer::Activate( wxRect cell, wxDataViewModel *model,
+                                       const wxDataViewItem &item, unsigned int col )
+{
+    wxVariant variant;
+    model->GetValue( variant, item, col );
+    wxDateTime value = variant.GetDateTime();
+
+    wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient(
+        GetOwner()->GetOwner()->GetParent(), &value, model, item, col );
+    wxPoint pos = wxGetMousePosition();
+    popup->Move( pos );
+    popup->Layout();
+    popup->Popup( popup->m_cal );
+
+    return true;
+}
+
+// ---------------------------------------------------------
 // wxDataViewColumn
 // wxDataViewColumn
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
+
+
+static gboolean
+gtk_dataview_header_button_press_callback( GtkWidget *widget,
+                                           GdkEventButton *gdk_event,
+                                           wxDataViewColumn *column )
+{
+    if (gdk_event->type != GDK_BUTTON_PRESS)
+        return FALSE;
+
+    if (gdk_event->button == 1)
+    {
+        wxDataViewCtrl *dv = column->GetOwner();
+        wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() );
+        event.SetDataViewColumn( column );
+        event.SetModel( dv->GetModel() );
+        if (dv->GetEventHandler()->ProcessEvent( event ))
+            return TRUE;
+    }
+
+    return FALSE;
+}
 
 extern "C" {
 static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
 
 extern "C" {
 static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
@@ -1127,117 +2004,487 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
                             GtkTreeIter *iter,
                             gpointer data )
 {
                             GtkTreeIter *iter,
                             gpointer data )
 {
-    g_return_if_fail (GTK_IS_WX_LIST_STORE (model));
-    GtkWxListStore *list_store = (GtkWxListStore *) model;
-    
-    wxDataViewCell *cell = (wxDataViewCell*) data;
+    g_return_if_fail (GTK_IS_WX_TREE_MODEL (model));
+    GtkWxTreeModel *tree_model = (GtkWxTreeModel *) model;
 
 
-    size_t model_row = (size_t) iter->user_data;
-    
-    wxVariant value = list_store->model->GetValue( 
-        cell->GetOwner()->GetModelColumn(), model_row );
+    wxDataViewRenderer *cell = (wxDataViewRenderer*) data;
+
+    wxDataViewItem item( (void*) iter->user_data );
+
+    wxVariant value;
+    tree_model->model->GetDataViewModel()->GetValue( value, item, cell->GetOwner()->GetModelColumn() );
 
     if (value.GetType() != cell->GetVariantType())
 
     if (value.GetType() != cell->GetVariantType())
-        wxPrintf( wxT("Wrong type\n") );
-                                            
+        wxLogError( wxT("Wrong type, required: %s but: %s"),
+                    value.GetType().c_str(),
+                    cell->GetVariantType().c_str() );
+
     cell->SetValue( value );
     cell->SetValue( value );
+
+#if 0
+    wxListItemAttr attr;
+    tree_model->model->GetAttr( attr, cell->GetOwner()->GetModelColumn(), model_row );
+
+    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_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
+IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
 
 
-wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, 
-    size_t model_column, int flags ) :
-    wxDataViewColumnBase( title, cell, model_column, flags )
+wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell,
+                                    unsigned int model_column, int width,
+                                    wxAlignment align, int flags ) :
+    wxDataViewColumnBase( title, cell, model_column, width, align, flags )
 {
 {
-    GtkCellRenderer *renderer = (GtkCellRenderer *) cell->GetGtkHandle();
-    
+    Init( align, flags, width );
+
+    gtk_tree_view_column_set_clickable( GTK_TREE_VIEW_COLUMN(m_column), TRUE );
+    SetTitle( title );
+}
+
+wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell,
+                                    unsigned int model_column, int width,
+                                    wxAlignment align, int flags ) :
+    wxDataViewColumnBase( bitmap, cell, model_column, width, align, flags )
+{
+    Init( align, flags, width );
+
+    SetBitmap( bitmap );
+}
+
+void wxDataViewColumn::Init(wxAlignment align, int flags, int width)
+{
+    m_isConnected = false;
+
+    GtkCellRenderer *renderer = (GtkCellRenderer *) GetRenderer()->GetGtkHandle();
     GtkTreeViewColumn *column = gtk_tree_view_column_new();
     GtkTreeViewColumn *column = gtk_tree_view_column_new();
-   
-    gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );
-    
-    gtk_tree_view_column_pack_start( column, renderer, TRUE );
-    
-    gtk_tree_view_column_set_cell_data_func( column, renderer, 
-        wxGtkTreeCellDataFunc, (gpointer) cell, NULL );
-       
-    m_column = (void*) column;
+    m_column = (GtkWidget*) column;
+
+    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 );
+
+    gtk_tree_view_column_pack_end( column, renderer, TRUE );
+
+    gtk_tree_view_column_set_cell_data_func( column, renderer,
+        wxGtkTreeCellDataFunc, (gpointer) GetRenderer(), NULL );
 }
 
 wxDataViewColumn::~wxDataViewColumn()
 {
 }
 
 }
 
 wxDataViewColumn::~wxDataViewColumn()
 {
 }
 
+void wxDataViewColumn::OnInternalIdle()
+{
+    if (m_isConnected)
+        return;
+
+    if (GTK_WIDGET_REALIZED(GetOwner()->m_treeview))
+    {
+        GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+        if (column->button)
+        {
+            g_signal_connect(column->button, "button_press_event",
+                      G_CALLBACK (gtk_dataview_header_button_press_callback), this);
+
+            m_isConnected = true;
+        }
+    }
+}
+
+void wxDataViewColumn::SetOwner( wxDataViewCtrl *owner )
+{
+    wxDataViewColumnBase::SetOwner( owner );
+
+    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+
+    gtk_tree_view_column_set_title( column, wxGTK_CONV_FONT(GetTitle(), GetOwner()->GetFont() ) );
+}
+
 void wxDataViewColumn::SetTitle( const wxString &title )
 {
 void wxDataViewColumn::SetTitle( const wxString &title )
 {
-    wxDataViewColumnBase::SetTitle( 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())
+                                                 : wxGTK_CONV_SYS(title) );
+
+    gtk_tree_view_column_set_widget( column, NULL );
+}
+
+wxString wxDataViewColumn::GetTitle() const
+{
+    const gchar *str = gtk_tree_view_column_get_title( GTK_TREE_VIEW_COLUMN(m_column) );
+    return wxConvFileName->cMB2WX(str);
+}
+
+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() );
+
+        GdkBitmap *mask = (GdkBitmap *) NULL;
+        if (bitmap.GetMask())
+            mask = bitmap.GetMask()->GetBitmap();
+
+        if (bitmap.HasPixbuf())
+        {
+            gtk_image_set_from_pixbuf(GTK_IMAGE(gtk_image),
+                                      bitmap.GetPixbuf());
+        }
+        else
+        {
+            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) );
+    }
+    else
+    {
+        gtk_tree_view_column_set_widget( column, NULL );
+    }
+}
+
+void wxDataViewColumn::SetHidden( bool hidden )
+{
+    gtk_tree_view_column_set_visible( GTK_TREE_VIEW_COLUMN(m_column), !hidden );
+}
+
+void wxDataViewColumn::SetResizeable( bool resizeable )
+{
+    gtk_tree_view_column_set_resizable( GTK_TREE_VIEW_COLUMN(m_column), resizeable );
+}
+
+void wxDataViewColumn::SetAlignment( wxAlignment align )
+{
+    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+
+    gfloat xalign = 0.0;
+    if (align == wxALIGN_RIGHT)
+        xalign = 1.0;
+    if (align == wxALIGN_CENTER_HORIZONTAL ||
+        align == wxALIGN_CENTER)
+        xalign = 0.5;
+
+    gtk_tree_view_column_set_alignment( column, xalign );
+}
+
+wxAlignment wxDataViewColumn::GetAlignment() const
+{
+    gfloat xalign = gtk_tree_view_column_get_alignment( GTK_TREE_VIEW_COLUMN(m_column) );
+
+    if (xalign == 1.0)
+        return wxALIGN_RIGHT;
+    if (xalign == 0.5)
+        return wxALIGN_CENTER_HORIZONTAL;
+
+    return wxALIGN_LEFT;
+}
+
+void wxDataViewColumn::SetSortable( bool sortable )
+{
+    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
     
     
-    GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
-    gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );
+    if (sortable)
+        gtk_tree_view_column_set_sort_column_id( column, GetModelColumn() );
+    else
+        gtk_tree_view_column_set_sort_column_id( column, -1 );
+}
+
+bool wxDataViewColumn::IsSortable() const
+{
+    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+    return (gtk_tree_view_column_get_sort_column_id( column ) != -1);
+}
+
+bool wxDataViewColumn::IsResizeable() const
+{
+    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+    return gtk_tree_view_column_get_resizable( column );
+}
+
+bool wxDataViewColumn::IsHidden() const
+{
+    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+    return !gtk_tree_view_column_get_visible( column );
+}
+
+void wxDataViewColumn::SetSortOrder( bool ascending )
+{
+    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+
+    if (ascending)
+        gtk_tree_view_column_set_sort_order( column, GTK_SORT_ASCENDING );
+    else
+        gtk_tree_view_column_set_sort_order( column, GTK_SORT_DESCENDING );
+}
+
+bool wxDataViewColumn::IsSortOrderAscending() const
+{
+    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+
+    return (gtk_tree_view_column_get_sort_order( column ) != GTK_SORT_DESCENDING);
+}
+
+void wxDataViewColumn::SetMinWidth( int width )
+{
+    gtk_tree_view_column_set_min_width( GTK_TREE_VIEW_COLUMN(m_column), width );
+}
+
+int wxDataViewColumn::GetMinWidth() const
+{
+    return gtk_tree_view_column_get_min_width( GTK_TREE_VIEW_COLUMN(m_column) );
+}
+
+int wxDataViewColumn::GetWidth() const
+{
+    return gtk_tree_view_column_get_width( GTK_TREE_VIEW_COLUMN(m_column) );
+}
+
+void wxDataViewColumn::SetWidth( int width )
+{
+    gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), width );
+}
+
+
+//-----------------------------------------------------------------------------
+// wxDataViewCtrl signal callbacks
+//-----------------------------------------------------------------------------
+
+static void
+wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCtrl *dv )
+{
+    if (!GTK_WIDGET_REALIZED(dv->m_widget))
+        return;
+
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_SELECTED, dv->GetId() );
+    // TODO: item
+    event.SetModel( dv->GetModel() );
+    dv->GetEventHandler()->ProcessEvent( event );
+}
+
+static void
+wxdataview_row_activated_callback( GtkTreeView* treeview, GtkTreePath *path,
+                                   GtkTreeViewColumn *column, wxDataViewCtrl *dv )
+{
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, dv->GetId() );
+    // TODO: item
+    event.SetModel( dv->GetModel() );
+    dv->GetEventHandler()->ProcessEvent( event );
 }
 
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // 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 *alloc,
+                                     wxDataViewCtrl *win )
+{
+
+    wxWindowList::Node *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();
+    }
+}
+
+
+
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
 
 wxDataViewCtrl::~wxDataViewCtrl()
 {
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
 
 wxDataViewCtrl::~wxDataViewCtrl()
 {
+    if (m_notifier)
+        GetModel()->RemoveNotifier( m_notifier );
+
+    // 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 );
 }
 
 void wxDataViewCtrl::Init()
 {
 }
 
 void wxDataViewCtrl::Init()
 {
+    m_notifier = NULL;
 }
 
 bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos, const wxSize& size, 
+           const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator )
 {
     Init();
            long style, const wxValidator& validator )
 {
     Init();
-    
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator ))
     {
         wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") );
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator ))
     {
         wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") );
-        return FALSE;
+        return false;
     }
 
     }
 
+    m_insertCallback = wxInsertChildInDataViewCtrl;
+
     m_widget = gtk_scrolled_window_new (NULL, NULL);
     m_widget = gtk_scrolled_window_new (NULL, NULL);
-    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (m_widget), GTK_SHADOW_IN);
+
+    GtkScrolledWindowSetBorder(m_widget, style);
 
     m_treeview = gtk_tree_view_new();
     gtk_container_add (GTK_CONTAINER (m_widget), m_treeview);
 
     m_treeview = gtk_tree_view_new();
     gtk_container_add (GTK_CONTAINER (m_widget), m_treeview);
-    
+
+    g_signal_connect (m_treeview, "size_allocate",
+                     G_CALLBACK (gtk_dataviewctrl_size_callback), this);
+
+#ifdef __WXGTK26__
+    if (!gtk_check_version(2,6,0))
+        gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), TRUE );
+#endif
+
+    if (style & wxDV_MULTIPLE)
+    {
+        GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+        gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE );
+    }
+
+    gtk_tree_view_set_headers_visible( GTK_TREE_VIEW(m_treeview), (style & wxDV_NO_HEADER) == 0 );
+
+#ifdef __WXGTK210__
+    if (!gtk_check_version(2,10,0))
+    {
+        GtkTreeViewGridLines grid = GTK_TREE_VIEW_GRID_LINES_NONE;
+
+        if ((style & wxDV_HORIZ_RULES) != 0 &&
+            (style & wxDV_VERT_RULES) != 0)
+            grid = GTK_TREE_VIEW_GRID_LINES_BOTH;
+        else if (style & wxDV_VERT_RULES)
+            grid = GTK_TREE_VIEW_GRID_LINES_VERTICAL;
+        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 );
+    }
+    else
+#endif
+    {
+        gtk_tree_view_set_rules_hint( GTK_TREE_VIEW(m_treeview), (style & wxDV_HORIZ_RULES) != 0 );
+    }
+
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget),
         GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
     gtk_widget_show (m_treeview);
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget),
         GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
     gtk_widget_show (m_treeview);
-    
+
     m_parent->DoAddChild( this );
 
     PostCreation(size);
 
     m_parent->DoAddChild( this );
 
     PostCreation(size);
 
+    GtkEnableSelectionEvents();
+
+    g_signal_connect_after (m_treeview, "row_activated",
+                            G_CALLBACK (wxdataview_row_activated_callback), this);
+
     return true;
 }
 
     return true;
 }
 
-bool wxDataViewCtrl::AssociateModel( wxDataViewListModel *model )
+void wxDataViewCtrl::OnInternalIdle()
+{
+    wxWindow::OnInternalIdle();
+
+    unsigned int cols = GetColumnCount();
+    unsigned int i;
+    for (i = 0; i < cols; i++)
+    {
+        wxDataViewColumn *col = GetColumn( i );
+        col->OnInternalIdle();
+    }
+}
+
+bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
 {
     if (!wxDataViewCtrlBase::AssociateModel( model ))
         return false;
 
 {
     if (!wxDataViewCtrlBase::AssociateModel( model ))
         return false;
 
-    GtkWxListStore *gtk_store = wxgtk_list_store_new();
-    gtk_store->model = model;
+    GtkWxTreeModel *gtkwx_tree_model = wxgtk_tree_model_new();
+    wxGtkTreeModel *wxgtk_tree_model = new wxGtkTreeModel( model, gtkwx_tree_model );
+    
+    gtkwx_tree_model->model = wxgtk_tree_model;
 
 
-    wxGtkDataViewListModelNotifier *notifier = 
-        new wxGtkDataViewListModelNotifier( gtk_store, model );
+    m_notifier = new wxGtkDataViewModelNotifier( gtkwx_tree_model, model, this );
 
 
-    model->SetNotifier( notifier );    
+    model->AddNotifier( m_notifier );
+
+    gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtkwx_tree_model) );
+    g_object_unref( gtkwx_tree_model );
 
 
-    gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_store) );
-    g_object_unref( gtk_store );
-    
     return true;
 }
 
     return true;
 }
 
@@ -1245,7 +2492,7 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
 {
     if (!wxDataViewCtrlBase::AppendColumn(col))
         return false;
 {
     if (!wxDataViewCtrlBase::AppendColumn(col))
         return false;
-        
+
     GtkTreeViewColumn *column = (GtkTreeViewColumn *)col->GetGtkHandle();
 
     gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), column );
     GtkTreeViewColumn *column = (GtkTreeViewColumn *)col->GetGtkHandle();
 
     gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), column );
@@ -1253,6 +2500,58 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
     return true;
 }
 
     return true;
 }
 
+wxDataViewItem wxDataViewCtrl::GetSelection()
+{
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+    
+    if (m_windowStyle & wxDV_MULTIPLE)
+    {
+    }
+    else
+    {
+        GtkTreeIter iter;
+        if (gtk_tree_selection_get_selected( selection, NULL, &iter ))
+        {
+            wxDataViewItem item( (void*) iter.user_data );
+            return item;
+        }
+    }
+    
+    return wxDataViewItem(0);
+}
 
 
-#endif // wxUSE_DATAVIEWCTRL
+void wxDataViewCtrl::DoSetExpanderColumn()
+{
+}
+
+void wxDataViewCtrl::DoSetIndent()
+{
+}
+
+void wxDataViewCtrl::GtkDisableSelectionEvents()
+{
+    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);
+}
+
+void wxDataViewCtrl::GtkEnableSelectionEvents()
+{
+    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);
+}
+
+// static
+wxVisualAttributes
+wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new);
+}
 
 
+
+#endif
+    // !wxUSE_GENERICDATAVIEWCTRL
+
+#endif
+    // wxUSE_DATAVIEWCTRL
wxWidgets (Impactor)