Fix stc doxygen warnings and regen stc files.

[wxWidgets.git] / src / gtk / dataview.cpp
diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp

index 173f65e9bc43405625e53812f6ca901dfccc1086..c58858a7ff7b79edcd3ebff0092adb764aa911b2 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -2,7 +2,6 @@
  // Name:        src/gtk/dataview.cpp
  // Purpose:     wxDataViewCtrl GTK+2 implementation
  // Author:      Robert Roebling
  // Name:        src/gtk/dataview.cpp
  // Purpose:     wxDataViewCtrl GTK+2 implementation
  // Author:      Robert Roebling
-// Id:          $Id$
  // Copyright:   (c) 1998 Robert Roebling
  // Licence:     wxWindows licence
  /////////////////////////////////////////////////////////////////////////////
  // Copyright:   (c) 1998 Robert Roebling
  // Licence:     wxWindows licence
  /////////////////////////////////////////////////////////////////////////////
@@ -20,32 +19,39 @@
      #include "wx/log.h"
      #include "wx/dcclient.h"
      #include "wx/sizer.h"
      #include "wx/log.h"
      #include "wx/dcclient.h"
      #include "wx/sizer.h"
+    #include "wx/settings.h"
+    #include "wx/crt.h"
  #endif
  
  #include "wx/stockitem.h"
  #endif
  
  #include "wx/stockitem.h"
-#include "wx/calctrl.h"
  #include "wx/popupwin.h"
  #include "wx/popupwin.h"
-#include "wx/icon.h"
-#include "wx/list.h"
  #include "wx/listimpl.cpp"
  
  #include "wx/listimpl.cpp"
  
+#include "wx/gtk/dc.h"
+#ifndef __WXGTK3__
+#include "wx/gtk/dcclient.h"
+#endif
  
  
+#include <gtk/gtk.h>
  #include "wx/gtk/private.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 <gdk/gdkkeysyms.h>
+#include "wx/gtk/private/event.h"
+#include "wx/gtk/private/gdkconv.h"
+#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/list.h"
+using namespace wxGTKImpl;
+
+class wxGtkDataViewModelNotifier;
+
+#ifdef __WXGTK3__
+    #define wxConstGdkRect const GdkRectangle
+#else
+    #define wxConstGdkRect GdkRectangle
+#endif
  
  //-----------------------------------------------------------------------------
  //-----------------------------------------------------------------------------
  
  
  //-----------------------------------------------------------------------------
  //-----------------------------------------------------------------------------
  
-class wxDataViewCtrlInternal;
-
-wxDataViewCtrlInternal *g_internal = NULL;
+static wxDataViewCtrlInternal *gs_internal = NULL;
  
  class wxGtkTreeModelNode;
  
  
  class wxGtkTreeModelNode;
  
@@ -53,61 +59,279 @@ extern "C" {
  typedef struct _GtkWxTreeModel       GtkWxTreeModel;
  }
  
  typedef struct _GtkWxTreeModel       GtkWxTreeModel;
  }
  
+// ----------------------------------------------------------------------------
+// wxGtkTreePath: self-destroying GtkTreePath
+// ----------------------------------------------------------------------------
+
+// Usually this object is initialized with the associated GtkTreePath
+// immediately when it's constructed but it can also be changed later either by
+// using Assign() or by getting the pointer to the internally stored pointer
+// value using ByRef(). The latter should be avoided but is very convenient
+// when using GTK functions with GtkTreePath output parameters.
+class wxGtkTreePath
+{
+public:
+    // Ctor takes ownership of the given path and will free it if non-NULL.
+    wxGtkTreePath(GtkTreePath *path = NULL) : m_path(path) { }
+
+    // Creates a tree path for the given string path.
+    wxGtkTreePath(const gchar *strpath)
+        : m_path(gtk_tree_path_new_from_string(strpath))
+    {
+    }
+
+    // Set the stored pointer if not done by ctor.
+    void Assign(GtkTreePath *path)
+    {
+        wxASSERT_MSG( !m_path, "shouldn't be already initialized" );
+
+        m_path = path;
+    }
+
+    // Return the pointer to the internally stored pointer. This should only be
+    // used to initialize the object by passing it to some GTK function.
+    GtkTreePath **ByRef()
+    {
+        wxASSERT_MSG( !m_path, "shouldn't be already initialized" );
+
+        return &m_path;
+    }
+
+
+    operator GtkTreePath *() const { return m_path; }
+
+    ~wxGtkTreePath() { if ( m_path ) gtk_tree_path_free(m_path); }
+
+private:
+    GtkTreePath *m_path;
+
+    wxDECLARE_NO_COPY_CLASS(wxGtkTreePath);
+};
+
+// ----------------------------------------------------------------------------
+// wxGtkTreePathList: self-destroying list of GtkTreePath objects.
+// ----------------------------------------------------------------------------
+
+class wxGtkTreePathList : public wxGtkList
+{
+public:
+    // Ctor takes ownership of the list.
+    explicit wxGtkTreePathList(GList* list)
+        : wxGtkList(list)
+    {
+    }
+
+    ~wxGtkTreePathList()
+    {
+        // Delete the list contents, wxGtkList will delete the list itself.
+        g_list_foreach(m_list, (GFunc)gtk_tree_path_free, NULL);
+    }
+};
+
+// ----------------------------------------------------------------------------
+// wxGtkTreeSelectionLock: prevent selection from changing during the
+//                                 lifetime of this object
+// ----------------------------------------------------------------------------
+
+// Implementation note: it could be expected that setting the selection
+// function in this class ctor and resetting it back to the old value in its
+// dtor would work. However currently gtk_tree_selection_get_select_function()
+// can't be passed NULL (see https://bugzilla.gnome.org/show_bug.cgi?id=626276)
+// so we can't do this. Instead, we always use the selection function (which
+// imposes extra overhead, albeit minimal one, on all selection operations) and
+// just set/reset the flag telling it whether it should allow or forbid the
+// selection.
+//
+// Also notice that currently only a single object of this class may exist at
+// any given moment. It's just simpler like this and we don't need anything
+// more for now.
+
+extern "C" {
+static
+gboolean wxdataview_selection_func(GtkTreeSelection * WXUNUSED(selection),
+                                   GtkTreeModel * WXUNUSED(model),
+                                   GtkTreePath * WXUNUSED(path),
+                                   gboolean WXUNUSED(path_currently_selected),
+                                   gpointer data)
+{
+    return data == NULL;
+}
+}
+
+class wxGtkTreeSelectionLock
+{
+public:
+    wxGtkTreeSelectionLock(GtkTreeSelection *selection)
+        : m_selection(selection)
+    {
+        wxASSERT_MSG( !ms_instance, "this class is not reentrant currently" );
+
+        ms_instance = this;
+
+        CheckCurrentSelectionFunc(NULL);
+
+        // Pass some non-NULL pointer as "data" for the callback, it doesn't
+        // matter what it is as long as it's non-NULL.
+        gtk_tree_selection_set_select_function(selection,
+                                               wxdataview_selection_func,
+                                               this,
+                                               NULL);
+    }
+
+    ~wxGtkTreeSelectionLock()
+    {
+        CheckCurrentSelectionFunc(wxdataview_selection_func);
+
+        gtk_tree_selection_set_select_function(m_selection,
+                                               wxdataview_selection_func,
+                                               NULL,
+                                               NULL);
+
+        ms_instance = NULL;
+    }
+
+private:
+    void CheckCurrentSelectionFunc(GtkTreeSelectionFunc func)
+    {
+        // We can only use gtk_tree_selection_get_select_function() with 2.14+
+        // so check for its availability both during compile- and run-time.
+#if GTK_CHECK_VERSION(2, 14, 0)
+#ifndef __WXGTK3__
+        if ( gtk_check_version(2, 14, 0) != NULL )
+            return;
+#endif
+
+        // If this assert is triggered, it means the code elsewhere has called
+        // gtk_tree_selection_set_select_function() but currently doing this
+        // breaks this class so the code here needs to be changed.
+        wxASSERT_MSG
+        (
+            gtk_tree_selection_get_select_function(m_selection) == func,
+            "selection function has changed unexpectedly, review this code!"
+        );
+#endif // GTK+ 2.14+
+
+        wxUnusedVar(func);
+    }
+
+    static wxGtkTreeSelectionLock *ms_instance;
+
+    GtkTreeSelection * const m_selection;
+
+    wxDECLARE_NO_COPY_CLASS(wxGtkTreeSelectionLock);
+};
+
+wxGtkTreeSelectionLock *wxGtkTreeSelectionLock::ms_instance = NULL;
+
  //-----------------------------------------------------------------------------
  // wxDataViewCtrlInternal
  //-----------------------------------------------------------------------------
  
  WX_DECLARE_LIST(wxDataViewItem, ItemList);
  //-----------------------------------------------------------------------------
  // wxDataViewCtrlInternal
  //-----------------------------------------------------------------------------
  
  WX_DECLARE_LIST(wxDataViewItem, ItemList);
-WX_DEFINE_LIST(ItemList);
+WX_DEFINE_LIST(ItemList)
  
  class wxDataViewCtrlInternal
  {
  public:
  
  class wxDataViewCtrlInternal
  {
  public:
-    wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model, GtkWxTreeModel *owner );
+    wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model );
      ~wxDataViewCtrlInternal();
      ~wxDataViewCtrlInternal();
-    
+
+    // model iface
+    GtkTreeModelFlags get_flags();
      gboolean get_iter( GtkTreeIter *iter, GtkTreePath *path );
      GtkTreePath *get_path( GtkTreeIter *iter);
      gboolean get_iter( GtkTreeIter *iter, GtkTreePath *path );
      GtkTreePath *get_path( GtkTreeIter *iter);
-    GtkTreePath *get_path_safe( 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 );
      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; }
-    wxDataViewCtrl* GetOwner()          { return m_owner; }
-    GtkWxTreeModel* GetGtkModel()       { return m_gtk_model; }
  
  
+    // dnd iface
+
+    bool EnableDragSource( const wxDataFormat &format );
+    bool EnableDropTarget( const wxDataFormat &format );
+
+    gboolean row_draggable( GtkTreeDragSource *drag_source, GtkTreePath *path );
+    gboolean drag_data_delete( GtkTreeDragSource *drag_source, GtkTreePath* path );
+    gboolean drag_data_get( GtkTreeDragSource *drag_source, GtkTreePath *path,
+        GtkSelectionData *selection_data );
+    gboolean drag_data_received( GtkTreeDragDest *drag_dest, GtkTreePath *dest,
+        GtkSelectionData *selection_data );
+    gboolean row_drop_possible( GtkTreeDragDest *drag_dest, GtkTreePath *dest_path,
+        GtkSelectionData *selection_data );
+
+    // notifactions from wxDataViewModel
      bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
      bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
      bool ItemChanged( const wxDataViewItem &item );
      bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
      bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
      bool ItemChanged( const wxDataViewItem &item );
-    bool ValueChanged( const wxDataViewItem &item, unsigned int col );
+    bool ValueChanged( const wxDataViewItem &item, unsigned int model_column );
      bool Cleared();
      bool Cleared();
+    bool BeforeReset();
+    bool AfterReset();
      void Resort();
      void Resort();
-    
+
+    // sorting interface
      void SetSortOrder( GtkSortType sort_order ) { m_sort_order = sort_order; }
      void SetSortOrder( GtkSortType sort_order ) { m_sort_order = sort_order; }
-    GtkSortType GetSortOrder()                  { return m_sort_order; }
+    GtkSortType GetSortOrder() const            { return m_sort_order; }
+
+    void SetSortColumn( int column )            { m_sort_column = column; }
+    int GetSortColumn() const                   { return m_sort_column; }
+
+    void SetDataViewSortColumn( wxDataViewColumn *column ) { m_dataview_sort_column = column; }
+    wxDataViewColumn *GetDataViewSortColumn()   { return m_dataview_sort_column; }
+
+    bool IsSorted() const                       { return m_sort_column >= 0; }
+
+    // Should we be sorted either because we have a configured sort column or
+    // because we have a default sort order?
+    bool ShouldBeSorted() const
+    {
+        return IsSorted() || GetDataViewModel()->HasDefaultCompare();
+    }
+
+
+    // accessors
+    wxDataViewModel* GetDataViewModel() { return m_wx_model; }
+    const wxDataViewModel* GetDataViewModel() const { return m_wx_model; }
+    wxDataViewCtrl* GetOwner()          { return m_owner; }
+    GtkWxTreeModel* GetGtkModel()       { return m_gtk_model; }
+
+    // item can be deleted already in the model
+    int GetIndexOf( const wxDataViewItem &parent, const wxDataViewItem &item );
+
+    void OnInternalIdle();
  
  
-    void SetSortColumn( unsigned int column )   { m_sort_column = column; }
-    unsigned int GetSortColumn()                { return m_sort_column; }
-    
  protected:
      void InitTree();
  protected:
      void InitTree();
+    void ScheduleRefresh();
+
      wxGtkTreeModelNode *FindNode( const wxDataViewItem &item );
      wxGtkTreeModelNode *FindNode( GtkTreeIter *iter );
      wxGtkTreeModelNode *FindParentNode( const wxDataViewItem &item );
      wxGtkTreeModelNode *FindParentNode( GtkTreeIter *iter );
      void BuildBranch( wxGtkTreeModelNode *branch );
      wxGtkTreeModelNode *FindNode( const wxDataViewItem &item );
      wxGtkTreeModelNode *FindNode( GtkTreeIter *iter );
      wxGtkTreeModelNode *FindParentNode( const wxDataViewItem &item );
      wxGtkTreeModelNode *FindParentNode( GtkTreeIter *iter );
      void BuildBranch( wxGtkTreeModelNode *branch );
-    
+
  private:
      wxGtkTreeModelNode   *m_root;
      wxDataViewModel      *m_wx_model;
      GtkWxTreeModel       *m_gtk_model;
      wxDataViewCtrl       *m_owner;
      GtkSortType           m_sort_order;
  private:
      wxGtkTreeModelNode   *m_root;
      wxDataViewModel      *m_wx_model;
      GtkWxTreeModel       *m_gtk_model;
      wxDataViewCtrl       *m_owner;
      GtkSortType           m_sort_order;
-    unsigned int          m_sort_column;
+    wxDataViewColumn     *m_dataview_sort_column;
+    int                   m_sort_column;
+
+    GtkTargetEntry        m_dragSourceTargetEntry;
+    wxCharBuffer          m_dragSourceTargetEntryTarget;
+    wxDataObject         *m_dragDataObject;
+
+    GtkTargetEntry        m_dropTargetTargetEntry;
+    wxCharBuffer          m_dropTargetTargetEntryTarget;
+    wxDataObject         *m_dropDataObject;
+
+    wxGtkDataViewModelNotifier *m_notifier;
+
+    bool                  m_dirty;
  };
  
  
  };
  
  
@@ -115,66 +339,110 @@ private:
  // wxGtkTreeModelNode
  //-----------------------------------------------------------------------------
  
  // wxGtkTreeModelNode
  //-----------------------------------------------------------------------------
  
-int LINKAGEMODE wxGtkTreeModelNodeCmp( void *id1, void *id2 );
+static
+int LINKAGEMODE wxGtkTreeModelChildCmp( void** id1, void** id2 )
+{
+    int ret = gs_internal->GetDataViewModel()->Compare( wxDataViewItem(*id1), wxDataViewItem(*id2),
+        gs_internal->GetSortColumn(), (gs_internal->GetSortOrder() == GTK_SORT_ASCENDING) );
+
+    return ret;
+}
  
  WX_DEFINE_ARRAY_PTR( wxGtkTreeModelNode*, wxGtkTreeModelNodes );
  
  WX_DEFINE_ARRAY_PTR( wxGtkTreeModelNode*, wxGtkTreeModelNodes );
-WX_DEFINE_SORTED_ARRAY( void* , wxGtkTreeModelChildren );
+WX_DEFINE_ARRAY_PTR( void*, wxGtkTreeModelChildren );
  
  class wxGtkTreeModelNode
  {
  public:
      wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item,
  
  class wxGtkTreeModelNode
  {
  public:
      wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item,
-      wxDataViewCtrlInternal *internal )
-    { 
-        m_parent = parent; 
+                        wxDataViewCtrlInternal *internal )
+    {
+        m_parent = parent;
          m_item = item;
          m_internal = internal;
          m_item = item;
          m_internal = internal;
-        g_internal = internal;
-        m_children = new wxGtkTreeModelChildren( wxGtkTreeModelNodeCmp );
      }
      }
-    
+
      ~wxGtkTreeModelNode()
      ~wxGtkTreeModelNode()
-    { 
-        g_internal = m_internal;
-        size_t count = m_children->GetCount();
+    {
+        size_t count = m_nodes.GetCount();
          size_t i;
          for (i = 0; i < count; i++)
          {
              wxGtkTreeModelNode *child = m_nodes.Item( i );
              delete child;
          }
          size_t i;
          for (i = 0; i < count; i++)
          {
              wxGtkTreeModelNode *child = m_nodes.Item( i );
              delete child;
          }
-        delete m_children;
      }
  
      }
  
-    unsigned int AddNode( wxGtkTreeModelNode* child ) 
-        { 
-            g_internal = m_internal;
-            m_nodes.Add( child );
-            return m_children->Add( child->GetItem().GetID() );
-        }
-        
-    unsigned int AddLeave( void* id )
+    void AddNode( wxGtkTreeModelNode* child )
          {
          {
-            g_internal = m_internal;
-            return m_children->Add( id );
+            m_nodes.Add( child );
+
+            void *id = child->GetItem().GetID();
+
+            m_children.Add( id );
+
+            if (m_internal->ShouldBeSorted())
+            {
+                gs_internal = m_internal;
+                m_children.Sort( &wxGtkTreeModelChildCmp );
+            }
          }
          }
-        
-    void DeleteChild( void* id )
+
+    void InsertNode( wxGtkTreeModelNode* child, unsigned pos )
          {
          {
-            g_internal = m_internal;
-            size_t pos;
-            size_t count = m_children->GetCount();
-            for (pos = 0; pos < count; pos++)
+            if (m_internal->ShouldBeSorted())
+            {
+                AddNode(child);
+                return;
+            }
+
+            void *id = child->GetItem().GetID();
+
+            // Insert into m_nodes so that the order of nodes in m_nodes is the
+            // same as the order of their corresponding IDs in m_children:
+            const unsigned int count = m_nodes.GetCount();
+            bool inserted = false;
+            for (unsigned i = 0; i < count; i++)
              {
              {
-                if (m_children->Item( pos ) == id)
+                wxGtkTreeModelNode *node = m_nodes[i];
+                int posInChildren = m_children.Index(node->GetItem().GetID());
+                if ( (unsigned)posInChildren >= pos )
                  {
                  {
-                    m_children->RemoveAt( pos );
+                    m_nodes.Insert(child, i);
+                    inserted = true;
                      break;
                  }
              }
                      break;
                  }
              }
-            count = m_nodes.GetCount();
+            if ( !inserted )
+                m_nodes.Add(child);
+
+            m_children.Insert( id, pos );
+        }
+
+    void AddLeaf( void* id )
+        {
+            InsertLeaf(id, m_children.size());
+        }
+
+    void InsertLeaf( void* id, unsigned pos )
+        {
+            m_children.Insert( id, pos );
+
+            if (m_internal->ShouldBeSorted())
+            {
+                gs_internal = m_internal;
+                m_children.Sort( &wxGtkTreeModelChildCmp );
+            }
+        }
+
+    void DeleteChild( void* id )
+        {
+            m_children.Remove( id );
+
+            unsigned int count = m_nodes.GetCount();
+            unsigned int pos;
              for (pos = 0; pos < count; pos++)
              for (pos = 0; pos < count; pos++)
-            {   
+            {
                  wxGtkTreeModelNode *node = m_nodes.Item( pos );
                  if (node->GetItem().GetID() == id)
                  {
                  wxGtkTreeModelNode *node = m_nodes.Item( pos );
                  if (node->GetItem().GetID() == id)
                  {
@@ -183,41 +451,46 @@ public:
                      break;
                  }
              }
                      break;
                  }
              }
-            
          }
          }
-        
-    wxGtkTreeModelNode* GetParent() 
+
+    // returns position of child node for given item in children list or wxNOT_FOUND
+    int FindChildByItem(const wxDataViewItem& item) const
+    {
+        const void* itemId = item.GetID();
+        const wxGtkTreeModelChildren& nodes = m_children;
+        const int len = nodes.size();
+        for ( int i = 0; i < len; i++ )
+        {
+            if ( nodes[i] == itemId )
+                return i;
+        }
+        return wxNOT_FOUND;
+    }
+
+    wxGtkTreeModelNode* GetParent()
          { return m_parent; }
          { return m_parent; }
-    wxGtkTreeModelNodes &GetNodes() 
+    wxGtkTreeModelNodes &GetNodes()
          { return m_nodes; }
          { return m_nodes; }
-    wxGtkTreeModelChildren &GetChildren() 
-        { return *m_children; }
-        
-    unsigned int GetChildCount() { return m_children->GetCount(); }
-    unsigned int GetNodesCount() { return m_nodes.GetCount(); }
+    wxGtkTreeModelChildren &GetChildren()
+        { return m_children; }
+
+    unsigned int GetChildCount() const { return m_children.GetCount(); }
+    unsigned int GetNodesCount() const { return m_nodes.GetCount(); }
  
      wxDataViewItem &GetItem() { return m_item; }
      wxDataViewCtrlInternal *GetInternal() { return m_internal; }
  
      wxDataViewItem &GetItem() { return m_item; }
      wxDataViewCtrlInternal *GetInternal() { return m_internal; }
-    
+
      void Resort();
      void Resort();
-    
+
  private:
      wxGtkTreeModelNode         *m_parent;
      wxGtkTreeModelNodes         m_nodes;
  private:
      wxGtkTreeModelNode         *m_parent;
      wxGtkTreeModelNodes         m_nodes;
-    wxGtkTreeModelChildren     *m_children;
-    wxDataViewItem              m_item; 
+    wxGtkTreeModelChildren      m_children;
+    wxDataViewItem              m_item;
      wxDataViewCtrlInternal     *m_internal;
  };
  
  
      wxDataViewCtrlInternal     *m_internal;
  };
  
  
-int LINKAGEMODE wxGtkTreeModelNodeCmp( void* id1, void* id2 )
-{
-    int ret = g_internal->GetDataViewModel()->Compare( id1, id2, 
-        g_internal->GetSortColumn(), (g_internal->GetSortOrder() == GTK_SORT_ASCENDING) );
-        
-    return ret;
-}
-
  //-----------------------------------------------------------------------------
  // data
  //-----------------------------------------------------------------------------
  //-----------------------------------------------------------------------------
  // data
  //-----------------------------------------------------------------------------
@@ -232,15 +505,11 @@ extern "C" {
  
  #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_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_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_tree_model_get_type         (void);
  
  
  GType         gtk_wx_tree_model_get_type         (void);
  
-typedef struct _GtkWxTreeModelClass  GtkWxTreeModelClass;
-
  struct _GtkWxTreeModel
  {
    GObject parent;
  struct _GtkWxTreeModel
  {
    GObject parent;
@@ -250,17 +519,14 @@ struct _GtkWxTreeModel
    wxDataViewCtrlInternal *internal;
  };
  
    wxDataViewCtrlInternal *internal;
  };
  
-struct _GtkWxTreeModelClass
-{
-  GObjectClass list_parent_class;
-};
-
  static GtkWxTreeModel *wxgtk_tree_model_new          (void);
  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 void         wxgtk_tree_model_init            (GTypeInstance* instance, void*);
+
+static void         wxgtk_tree_model_tree_model_init (void* g_iface, void*);
+static void         wxgtk_tree_model_sortable_init   (void* g_iface, void*);
+static void         wxgtk_tree_model_drag_source_init(void* g_iface, void*);
+static void         wxgtk_tree_model_drag_dest_init  (void* g_iface, void*);
+
  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,
  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,
@@ -270,8 +536,6 @@ static gboolean     wxgtk_tree_model_get_iter        (GtkTreeModel      *tree_mo
                                                        GtkTreePath       *path);
  static GtkTreePath *wxgtk_tree_model_get_path        (GtkTreeModel      *tree_model,
                                                        GtkTreeIter       *iter);
                                                        GtkTreePath       *path);
  static GtkTreePath *wxgtk_tree_model_get_path        (GtkTreeModel      *tree_model,
                                                        GtkTreeIter       *iter);
-static GtkTreePath *wxgtk_tree_model_get_path_safe   (GtkTreeModel      *tree_model,
-                                                      GtkTreeIter       *iter);
  static void         wxgtk_tree_model_get_value       (GtkTreeModel      *tree_model,
                                                        GtkTreeIter       *iter,
                                                        gint               column,
  static void         wxgtk_tree_model_get_value       (GtkTreeModel      *tree_model,
                                                        GtkTreeIter       *iter,
                                                        gint               column,
@@ -295,25 +559,36 @@ static gboolean     wxgtk_tree_model_iter_parent     (GtkTreeModel      *tree_mo
  
  /* sortable */
  static gboolean wxgtk_tree_model_get_sort_column_id    (GtkTreeSortable       *sortable,
  
  /* sortable */
  static gboolean wxgtk_tree_model_get_sort_column_id    (GtkTreeSortable       *sortable,
-                                                     gint                     *sort_column_id,
-                                                     GtkSortType              *order);
+                                                        gint                  *sort_column_id,
+                                                        GtkSortType           *order);
  static void     wxgtk_tree_model_set_sort_column_id    (GtkTreeSortable       *sortable,
  static void     wxgtk_tree_model_set_sort_column_id    (GtkTreeSortable       *sortable,
-                                                     gint                      sort_column_id,
-                                                     GtkSortType               order);
+                                                        gint                   sort_column_id,
+                                                        GtkSortType            order);
  static void     wxgtk_tree_model_set_sort_func         (GtkTreeSortable       *sortable,
  static void     wxgtk_tree_model_set_sort_func         (GtkTreeSortable       *sortable,
-                                                     gint                      sort_column_id,
-                                                     GtkTreeIterCompareFunc    func,
-                                                     gpointer                  data,
-                                                     GtkDestroyNotify          destroy);
+                                                        gint                   sort_column_id,
+                                                        GtkTreeIterCompareFunc func,
+                                                        gpointer               data,
+                                                        GDestroyNotify       destroy);
  static void     wxgtk_tree_model_set_default_sort_func (GtkTreeSortable       *sortable,
  static void     wxgtk_tree_model_set_default_sort_func (GtkTreeSortable       *sortable,
-                                                     GtkTreeIterCompareFunc    func,
-                                                     gpointer                  data,
-                                                     GtkDestroyNotify          destroy);
+                                                        GtkTreeIterCompareFunc func,
+                                                        gpointer               data,
+                                                        GDestroyNotify       destroy);
  static gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable       *sortable);
  
  static gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable       *sortable);
  
-
-
-static GObjectClass *list_parent_class = NULL;
+/* drag'n'drop */
+static gboolean wxgtk_tree_model_row_draggable         (GtkTreeDragSource     *drag_source,
+                                                        GtkTreePath           *path);
+static gboolean wxgtk_tree_model_drag_data_delete      (GtkTreeDragSource     *drag_source,
+                                                        GtkTreePath           *path);
+static gboolean wxgtk_tree_model_drag_data_get         (GtkTreeDragSource     *drag_source,
+                                                        GtkTreePath           *path,
+                                                        GtkSelectionData      *selection_data);
+static gboolean wxgtk_tree_model_drag_data_received    (GtkTreeDragDest       *drag_dest,
+                                                        GtkTreePath           *dest,
+                                                        GtkSelectionData      *selection_data);
+static gboolean wxgtk_tree_model_row_drop_possible     (GtkTreeDragDest       *drag_dest,
+                                                        GtkTreePath           *dest_path,
+                                                        GtkSelectionData      *selection_data);
  
  GType
  gtk_wx_tree_model_get_type (void)
  
  GType
  gtk_wx_tree_model_get_type (void)
@@ -324,27 +599,41 @@ gtk_wx_tree_model_get_type (void)
      {
          const GTypeInfo tree_model_info =
          {
      {
          const GTypeInfo tree_model_info =
          {
-            sizeof (GtkWxTreeModelClass),
+            sizeof (GObjectClass),
              NULL,   /* base_init */
              NULL,   /* base_finalize */
              NULL,   /* base_init */
              NULL,   /* base_finalize */
-            (GClassInitFunc) wxgtk_tree_model_class_init,
+            NULL,
              NULL,   /* class_finalize */
              NULL,   /* class_data */
              sizeof (GtkWxTreeModel),
              0,
              NULL,   /* class_finalize */
              NULL,   /* class_data */
              sizeof (GtkWxTreeModel),
              0,
-            (GInstanceInitFunc) wxgtk_tree_model_init,
+            wxgtk_tree_model_init,
          };
  
          static const GInterfaceInfo tree_model_iface_info =
          {
          };
  
          static const GInterfaceInfo tree_model_iface_info =
          {
-            (GInterfaceInitFunc) wxgtk_tree_model_tree_model_init,
+            wxgtk_tree_model_tree_model_init,
              NULL,
              NULL
          };
  
          static const GInterfaceInfo sortable_iface_info =
          {
              NULL,
              NULL
          };
  
          static const GInterfaceInfo sortable_iface_info =
          {
-            (GInterfaceInitFunc) wxgtk_tree_model_sortable_init,
+            wxgtk_tree_model_sortable_init,
+            NULL,
+            NULL
+        };
+
+        static const GInterfaceInfo drag_source_iface_info =
+        {
+            wxgtk_tree_model_drag_source_init,
+            NULL,
+            NULL
+        };
+
+        static const GInterfaceInfo drag_dest_iface_info =
+        {
+            wxgtk_tree_model_drag_dest_init,
              NULL,
              NULL
          };
              NULL,
              NULL
          };
@@ -358,6 +647,12 @@ gtk_wx_tree_model_get_type (void)
          g_type_add_interface_static (tree_model_type,
                                       GTK_TYPE_TREE_SORTABLE,
                                       &sortable_iface_info);
          g_type_add_interface_static (tree_model_type,
                                       GTK_TYPE_TREE_SORTABLE,
                                       &sortable_iface_info);
+        g_type_add_interface_static (tree_model_type,
+                                     GTK_TYPE_TREE_DRAG_DEST,
+                                     &drag_dest_iface_info);
+        g_type_add_interface_static (tree_model_type,
+                                     GTK_TYPE_TREE_DRAG_SOURCE,
+                                     &drag_source_iface_info);
      }
  
      return tree_model_type;
      }
  
      return tree_model_type;
@@ -371,16 +666,9 @@ wxgtk_tree_model_new(void)
  }
  
  static void
  }
  
  static void
-wxgtk_tree_model_class_init (GtkWxTreeModelClass *klass)
-{
-    list_parent_class = (GObjectClass*) g_type_class_peek_parent (klass);
-    GObjectClass *object_class = (GObjectClass*) klass;
-    object_class->finalize = wxgtk_tree_model_finalize;
-}
-
-static void
-wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface)
+wxgtk_tree_model_tree_model_init(void* g_iface, void*)
  {
  {
+    GtkTreeModelIface* iface = static_cast<GtkTreeModelIface*>(g_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_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;
@@ -396,8 +684,9 @@ wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface)
  }
  
  static void
  }
  
  static void
-wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface)
+wxgtk_tree_model_sortable_init(void* g_iface, void*)
  {
  {
+    GtkTreeSortableIface* iface = static_cast<GtkTreeSortableIface*>(g_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->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;
@@ -406,17 +695,28 @@ wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface)
  }
  
  static void
  }
  
  static void
-wxgtk_tree_model_init (GtkWxTreeModel *tree_model)
+wxgtk_tree_model_drag_source_init(void* g_iface, void*)
  {
  {
-    tree_model->internal = NULL;
-    tree_model->stamp = g_random_int();
+    GtkTreeDragSourceIface* iface = static_cast<GtkTreeDragSourceIface*>(g_iface);
+    iface->row_draggable = wxgtk_tree_model_row_draggable;
+    iface->drag_data_delete = wxgtk_tree_model_drag_data_delete;
+    iface->drag_data_get = wxgtk_tree_model_drag_data_get;
+}
+
+static void
+wxgtk_tree_model_drag_dest_init(void* g_iface, void*)
+{
+    GtkTreeDragDestIface* iface = static_cast<GtkTreeDragDestIface*>(g_iface);
+    iface->drag_data_received = wxgtk_tree_model_drag_data_received;
+    iface->row_drop_possible = wxgtk_tree_model_row_drop_possible;
  }
  
  static void
  }
  
  static void
-wxgtk_tree_model_finalize (GObject *object)
+wxgtk_tree_model_init(GTypeInstance* instance, void*)
  {
  {
-    /* must chain up */
-    (* list_parent_class->finalize) (object);
+    GtkWxTreeModel* tree_model = GTK_WX_TREE_MODEL(instance);
+    tree_model->internal = NULL;
+    tree_model->stamp = g_random_int();
  }
  
  } // extern "C"
  }
  
  } // extern "C"
@@ -429,9 +729,10 @@ wxgtk_tree_model_finalize (GObject *object)
  static GtkTreeModelFlags
  wxgtk_tree_model_get_flags (GtkTreeModel *tree_model)
  {
  static GtkTreeModelFlags
  wxgtk_tree_model_get_flags (GtkTreeModel *tree_model)
  {
-    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (tree_model), (GtkTreeModelFlags)0 );
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), (GtkTreeModelFlags)0 );
  
  
-    return GTK_TREE_MODEL_ITERS_PERSIST;
+    return wxtree_model->internal->get_flags();
  }
  
  static gint
  }
  
  static gint
@@ -458,7 +759,8 @@ wxgtk_tree_model_get_column_type (GtkTreeModel *tree_model,
          gtype = G_TYPE_STRING;
      else
      {
          gtype = G_TYPE_STRING;
      else
      {
-        wxFAIL_MSG( _T("non-string columns not supported yet") );
+        gtype = G_TYPE_POINTER;
+        // wxFAIL_MSG( wxT("non-string columns not supported for searching yet") );
      }
  
      return gtype;
      }
  
      return gtype;
@@ -487,17 +789,6 @@ wxgtk_tree_model_get_path (GtkTreeModel *tree_model,
      return wxtree_model->internal->get_path( iter );
  }
  
      return wxtree_model->internal->get_path( iter );
  }
  
-static GtkTreePath *
-wxgtk_tree_model_get_path_safe (GtkTreeModel *tree_model,
-                                GtkTreeIter  *iter)
-{
-    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->internal->get_path_safe( iter );
-}
-
  static void
  wxgtk_tree_model_get_value (GtkTreeModel *tree_model,
                              GtkTreeIter  *iter,
  static void
  wxgtk_tree_model_get_value (GtkTreeModel *tree_model,
                              GtkTreeIter  *iter,
@@ -520,7 +811,7 @@ wxgtk_tree_model_get_value (GtkTreeModel *tree_model,
      }
      else
      {
      }
      else
      {
-        wxFAIL_MSG( _T("non-string columns not supported yet") );
+        wxFAIL_MSG( wxT("non-string columns not supported yet") );
      }
  }
  
      }
  }
  
@@ -529,6 +820,10 @@ wxgtk_tree_model_iter_next (GtkTreeModel  *tree_model,
                              GtkTreeIter   *iter)
  {
      GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
                              GtkTreeIter   *iter)
  {
      GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+
+    // This happens when clearing the view by calling .._set_model( NULL );
+    if (iter->stamp == 0) return FALSE;
+
      g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
      g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE);
  
      g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
      g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE);
  
@@ -542,7 +837,10 @@ wxgtk_tree_model_iter_children (GtkTreeModel *tree_model,
  {
      GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
      g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
  {
      GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
      g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
-    g_return_val_if_fail (wxtree_model->stamp == parent->stamp, FALSE);
+    if (parent)
+    {
+        g_return_val_if_fail (wxtree_model->stamp == parent->stamp, FALSE);
+    }
  
      return wxtree_model->internal->iter_children( iter, parent );
  }
  
      return wxtree_model->internal->iter_children( iter, parent );
  }
@@ -563,8 +861,8 @@ wxgtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
                                    GtkTreeIter  *iter)
  {
      GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
                                    GtkTreeIter  *iter)
  {
      GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
-    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
-    g_return_val_if_fail (wxtree_model->stamp == iter->stamp, 0);
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), 0);
+    g_return_val_if_fail ( !iter || wxtree_model->stamp == iter->stamp, 0);
  
      return wxtree_model->internal->iter_n_children( iter );
  }
  
      return wxtree_model->internal->iter_n_children( iter );
  }
@@ -589,91 +887,310 @@ wxgtk_tree_model_iter_parent (GtkTreeModel *tree_model,
      GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
      g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
      g_return_val_if_fail (wxtree_model->stamp == child->stamp, FALSE);
      GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
      g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
      g_return_val_if_fail (wxtree_model->stamp == child->stamp, FALSE);
-    
+
      return wxtree_model->internal->iter_parent( iter, child );
  }
  
      return wxtree_model->internal->iter_parent( iter, child );
  }
  
-/* sortable */
-gboolean wxgtk_tree_model_get_sort_column_id    (GtkTreeSortable        *sortable,
-                                                     gint                     *sort_column_id,
-                                                     GtkSortType              *order)
+/* drag'n'drop iface */
+static gboolean
+wxgtk_tree_model_row_draggable (GtkTreeDragSource *drag_source,
+                                GtkTreePath       *path)
  {
  {
-    GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable;
-
-    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE);
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
  
  
-    if (sort_column_id)
-        *sort_column_id = tree_model->internal->GetSortColumn();
-        
-    if (order)
-        *order = tree_model->internal->GetSortOrder();
-        
-    return TRUE;
+    return wxtree_model->internal->row_draggable( drag_source, path );
  }
  
  }
  
-void     wxgtk_tree_model_set_sort_column_id  (GtkTreeSortable        *sortable,
-                                                     gint                      sort_column_id,
-                                                     GtkSortType               order)
+static gboolean
+wxgtk_tree_model_drag_data_delete (GtkTreeDragSource *drag_source,
+                                   GtkTreePath       *path)
  {
  {
-    GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable;
-    g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
  
  
-    if ((sort_column_id == (gint) tree_model->internal->GetSortColumn()) &&
-        (order == tree_model->internal->GetSortOrder()))
-        return;
-    
-    tree_model->internal->SetSortColumn( sort_column_id );
-    
-    tree_model->internal->SetSortOrder( order );
-    
-    gtk_tree_sortable_sort_column_changed (sortable);
-    
-    tree_model->internal->GetDataViewModel()->Resort();
+    return wxtree_model->internal->drag_data_delete( drag_source, path );
  }
  
  }
  
-void     wxgtk_tree_model_set_sort_func         (GtkTreeSortable        *sortable,
-                                                     gint                      sort_column_id,
-                                                     GtkTreeIterCompareFunc    func,
-                                                     gpointer                  data,
-                                                     GtkDestroyNotify          destroy)
+static gboolean
+wxgtk_tree_model_drag_data_get (GtkTreeDragSource *drag_source,
+                                GtkTreePath       *path,
+                                GtkSelectionData  *selection_data)
  {
  {
-    g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
-    g_return_if_fail (func != NULL);
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+
+#if 0
+    wxPrintf( "drag_get_data\n");
+
+    wxGtkString atom_selection(gdk_atom_name(selection_data->selection));
+    wxPrintf( "selection %s\n", wxString::FromAscii(atom_selection) );
+
+    wxGtkString atom_target(gdk_atom_name(selection_data->target));
+    wxPrintf( "target %s\n", wxString::FromAscii(atom_target) );
+
+    wxGtkString atom_type(gdk_atom_name(selection_data->type));
+    wxPrintf( "type %s\n", wxString::FromAscii(atom_type) );
+
+    wxPrintf( "format %d\n", selection_data->format );
+#endif
+
+    return wxtree_model->internal->drag_data_get( drag_source, path, selection_data );
  }
  
  }
  
-void     wxgtk_tree_model_set_default_sort_func (GtkTreeSortable        *sortable,
-                                                     GtkTreeIterCompareFunc    func,
-                                                     gpointer                  data,
-                                                     GtkDestroyNotify          destroy)
+static gboolean
+wxgtk_tree_model_drag_data_received (GtkTreeDragDest  *drag_dest,
+                                     GtkTreePath      *dest,
+                                     GtkSelectionData *selection_data)
  {
  {
-    g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
-    g_return_if_fail (func != NULL);
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_dest;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
  
  
-    wxPrintf( "wxgtk_tree_model_set_default_sort_func\n" );
+    return wxtree_model->internal->drag_data_received( drag_dest, dest, selection_data );
  }
  
  }
  
-gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable        *sortable)
+static gboolean
+wxgtk_tree_model_row_drop_possible (GtkTreeDragDest  *drag_dest,
+                                    GtkTreePath      *dest_path,
+                                    GtkSelectionData *selection_data)
  {
  {
-    return FALSE;
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_dest;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+
+    return wxtree_model->internal->row_drop_possible( drag_dest, dest_path, selection_data );
  }
  
  }
  
-//-----------------------------------------------------------------------------
-// define new GTK+ class wxGtkRendererRenderer
-//-----------------------------------------------------------------------------
+/* sortable iface */
+static gboolean
+wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortable,
+                                     gint            *sort_column_id,
+                                     GtkSortType     *order)
+{
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) sortable;
  
  
-extern "C" {
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE);
+
+    if (!wxtree_model->internal->IsSorted())
+    {
+        if (sort_column_id)
+            *sort_column_id = -1;
+
+        return TRUE;
+    }
+
+
+    if (sort_column_id)
+        *sort_column_id = wxtree_model->internal->GetSortColumn();
+
+    if (order)
+        *order = wxtree_model->internal->GetSortOrder();
+
+    return TRUE;
+}
+
+wxDataViewColumn *gs_lastLeftClickHeader = NULL;
+
+static void
+wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable,
+                                     gint             sort_column_id,
+                                     GtkSortType      order)
+{
+    GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable;
+    g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
+
+    tree_model->internal->SetDataViewSortColumn( gs_lastLeftClickHeader );
+
+    if ((sort_column_id != (gint) tree_model->internal->GetSortColumn()) ||
+        (order != tree_model->internal->GetSortOrder()))
+    {
+        tree_model->internal->SetSortColumn( sort_column_id );
+        tree_model->internal->SetSortOrder( order );
+
+        gtk_tree_sortable_sort_column_changed (sortable);
+
+        tree_model->internal->GetDataViewModel()->Resort();
+    }
+
+    if (gs_lastLeftClickHeader)
+    {
+        wxDataViewCtrl *dv = tree_model->internal->GetOwner();
+        wxDataViewEvent event( wxEVT_DATAVIEW_COLUMN_SORTED, dv->GetId() );
+        event.SetDataViewColumn( gs_lastLeftClickHeader );
+        event.SetModel( dv->GetModel() );
+        dv->HandleWindowEvent( event );
+    }
+
+    gs_lastLeftClickHeader = NULL;
+}
+
+static void
+wxgtk_tree_model_set_sort_func (GtkTreeSortable        *sortable,
+                                gint                    WXUNUSED(sort_column_id),
+                                GtkTreeIterCompareFunc  func,
+                                gpointer                WXUNUSED(data),
+                                GDestroyNotify        WXUNUSED(destroy))
+{
+    g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
+    g_return_if_fail (func != NULL);
+}
+
+static void
+wxgtk_tree_model_set_default_sort_func (GtkTreeSortable          *sortable,
+                                        GtkTreeIterCompareFunc    func,
+                                        gpointer                  WXUNUSED(data),
+                                        GDestroyNotify          WXUNUSED(destroy))
+{
+    g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
+    g_return_if_fail (func != NULL);
+
+    //wxPrintf( "wxgtk_tree_model_set_default_sort_func\n" );
+    // TODO: remove this code
+}
+
+static gboolean
+wxgtk_tree_model_has_default_sort_func (GtkTreeSortable        *sortable)
+{
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE );
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// define new GTK+ class GtkWxRendererText
+//-----------------------------------------------------------------------------
+
+extern "C" {
+
+#define GTK_TYPE_WX_CELL_RENDERER_TEXT               (gtk_wx_cell_renderer_text_get_type ())
+#define GTK_WX_CELL_RENDERER_TEXT(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_RENDERER_TEXT, GtkWxCellRendererText))
+#define GTK_IS_WX_CELL_RENDERER_TEXT(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_CELL_RENDERER_TEXT))
+#define GTK_IS_WX_CELL_RENDERER_TEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_CELL_RENDERER_TEXT))
+
+GType            gtk_wx_cell_renderer_text_get_type (void);
+
+typedef struct _GtkWxCellRendererText GtkWxCellRendererText;
+
+struct _GtkWxCellRendererText
+{
+  GtkCellRendererText parent;
+
+  wxDataViewRenderer *wx_renderer;
+};
+
+static GtkWxCellRendererText *gtk_wx_cell_renderer_text_new   (void);
+static void gtk_wx_cell_renderer_text_init (
+                        GTypeInstance* instance, void*);
+static void gtk_wx_cell_renderer_text_class_init(
+                        void* klass, void*);
+static GtkCellEditable *gtk_wx_cell_renderer_text_start_editing(
+                        GtkCellRenderer         *cell,
+                        GdkEvent                *event,
+                        GtkWidget               *widget,
+                        const gchar             *path,
+                        wxConstGdkRect          *background_area,
+                        wxConstGdkRect          *cell_area,
+                        GtkCellRendererState     flags );
+
+
+static GObjectClass *text_cell_parent_class = NULL;
+
+}  // extern "C"
+
+GType
+gtk_wx_cell_renderer_text_get_type (void)
+{
+    static GType cell_wx_type = 0;
+
+    if (!cell_wx_type)
+    {
+        const GTypeInfo cell_wx_info =
+        {
+            sizeof (GtkCellRendererTextClass),
+            NULL, /* base_init */
+            NULL, /* base_finalize */
+            gtk_wx_cell_renderer_text_class_init,
+            NULL, /* class_finalize */
+            NULL, /* class_data */
+            sizeof (GtkWxCellRendererText),
+            0,          /* n_preallocs */
+            gtk_wx_cell_renderer_text_init,
+        };
+
+        cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER_TEXT,
+            "GtkWxCellRendererText", &cell_wx_info, (GTypeFlags)0 );
+    }
+
+    return cell_wx_type;
+}
+
+static void
+gtk_wx_cell_renderer_text_init(GTypeInstance* instance, void*)
+{
+    GtkWxCellRendererText* cell = GTK_WX_CELL_RENDERER_TEXT(instance);
+    cell->wx_renderer = NULL;
+}
+
+static void
+gtk_wx_cell_renderer_text_class_init(void* klass, void*)
+{
+    GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass);
+
+    text_cell_parent_class = (GObjectClass*) g_type_class_peek_parent (klass);
+
+    cell_class->start_editing = gtk_wx_cell_renderer_text_start_editing;
+}
+
+GtkWxCellRendererText*
+gtk_wx_cell_renderer_text_new (void)
+{
+    return (GtkWxCellRendererText*) g_object_new (GTK_TYPE_WX_CELL_RENDERER_TEXT, NULL);
+}
+
+static GtkCellEditable *gtk_wx_cell_renderer_text_start_editing(
+                        GtkCellRenderer         *gtk_renderer,
+                        GdkEvent                *gdk_event,
+                        GtkWidget               *widget,
+                        const gchar             *path,
+                        wxConstGdkRect          *background_area,
+                        wxConstGdkRect          *cell_area,
+                        GtkCellRendererState     flags )
+{
+    GtkWxCellRendererText *wxgtk_renderer = (GtkWxCellRendererText *) gtk_renderer;
+    wxDataViewRenderer *wx_renderer = wxgtk_renderer->wx_renderer;
+    wxDataViewColumn *column = wx_renderer->GetOwner();
+
+    wxDataViewItem
+        item(column->GetOwner()->GTKPathToItem(wxGtkTreePath(path)));
+
+    wxDataViewCtrl *dv = column->GetOwner();
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_START_EDITING, dv->GetId() );
+    event.SetDataViewColumn( column );
+    event.SetModel( dv->GetModel() );
+    event.SetColumn( column->GetModelColumn() );
+    event.SetItem( item );
+    dv->HandleWindowEvent( event );
+
+    if (event.IsAllowed())
+        return GTK_CELL_RENDERER_CLASS(text_cell_parent_class)->
+           start_editing( gtk_renderer, gdk_event, widget, path, background_area, cell_area, flags );
+    else
+        return NULL;
+}
+
+//-----------------------------------------------------------------------------
+// define new GTK+ class GtkWxCellRenderer
+//-----------------------------------------------------------------------------
+
+extern "C" {
  
  #define GTK_TYPE_WX_CELL_RENDERER               (gtk_wx_cell_renderer_get_type ())
  #define GTK_WX_CELL_RENDERER(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRenderer))
  
  #define GTK_TYPE_WX_CELL_RENDERER               (gtk_wx_cell_renderer_get_type ())
  #define GTK_WX_CELL_RENDERER(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRenderer))
-#define GTK_WX_CELL_RENDERER_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRendererClass))
  #define GTK_IS_WX_CELL_RENDERER(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_CELL_RENDERER))
  #define GTK_IS_WX_CELL_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_CELL_RENDERER))
  #define GTK_IS_WX_CELL_RENDERER(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_CELL_RENDERER))
  #define GTK_IS_WX_CELL_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_CELL_RENDERER))
-#define GTK_WX_CELL_RENDERER_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRendererClass))
  
  GType            gtk_wx_cell_renderer_get_type (void);
  
  typedef struct _GtkWxCellRenderer GtkWxCellRenderer;
  
  GType            gtk_wx_cell_renderer_get_type (void);
  
  typedef struct _GtkWxCellRenderer GtkWxCellRenderer;
-typedef struct _GtkWxCellRendererClass GtkWxCellRendererClass;
  
  struct _GtkWxCellRenderer
  {
  
  struct _GtkWxCellRenderer
  {
@@ -681,58 +1198,52 @@ struct _GtkWxCellRenderer
  
    /*< private >*/
    wxDataViewCustomRenderer *cell;
  
    /*< private >*/
    wxDataViewCustomRenderer *cell;
-  guint32 last_click;
  };
  
  };
  
-struct _GtkWxCellRendererClass
-{
-  GtkCellRendererClass cell_parent_class;
-};
-
-
  static GtkCellRenderer *gtk_wx_cell_renderer_new   (void);
  static void gtk_wx_cell_renderer_init (
  static GtkCellRenderer *gtk_wx_cell_renderer_new   (void);
  static void gtk_wx_cell_renderer_init (
-                        GtkWxCellRenderer      *cell );
+                        GTypeInstance* instance, void*);
  static void gtk_wx_cell_renderer_class_init(
  static void gtk_wx_cell_renderer_class_init(
-                        GtkWxCellRendererClass *klass );
-static void gtk_wx_cell_renderer_finalize (
-                        GObject                *object );
+                        void* klass, void*);
  static void gtk_wx_cell_renderer_get_size (
                          GtkCellRenderer         *cell,
                          GtkWidget               *widget,
  static void gtk_wx_cell_renderer_get_size (
                          GtkCellRenderer         *cell,
                          GtkWidget               *widget,
-                        GdkRectangle            *rectangle,
+                        wxConstGdkRect          *rectangle,
                          gint                    *x_offset,
                          gint                    *y_offset,
                          gint                    *width,
                          gint                    *height );
  static void gtk_wx_cell_renderer_render (
                          GtkCellRenderer         *cell,
                          gint                    *x_offset,
                          gint                    *y_offset,
                          gint                    *width,
                          gint                    *height );
  static void gtk_wx_cell_renderer_render (
                          GtkCellRenderer         *cell,
+#ifdef __WXGTK3__
+                        cairo_t* cr,
+#else
                          GdkWindow               *window,
                          GdkWindow               *window,
+#endif
                          GtkWidget               *widget,
                          GtkWidget               *widget,
-                        GdkRectangle            *background_area,
-                        GdkRectangle            *cell_area,
+                        wxConstGdkRect          *background_area,
+                        wxConstGdkRect          *cell_area,
+#ifndef __WXGTK3__
                          GdkRectangle            *expose_area,
                          GdkRectangle            *expose_area,
+#endif
                          GtkCellRendererState     flags );
  static gboolean gtk_wx_cell_renderer_activate(
                          GtkCellRenderer         *cell,
                          GdkEvent                *event,
                          GtkWidget               *widget,
                          const gchar             *path,
                          GtkCellRendererState     flags );
  static gboolean gtk_wx_cell_renderer_activate(
                          GtkCellRenderer         *cell,
                          GdkEvent                *event,
                          GtkWidget               *widget,
                          const gchar             *path,
-                        GdkRectangle            *background_area,
-                        GdkRectangle            *cell_area,
+                        wxConstGdkRect          *background_area,
+                        wxConstGdkRect          *cell_area,
                          GtkCellRendererState     flags );
  static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
                          GtkCellRenderer         *cell,
                          GdkEvent                *event,
                          GtkWidget               *widget,
                          const gchar             *path,
                          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,
+                        wxConstGdkRect          *background_area,
+                        wxConstGdkRect          *cell_area,
                          GtkCellRendererState     flags );
  
                          GtkCellRendererState     flags );
  
-
-static GObjectClass *cell_parent_class = NULL;
-
  }  // extern "C"
  
  GType
  }  // extern "C"
  
  GType
@@ -744,15 +1255,15 @@ gtk_wx_cell_renderer_get_type (void)
      {
          const GTypeInfo cell_wx_info =
          {
      {
          const GTypeInfo cell_wx_info =
          {
-            sizeof (GtkWxCellRendererClass),
+            sizeof (GtkCellRendererClass),
              NULL, /* base_init */
              NULL, /* base_finalize */
              NULL, /* base_init */
              NULL, /* base_finalize */
-            (GClassInitFunc) gtk_wx_cell_renderer_class_init,
+            gtk_wx_cell_renderer_class_init,
              NULL, /* class_finalize */
              NULL, /* class_data */
              sizeof (GtkWxCellRenderer),
              0,          /* n_preallocs */
              NULL, /* class_finalize */
              NULL, /* class_data */
              sizeof (GtkWxCellRenderer),
              0,          /* n_preallocs */
-            (GInstanceInitFunc) gtk_wx_cell_renderer_init,
+            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,
@@ -763,57 +1274,49 @@ gtk_wx_cell_renderer_get_type (void)
  }
  
  static void
  }
  
  static void
-gtk_wx_cell_renderer_init (GtkWxCellRenderer *cell)
+gtk_wx_cell_renderer_init(GTypeInstance* instance, void*)
  {
  {
+    GtkWxCellRenderer* cell = GTK_WX_CELL_RENDERER(instance);
      cell->cell = NULL;
      cell->cell = NULL;
-    cell->last_click = 0;
  }
  
  static void
  }
  
  static void
-gtk_wx_cell_renderer_class_init (GtkWxCellRendererClass *klass)
+gtk_wx_cell_renderer_class_init(void* klass, void*)
  {
  {
-    GObjectClass *object_class = G_OBJECT_CLASS (klass);
      GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass);
  
      GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass);
  
-    cell_parent_class = (GObjectClass*) g_type_class_peek_parent (klass);
-
-    object_class->finalize = gtk_wx_cell_renderer_finalize;
-
      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;
  }
  
      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
-gtk_wx_cell_renderer_finalize (GObject *object)
-{
-    /* must chain up */
-    (* G_OBJECT_CLASS (cell_parent_class)->finalize) (object);
-}
-
  GtkCellRenderer*
  gtk_wx_cell_renderer_new (void)
  {
      return (GtkCellRenderer*) g_object_new (GTK_TYPE_WX_CELL_RENDERER, NULL);
  }
  
  GtkCellRenderer*
  gtk_wx_cell_renderer_new (void)
  {
      return (GtkCellRenderer*) g_object_new (GTK_TYPE_WX_CELL_RENDERER, NULL);
  }
  
-
-
  static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
                          GtkCellRenderer         *renderer,
  static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
                          GtkCellRenderer         *renderer,
-                        GdkEvent                *event,
+                        GdkEvent                *WXUNUSED(event),
                          GtkWidget               *widget,
                          const gchar             *path,
                          GtkWidget               *widget,
                          const gchar             *path,
-                        GdkRectangle            *background_area,
-                        GdkRectangle            *cell_area,
-                        GtkCellRendererState     flags )
+                        wxConstGdkRect          *WXUNUSED(background_area),
+                        wxConstGdkRect          *cell_area,
+                        GtkCellRendererState     WXUNUSED(flags) )
  {
      GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
      wxDataViewCustomRenderer *cell = wxrenderer->cell;
  {
      GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
      wxDataViewCustomRenderer *cell = wxrenderer->cell;
+
+    // Renderer doesn't support in-place editing
      if (!cell->HasEditorCtrl())
          return NULL;
  
      if (!cell->HasEditorCtrl())
          return NULL;
  
+    // An in-place editing control is still around
+    if (cell->GetEditorCtrl())
+        return NULL;
+
      GdkRectangle rect;
      gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
                                     &rect.x,
      GdkRectangle rect;
      gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
                                     &rect.x,
@@ -826,14 +1329,11 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
  //    rect.width  -= renderer->xpad * 2;
  //    rect.height -= renderer->ypad * 2;
  
  //    rect.width  -= renderer->xpad * 2;
  //    rect.height -= renderer->ypad * 2;
  
-//    wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
-    wxRect renderrect( cell_area->x, cell_area->y, cell_area->width, cell_area->height );
+//    wxRect renderrect(wxRectFromGDKRect(&rect));
+    wxRect renderrect(wxRectFromGDKRect(cell_area));
  
  
-    GtkTreePath *treepath = gtk_tree_path_new_from_string( path );
-    GtkTreeIter iter;
-    cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, treepath );
-    wxDataViewItem item( (void*) iter.user_data );
-    gtk_tree_path_free( treepath );
+    wxDataViewItem
+        item(cell->GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(path)));
  
      cell->StartEditing( item, renderrect );
  
  
      cell->StartEditing( item, renderrect );
  
@@ -842,8 +1342,8 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
  
  static void
  gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
  
  static void
  gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
-                               GtkWidget       *widget,
-                               GdkRectangle    *cell_area,
+                               GtkWidget       *WXUNUSED(widget),
+                               wxConstGdkRect  *cell_area,
                                 gint            *x_offset,
                                 gint            *y_offset,
                                 gint            *width,
                                 gint            *x_offset,
                                 gint            *y_offset,
                                 gint            *width,
@@ -854,8 +1354,21 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
  
      wxSize size = cell->GetSize();
  
  
      wxSize size = cell->GetSize();
  
-    gint calc_width  = (gint) renderer->xpad * 2 + size.x;
-    gint calc_height = (gint) renderer->ypad * 2 + size.y;
+    wxDataViewCtrl * const ctrl = cell->GetOwner()->GetOwner();
+
+    // Uniform row height, if specified, overrides the value returned by the
+    // renderer.
+    if ( !ctrl->HasFlag(wxDV_VARIABLE_LINE_HEIGHT) )
+    {
+        const int uniformHeight = ctrl->GTKGetUniformRowHeight();
+        if ( uniformHeight > 0 )
+            size.y = uniformHeight;
+    }
+
+    int xpad, ypad;
+    gtk_cell_renderer_get_padding(renderer, &xpad, &ypad);
+    int calc_width  = xpad * 2 + size.x;
+    int calc_height = ypad * 2 + size.y;
  
      if (x_offset)
          *x_offset = 0;
  
      if (x_offset)
          *x_offset = 0;
@@ -864,17 +1377,17 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
  
      if (cell_area && size.x > 0 && size.y > 0)
      {
  
      if (cell_area && size.x > 0 && size.y > 0)
      {
+        float xalign, yalign;
+        gtk_cell_renderer_get_alignment(renderer, &xalign, &yalign);
          if (x_offset)
          {
          if (x_offset)
          {
-            *x_offset = (gint)((renderer->xalign *
-                               (cell_area->width - calc_width - 2 * renderer->xpad)));
-            *x_offset = MAX (*x_offset, 0) + renderer->xpad;
+            *x_offset = int(xalign * (cell_area->width - calc_width - 2 * xpad));
+            *x_offset = MAX(*x_offset, 0) + xpad;
          }
          if (y_offset)
          {
          }
          if (y_offset)
          {
-            *y_offset = (gint)((renderer->yalign *
-                               (cell_area->height - calc_height - 2 * renderer->ypad)));
-            *y_offset = MAX (*y_offset, 0) + renderer->ypad;
+            *y_offset = int(yalign * (cell_area->height - calc_height - 2 * ypad));
+            *y_offset = MAX(*y_offset, 0) + ypad;
          }
      }
  
          }
      }
  
@@ -885,55 +1398,96 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
          *height = calc_height;
  }
  
          *height = calc_height;
  }
  
+struct wxDataViewCustomRenderer::GTKRenderParams
+{
+#ifdef __WXGTK3__
+    cairo_t* cr;
+#else
+    GdkWindow* window;
+    GdkRectangle* expose_area;
+#endif
+    GtkWidget* widget;
+    wxConstGdkRect* background_area;
+    int flags;
+};
+
  static void
  gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
  static void
  gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
+#ifdef __WXGTK3__
+                             cairo_t* cr,
+#else
                               GdkWindow            *window,
                               GdkWindow            *window,
+#endif
                               GtkWidget            *widget,
                               GtkWidget            *widget,
-                             GdkRectangle         *background_area,
-                             GdkRectangle         *cell_area,
+                             wxConstGdkRect       *background_area,
+                             wxConstGdkRect       *cell_area,
+#ifndef __WXGTK3__
                               GdkRectangle         *expose_area,
                               GdkRectangle         *expose_area,
+#endif
                               GtkCellRendererState  flags)
  
  {
      GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
      wxDataViewCustomRenderer *cell = wxrenderer->cell;
  
                               GtkCellRendererState  flags)
  
  {
      GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
      wxDataViewCustomRenderer *cell = wxrenderer->cell;
  
-    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;
-
-    GdkRectangle dummy;
-    if (gdk_rectangle_intersect (expose_area, &rect, &dummy))
+    wxDataViewCustomRenderer::GTKRenderParams renderParams;
+#ifdef __WXGTK3__
+    renderParams.cr = cr;
+#else
+    renderParams.window = window;
+    renderParams.expose_area = expose_area;
+#endif
+    renderParams.widget = widget;
+    renderParams.background_area = background_area;
+    renderParams.flags = flags;
+    cell->GTKSetRenderParams(&renderParams);
+
+    wxRect rect(wxRectFromGDKRect(cell_area));
+    int xpad, ypad;
+    gtk_cell_renderer_get_padding(renderer, &xpad, &ypad);
+    rect = rect.Deflate(xpad, ypad);
+
+    wxDC* dc = cell->GetDC();
+#ifdef __WXGTK3__
+    wxGraphicsContext* context = dc->GetGraphicsContext();
+    void* nativeContext = NULL;
+    if (context)
+        nativeContext = context->GetNativeContext();
+    if (cr != nativeContext)
      {
      {
-        wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
-        wxWindowDC* dc = (wxWindowDC*) cell->GetDC();
-        if (dc->m_window == NULL)
-        {
-            dc->m_window = window;
-            dc->SetUpDC();
-        }
+        cairo_reference(cr);
+        dc->SetGraphicsContext(wxGraphicsContext::CreateFromNative(cr));
+    }
+#else
+    wxWindowDCImpl *impl = (wxWindowDCImpl *) dc->GetImpl();
  
  
-        int state = 0;
-        if (flags & GTK_CELL_RENDERER_SELECTED)
-            state |= wxDATAVIEW_CELL_SELECTED;
-        if (flags & GTK_CELL_RENDERER_PRELIT)
-            state |= wxDATAVIEW_CELL_PRELIT;
-        if (flags & GTK_CELL_RENDERER_INSENSITIVE)
-            state |= wxDATAVIEW_CELL_INSENSITIVE;
-        if (flags & GTK_CELL_RENDERER_INSENSITIVE)
-            state |= wxDATAVIEW_CELL_INSENSITIVE;
-        if (flags & GTK_CELL_RENDERER_FOCUSED)
-            state |= wxDATAVIEW_CELL_FOCUSED;
-        cell->Render( renderrect, dc, state );
+    // Reinitialize wxWindowDC's GDK window if drawing occurs into a different
+    // window such as a DnD drop window.
+    if (window != impl->m_gdkwindow)
+    {
+        impl->Destroy();
+        impl->m_gdkwindow = window;
+        impl->SetUpDC();
      }
      }
+#endif
+
+    int state = 0;
+    if (flags & GTK_CELL_RENDERER_SELECTED)
+        state |= wxDATAVIEW_CELL_SELECTED;
+    if (flags & GTK_CELL_RENDERER_PRELIT)
+        state |= wxDATAVIEW_CELL_PRELIT;
+    if (flags & GTK_CELL_RENDERER_INSENSITIVE)
+        state |= wxDATAVIEW_CELL_INSENSITIVE;
+    if (flags & GTK_CELL_RENDERER_INSENSITIVE)
+        state |= wxDATAVIEW_CELL_INSENSITIVE;
+    if (flags & GTK_CELL_RENDERER_FOCUSED)
+        state |= wxDATAVIEW_CELL_FOCUSED;
+    cell->WXCallRender( rect, dc, state );
+
+    cell->GTKSetRenderParams(NULL);
+#ifdef __WXGTK3__
+    dc->SetGraphicsContext(NULL);
+#endif
  }
  
  static gboolean
  }
  
  static gboolean
@@ -942,9 +1496,9 @@ gtk_wx_cell_renderer_activate(
                          GdkEvent                *event,
                          GtkWidget               *widget,
                          const gchar             *path,
                          GdkEvent                *event,
                          GtkWidget               *widget,
                          const gchar             *path,
-                        GdkRectangle            *background_area,
-                        GdkRectangle            *cell_area,
-                        GtkCellRendererState     flags )
+                        wxConstGdkRect          *WXUNUSED(background_area),
+                        wxConstGdkRect          *cell_area,
+                        GtkCellRendererState     WXUNUSED(flags) )
  {
      GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
      wxDataViewCustomRenderer *cell = wxrenderer->cell;
  {
      GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
      wxDataViewCustomRenderer *cell = wxrenderer->cell;
@@ -958,57 +1512,41 @@ gtk_wx_cell_renderer_activate(
  
      rect.x += cell_area->x;
      rect.y += cell_area->y;
  
      rect.x += cell_area->x;
      rect.y += cell_area->y;
-    rect.width  -= renderer->xpad * 2;
-    rect.height -= renderer->ypad * 2;
+    int xpad, ypad;
+    gtk_cell_renderer_get_padding(renderer, &xpad, &ypad);
+    rect.width  -= xpad * 2;
+    rect.height -= ypad * 2;
  
  
-    wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
+    wxRect renderrect(wxRectFromGDKRect(&rect));
  
  
-    wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel();
+    wxDataViewCtrl * const ctrl = cell->GetOwner()->GetOwner();
+    wxDataViewModel *model = ctrl->GetModel();
  
  
-    GtkTreePath *treepath = gtk_tree_path_new_from_string( path );
-    // TODO
-    wxDataViewItem item;
-    gtk_tree_path_free( treepath );
+    wxDataViewItem item(ctrl->GTKPathToItem(wxGtkTreePath(path)));
  
      unsigned int model_col = cell->GetOwner()->GetModelColumn();
  
  
      unsigned int model_col = cell->GetOwner()->GetModelColumn();
  
-    if (!event)
+    if ( !event )
      {
      {
-        bool ret = false;
-
          // activated by <ENTER>
          // activated by <ENTER>
-        if (cell->Activate( renderrect, model, item, model_col ))
-                    ret = true;
-
-        return ret;
+        return cell->ActivateCell(renderrect, model, item, model_col, NULL);
      }
      }
-    else if (event->type == GDK_BUTTON_PRESS)
+    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)
+        GdkEventButton *button_event = (GdkEventButton*)event;
+        if ( button_event->button == 1 )
          {
          {
-            if (cell->RightClick( pt, renderrect, model, item, model_col ))
-                ret = true;
-        }
+            wxMouseEvent mouse_event(wxEVT_LEFT_DOWN);
+            InitMouseEvent(ctrl, mouse_event, button_event);
  
  
-        wxrenderer->last_click = button_event->time;
+            mouse_event.m_x -= renderrect.x;
+            mouse_event.m_y -= renderrect.y;
  
  
-        return ret;
+            return cell->ActivateCell(renderrect, model, item, model_col, &mouse_event);
+        }
      }
  
      }
  
+    wxLogDebug("unexpected event type in gtk_wx_cell_renderer_activate()");
      return false;
  }
  
      return false;
  }
  
@@ -1019,21 +1557,23 @@ gtk_wx_cell_renderer_activate(
  class wxGtkDataViewModelNotifier: public wxDataViewModelNotifier
  {
  public:
  class wxGtkDataViewModelNotifier: public wxDataViewModelNotifier
  {
  public:
-    wxGtkDataViewModelNotifier( GtkWxTreeModel  *wxgtk_model,
-                                wxDataViewModel *wx_model,
-                                wxDataViewCtrl  *ctrl );
+    wxGtkDataViewModelNotifier( wxDataViewModel *wx_model, wxDataViewCtrlInternal *internal );
      ~wxGtkDataViewModelNotifier();
  
      virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
      virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
      virtual bool ItemChanged( const wxDataViewItem &item );
      ~wxGtkDataViewModelNotifier();
  
      virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
      virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
      virtual bool ItemChanged( const wxDataViewItem &item );
-    virtual bool ValueChanged( const wxDataViewItem &item, unsigned int col );
+    virtual bool ValueChanged( const wxDataViewItem &item, unsigned int model_column );
      virtual bool Cleared();
      virtual void Resort();
      virtual bool Cleared();
      virtual void Resort();
+    virtual bool BeforeReset();
+    virtual bool AfterReset();
+
+    void UpdateLastCount();
  
  
-    GtkWxTreeModel      *m_wxgtk_model;
-    wxDataViewModel     *m_wx_model;
-    wxDataViewCtrl      *m_owner;
+private:
+    wxDataViewModel         *m_wx_model;
+    wxDataViewCtrlInternal  *m_internal;
  };
  
  // ---------------------------------------------------------
  };
  
  // ---------------------------------------------------------
@@ -1041,109 +1581,147 @@ public:
  // ---------------------------------------------------------
  
  wxGtkDataViewModelNotifier::wxGtkDataViewModelNotifier(
  // ---------------------------------------------------------
  
  wxGtkDataViewModelNotifier::wxGtkDataViewModelNotifier(
-    GtkWxTreeModel* wxgtk_model, wxDataViewModel *wx_model,
-    wxDataViewCtrl *ctrl )
+    wxDataViewModel *wx_model, wxDataViewCtrlInternal *internal )
  {
  {
-    m_wxgtk_model = wxgtk_model;
      m_wx_model = wx_model;
      m_wx_model = wx_model;
-    m_owner = ctrl;
+    m_internal = internal;
  }
  
  wxGtkDataViewModelNotifier::~wxGtkDataViewModelNotifier()
  {
      m_wx_model = NULL;
  }
  
  wxGtkDataViewModelNotifier::~wxGtkDataViewModelNotifier()
  {
      m_wx_model = NULL;
-    m_wxgtk_model = NULL;
+    m_internal = NULL;
  }
  
  bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
  {
  }
  
  bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
  {
-    m_owner->GtkGetInternal()->ItemAdded( parent, item );
+    m_internal->ItemAdded( parent, item );
+    GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel();
  
      GtkTreeIter iter;
  
      GtkTreeIter iter;
-    iter.stamp = m_wxgtk_model->stamp;
-    iter.user_data = (gpointer) item.GetID();
+    iter.stamp = wxgtk_model->stamp;
+    iter.user_data = item.GetID();
  
  
-    GtkTreePath *path = wxgtk_tree_model_get_path( 
-        GTK_TREE_MODEL(m_wxgtk_model), &iter );
-    gtk_tree_model_row_inserted( 
-        GTK_TREE_MODEL(m_wxgtk_model), path, &iter);
-    gtk_tree_path_free (path);
+    wxGtkTreePath path(wxgtk_tree_model_get_path(
+        GTK_TREE_MODEL(wxgtk_model), &iter ));
+    gtk_tree_model_row_inserted(
+        GTK_TREE_MODEL(wxgtk_model), path, &iter);
  
      return true;
  }
  
  bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
  {
  
      return true;
  }
  
  bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
  {
+    GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel();
+#if 0
+    // using _get_path for a deleted item cannot be
+    // a good idea
      GtkTreeIter iter;
      GtkTreeIter iter;
-    iter.stamp = m_wxgtk_model->stamp;
+    iter.stamp = wxgtk_model->stamp;
      iter.user_data = (gpointer) item.GetID();
      iter.user_data = (gpointer) item.GetID();
+    wxGtkTreePath path(wxgtk_tree_model_get_path(
+        GTK_TREE_MODEL(wxgtk_model), &iter ));
+#else
+    // so get the path from the parent
+    GtkTreeIter parentIter;
+    parentIter.stamp = wxgtk_model->stamp;
+    parentIter.user_data = (gpointer) parent.GetID();
+    wxGtkTreePath parentPath(wxgtk_tree_model_get_path(
+        GTK_TREE_MODEL(wxgtk_model), &parentIter ));
+
+    // and add the final index ourselves
+    wxGtkTreePath path(gtk_tree_path_copy(parentPath));
+    int index = m_internal->GetIndexOf( parent, item );
+    gtk_tree_path_append_index( path, index );
+#endif
  
  
-    GtkTreePath *path = wxgtk_tree_model_get_path_safe( 
-        GTK_TREE_MODEL(m_wxgtk_model), &iter );
      gtk_tree_model_row_deleted(
      gtk_tree_model_row_deleted(
-        GTK_TREE_MODEL(m_wxgtk_model), path );
-    gtk_tree_path_free (path);
+        GTK_TREE_MODEL(wxgtk_model), path );
+
+    m_internal->ItemDeleted( parent, item );
+
+    // Did we remove the last child, causing 'parent' to become a leaf?
+    if ( !m_wx_model->IsContainer(parent) )
+    {
+        gtk_tree_model_row_has_child_toggled
+        (
+            GTK_TREE_MODEL(wxgtk_model),
+            parentPath,
+            &parentIter
+        );
+    }
  
  
-    m_owner->GtkGetInternal()->ItemDeleted( parent, item );
-    
      return true;
  }
  
  void wxGtkDataViewModelNotifier::Resort()
  {
      return true;
  }
  
  void wxGtkDataViewModelNotifier::Resort()
  {
-    m_owner->GtkGetInternal()->Resort();
+    m_internal->Resort();
  }
  
  bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item )
  {
  }
  
  bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item )
  {
+    GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel();
+
      GtkTreeIter iter;
      GtkTreeIter iter;
-    iter.stamp = m_wxgtk_model->stamp;
+    iter.stamp = wxgtk_model->stamp;
      iter.user_data = (gpointer) item.GetID();
  
      iter.user_data = (gpointer) item.GetID();
  
-    GtkTreePath *path = wxgtk_tree_model_get_path( 
-        GTK_TREE_MODEL(m_wxgtk_model), &iter );
+    wxGtkTreePath path(wxgtk_tree_model_get_path(
+        GTK_TREE_MODEL(wxgtk_model), &iter ));
      gtk_tree_model_row_changed(
      gtk_tree_model_row_changed(
-        GTK_TREE_MODEL(m_wxgtk_model), path, &iter );
-    gtk_tree_path_free (path);
+        GTK_TREE_MODEL(wxgtk_model), path, &iter );
+
+    m_internal->ItemChanged( item );
  
  
-    m_owner->GtkGetInternal()->ItemChanged( item );
-    
      return true;
  }
  
      return true;
  }
  
-bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsigned int model_col )
+bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsigned int model_column )
  {
  {
+    GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel();
+    wxDataViewCtrl *ctrl = m_internal->GetOwner();
+
      // This adds GTK+'s missing MVC logic for ValueChanged
      unsigned int index;
      // This adds GTK+'s missing MVC logic for ValueChanged
      unsigned int index;
-    for (index = 0; index < m_owner->GetColumnCount(); index++)
+    for (index = 0; index < ctrl->GetColumnCount(); index++)
      {
      {
-        wxDataViewColumn *column = m_owner->GetColumn( index );
-        if (column->GetModelColumn() == model_col)
+        wxDataViewColumn *column = ctrl->GetColumn( index );
+        if (column->GetModelColumn() == model_column)
          {
          {
-            GtkTreeView *widget = GTK_TREE_VIEW(m_owner->m_treeview);
+            GtkTreeView *widget = GTK_TREE_VIEW(ctrl->GtkGetTreeView());
              GtkTreeViewColumn *gcolumn = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle());
  
              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 );
-                
-            m_owner->GtkGetInternal()->ValueChanged( item, model_col );
-            
+            // Don't attempt to refresh not yet realized tree, it is useless
+            // and results in GTK errors.
+            if ( gtk_widget_get_realized(ctrl->GtkGetTreeView()) )
+            {
+                // Get cell area
+                GtkTreeIter iter;
+                iter.stamp = wxgtk_model->stamp;
+                iter.user_data = (gpointer) item.GetID();
+                wxGtkTreePath path(wxgtk_tree_model_get_path(
+                    GTK_TREE_MODEL(wxgtk_model), &iter ));
+                GdkRectangle cell_area;
+                gtk_tree_view_get_cell_area( widget, path, gcolumn, &cell_area );
+#ifdef __WXGTK3__
+                GtkAdjustment* hadjust = gtk_scrollable_get_hadjustment(GTK_SCROLLABLE(widget));
+#else
+                GtkAdjustment* hadjust = gtk_tree_view_get_hadjustment( widget );
+#endif
+                double d = gtk_adjustment_get_value( hadjust );
+                int xdiff = (int) d;
+
+                GtkAllocation a;
+                gtk_widget_get_allocation(GTK_WIDGET(gtk_tree_view_column_get_button(gcolumn)), &a);
+                int ydiff = a.height;
+                // Redraw
+                gtk_widget_queue_draw_area( GTK_WIDGET(widget),
+                    cell_area.x - xdiff, ydiff + cell_area.y, cell_area.width, cell_area.height );
+            }
+
+            m_internal->ValueChanged( item, model_column );
+
              return true;
          }
      }
              return true;
          }
      }
@@ -1151,19 +1729,97 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig
      return false;
  }
  
      return false;
  }
  
+bool wxGtkDataViewModelNotifier::BeforeReset()
+{
+    GtkWidget *treeview = m_internal->GetOwner()->GtkGetTreeView();
+    gtk_tree_view_set_model( GTK_TREE_VIEW(treeview), NULL );
+
+    return true;
+}
+
+bool wxGtkDataViewModelNotifier::AfterReset()
+{
+    GtkWidget *treeview = m_internal->GetOwner()->GtkGetTreeView();
+    GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel();
+
+    m_internal->Cleared();
+
+    gtk_tree_view_set_model( GTK_TREE_VIEW(treeview), GTK_TREE_MODEL(wxgtk_model) );
+
+    return true;
+}
+
  bool wxGtkDataViewModelNotifier::Cleared()
  {
  bool wxGtkDataViewModelNotifier::Cleared()
  {
-    // TODO: delete everything
+    GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel();
  
  
-    m_owner->GtkGetInternal()->Cleared();
-    
-    return false;
+    // There is no call to tell the model that everything
+    // has been deleted so call row_deleted() for every
+    // child of root...
+
+    int count = m_internal->iter_n_children( NULL ); // number of children of root
+
+    GtkTreePath *path = gtk_tree_path_new_first();  // points to root
+
+    int i;
+    for (i = 0; i < count; i++)
+        gtk_tree_model_row_deleted( GTK_TREE_MODEL(wxgtk_model), path );
+
+    gtk_tree_path_free( path );
+
+    m_internal->Cleared();
+
+    return true;
  }
  
  // ---------------------------------------------------------
  // wxDataViewRenderer
  // ---------------------------------------------------------
  
  }
  
  // ---------------------------------------------------------
  // wxDataViewRenderer
  // ---------------------------------------------------------
  
+static gpointer s_user_data = NULL;
+
+static void
+wxgtk_cell_editable_editing_done( GtkCellEditable *WXUNUSED(editable),
+                                  wxDataViewRenderer *wxrenderer )
+{
+    wxDataViewColumn *column = wxrenderer->GetOwner();
+    wxDataViewCtrl *dv = column->GetOwner();
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_EDITING_DONE, dv->GetId() );
+    event.SetDataViewColumn( column );
+    event.SetModel( dv->GetModel() );
+    wxDataViewItem item( s_user_data );
+    event.SetItem( item );
+    dv->HandleWindowEvent( event );
+}
+
+static void
+wxgtk_renderer_editing_started( GtkCellRenderer *WXUNUSED(cell), GtkCellEditable *editable,
+                                gchar *path, wxDataViewRenderer *wxrenderer )
+{
+    if (!editable)
+       return;
+
+    wxDataViewColumn *column = wxrenderer->GetOwner();
+    wxDataViewCtrl *dv = column->GetOwner();
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_EDITING_STARTED, dv->GetId() );
+    event.SetDataViewColumn( column );
+    event.SetModel( dv->GetModel() );
+    wxDataViewItem item(dv->GTKPathToItem(wxGtkTreePath(path)));
+    event.SetItem( item );
+    dv->HandleWindowEvent( event );
+
+    if (GTK_IS_CELL_EDITABLE(editable))
+    {
+        s_user_data = item.GetID();
+
+        g_signal_connect (editable, "editing_done",
+            G_CALLBACK (wxgtk_cell_editable_editing_done),
+            (gpointer) wxrenderer );
+
+    }
+}
+
+
  IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase)
  
  wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode,
  IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase)
  
  wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode,
@@ -1171,27 +1827,54 @@ wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewC
      wxDataViewRendererBase( varianttype, mode, align )
  {
      m_renderer = NULL;
      wxDataViewRendererBase( varianttype, mode, align )
  {
      m_renderer = NULL;
+    m_mode = mode;
+
+    // we haven't changed them yet
+    m_usingDefaultAttrs = true;
  
      // NOTE: SetMode() and SetAlignment() needs to be called in the renderer's ctor,
      //       after the m_renderer pointer has been initialized
  }
  
  
      // NOTE: SetMode() and SetAlignment() needs to be called in the renderer's ctor,
      //       after the m_renderer pointer has been initialized
  }
  
+void wxDataViewRenderer::GtkPackIntoColumn(GtkTreeViewColumn *column)
+{
+    gtk_tree_view_column_pack_end( column, m_renderer, TRUE /* expand */);
+}
+
+void wxDataViewRenderer::GtkInitHandlers()
+{
+    {
+        g_signal_connect (m_renderer, "editing_started",
+            G_CALLBACK (wxgtk_renderer_editing_started),
+            this);
+    }
+}
+
  void wxDataViewRenderer::SetMode( wxDataViewCellMode mode )
  {
      GtkCellRendererMode gtkMode;
      switch (mode)
      {
  void wxDataViewRenderer::SetMode( wxDataViewCellMode mode )
  {
      GtkCellRendererMode gtkMode;
      switch (mode)
      {
-    case wxDATAVIEW_CELL_INERT:
-        gtkMode = GTK_CELL_RENDERER_MODE_INERT;
-        break;
-    case wxDATAVIEW_CELL_ACTIVATABLE:
-        gtkMode = GTK_CELL_RENDERER_MODE_ACTIVATABLE;
-        break;
-    case wxDATAVIEW_CELL_EDITABLE:
-        gtkMode = GTK_CELL_RENDERER_MODE_EDITABLE;
-        break;
-    }
+        case wxDATAVIEW_CELL_INERT:
+            gtkMode = GTK_CELL_RENDERER_MODE_INERT;
+            break;
  
  
+        case wxDATAVIEW_CELL_ACTIVATABLE:
+            gtkMode = GTK_CELL_RENDERER_MODE_ACTIVATABLE;
+            break;
+
+        case wxDATAVIEW_CELL_EDITABLE:
+            gtkMode = GTK_CELL_RENDERER_MODE_EDITABLE;
+            break;
+
+        default:
+            wxFAIL_MSG( "unknown wxDataViewCellMode value" );
+            return;
+    }
+
+    m_mode = mode;
+    
+    // This value is most often ignored in GtkTreeView
      GValue gvalue = { 0, };
      g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() );
      g_value_set_enum( &gvalue, gtkMode );
      GValue gvalue = { 0, };
      g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() );
      g_value_set_enum( &gvalue, gtkMode );
@@ -1208,15 +1891,21 @@ wxDataViewCellMode wxDataViewRenderer::GetMode() const
  
      switch (g_value_get_enum(&gvalue))
      {
  
      switch (g_value_get_enum(&gvalue))
      {
-    case GTK_CELL_RENDERER_MODE_INERT:
-        ret = wxDATAVIEW_CELL_INERT;
-        break;
-    case GTK_CELL_RENDERER_MODE_ACTIVATABLE:
-        ret = wxDATAVIEW_CELL_ACTIVATABLE;
-        break;
-    case GTK_CELL_RENDERER_MODE_EDITABLE:
-        ret = wxDATAVIEW_CELL_EDITABLE;
-        break;
+        default:
+            wxFAIL_MSG( "unknown GtkCellRendererMode value" );
+            // fall through (we have to return something)
+
+        case GTK_CELL_RENDERER_MODE_INERT:
+            ret = wxDATAVIEW_CELL_INERT;
+            break;
+
+        case GTK_CELL_RENDERER_MODE_ACTIVATABLE:
+            ret = wxDATAVIEW_CELL_ACTIVATABLE;
+            break;
+
+        case GTK_CELL_RENDERER_MODE_EDITABLE:
+            ret = wxDATAVIEW_CELL_EDITABLE;
+            break;
      }
  
      g_value_unset( &gvalue );
      }
  
      g_value_unset( &gvalue );
@@ -1224,8 +1913,21 @@ wxDataViewCellMode wxDataViewRenderer::GetMode() const
      return ret;
  }
  
      return ret;
  }
  
-void wxDataViewRenderer::SetAlignment( int align )
+void wxDataViewRenderer::GtkApplyAlignment(GtkCellRenderer *renderer)
  {
  {
+    int align = m_alignment;
+
+    // query alignment from column ?
+    if (align == -1)
+    {
+        // None there yet
+        if (GetOwner() == NULL)
+            return;
+
+        align = GetOwner()->GetAlignment();
+        align |= wxALIGN_CENTRE_VERTICAL;
+    }
+
      // horizontal alignment:
  
      gfloat xalign = 0.0;
      // horizontal alignment:
  
      gfloat xalign = 0.0;
@@ -1237,7 +1939,7 @@ void wxDataViewRenderer::SetAlignment( int align )
      GValue gvalue = { 0, };
      g_value_init( &gvalue, G_TYPE_FLOAT );
      g_value_set_float( &gvalue, xalign );
      GValue gvalue = { 0, };
      g_value_init( &gvalue, G_TYPE_FLOAT );
      g_value_set_float( &gvalue, xalign );
-    g_object_set_property( G_OBJECT(m_renderer), "xalign", &gvalue );
+    g_object_set_property( G_OBJECT(renderer), "xalign", &gvalue );
      g_value_unset( &gvalue );
  
      // vertical alignment:
      g_value_unset( &gvalue );
  
      // vertical alignment:
@@ -1251,85 +1953,197 @@ void wxDataViewRenderer::SetAlignment( int align )
      GValue gvalue2 = { 0, };
      g_value_init( &gvalue2, G_TYPE_FLOAT );
      g_value_set_float( &gvalue2, yalign );
      GValue gvalue2 = { 0, };
      g_value_init( &gvalue2, G_TYPE_FLOAT );
      g_value_set_float( &gvalue2, yalign );
-    g_object_set_property( G_OBJECT(m_renderer), "yalign", &gvalue2 );
+    g_object_set_property( G_OBJECT(renderer), "yalign", &gvalue2 );
      g_value_unset( &gvalue2 );
  }
  
      g_value_unset( &gvalue2 );
  }
  
+void wxDataViewRenderer::SetAlignment( int align )
+{
+    m_alignment = align;
+    GtkUpdateAlignment();
+}
+
  int wxDataViewRenderer::GetAlignment() const
  {
  int wxDataViewRenderer::GetAlignment() const
  {
-    int ret = 0;
-    GValue gvalue;
+    return m_alignment;
+}
  
  
-    // horizontal alignment:
+void wxDataViewRenderer::EnableEllipsize(wxEllipsizeMode mode)
+{
+    GtkCellRendererText * const rend = GtkGetTextRenderer();
+    if ( !rend )
+        return;
  
  
-    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;
+    // we use the same values in wxEllipsizeMode as PangoEllipsizeMode so we
+    // can just cast between them
+    GValue gvalue = { 0, };
+    g_value_init( &gvalue, PANGO_TYPE_ELLIPSIZE_MODE );
+    g_value_set_enum( &gvalue, static_cast<PangoEllipsizeMode>(mode) );
+    g_object_set_property( G_OBJECT(rend), "ellipsize", &gvalue );
      g_value_unset( &gvalue );
      g_value_unset( &gvalue );
+}
  
  
+wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const
+{
+    GtkCellRendererText * const rend = GtkGetTextRenderer();
+    if ( !rend )
+        return wxELLIPSIZE_NONE;
  
  
-    // 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;
+    GValue gvalue = { 0, };
+    g_value_init( &gvalue, PANGO_TYPE_ELLIPSIZE_MODE );
+    g_object_get_property( G_OBJECT(rend), "ellipsize", &gvalue );
+    wxEllipsizeMode
+        mode = static_cast<wxEllipsizeMode>(g_value_get_enum( &gvalue ));
      g_value_unset( &gvalue );
  
      g_value_unset( &gvalue );
  
-    return ret;
+    return mode;
  }
  
  }
  
+void
+wxDataViewRenderer::GtkOnTextEdited(const char *itempath, const wxString& str)
+{
+    wxVariant value(str);
+    if (!Validate( value ))
+        return;
+
+    wxDataViewItem
+        item(GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(itempath)));
  
  
+    GtkOnCellChanged(value, item, GetOwner()->GetModelColumn());
+}
+
+void
+wxDataViewRenderer::GtkOnCellChanged(const wxVariant& value,
+                                     const wxDataViewItem& item,
+                                     unsigned col)
+{
+    wxDataViewModel *model = GetOwner()->GetOwner()->GetModel();
+    model->ChangeValue( value, item, col );
+}
  
  // ---------------------------------------------------------
  // wxDataViewTextRenderer
  // ---------------------------------------------------------
  
  
  // ---------------------------------------------------------
  // wxDataViewTextRenderer
  // ---------------------------------------------------------
  
-extern "C" {
-static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
-    gchar *arg1, gchar *arg2, gpointer user_data );
-}
+extern "C"
+{
  
  
-static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
+static void wxGtkTextRendererEditedCallback( GtkCellRendererText *WXUNUSED(renderer),
      gchar *arg1, gchar *arg2, gpointer user_data )
  {
      gchar *arg1, gchar *arg2, gpointer user_data )
  {
-    wxDataViewTextRenderer *cell = (wxDataViewTextRenderer*) user_data;
+    wxDataViewRenderer *cell = (wxDataViewRenderer*) user_data;
  
  
-    wxString tmp = wxGTK_CONV_BACK_FONT(arg2, cell->GetOwner()->GetOwner()->GetFont());
-    wxVariant value = tmp;
-    if (!cell->Validate( value ))
-        return;
+    cell->GtkOnTextEdited(arg1, wxGTK_CONV_BACK_FONT(
+                arg2, cell->GetOwner()->GetOwner()->GetFont()));
+}
  
  
-    wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel();
+}
  
  
-    GtkTreePath *path = gtk_tree_path_new_from_string( arg1 );
-    GtkTreeIter iter;
-    cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, path );
-    wxDataViewItem item( (void*) iter.user_data );;
-    gtk_tree_path_free( path );
+namespace
+{
  
  
-    unsigned int model_col = cell->GetOwner()->GetModelColumn();
+// helper function used by wxDataViewTextRenderer and
+// wxDataViewCustomRenderer::RenderText(): it applies the attributes to the
+// given text renderer and returns true if anything was done
+bool GtkApplyAttr(GtkCellRendererText *renderer, const wxDataViewItemAttr& attr)
+{
+    bool usingDefaultAttrs = true;
+    if (attr.HasColour())
+    {
+        const GdkColor * const gcol = attr.GetColour().GetColor();
+
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, GDK_TYPE_COLOR );
+        g_value_set_boxed( &gvalue, gcol );
+        g_object_set_property( G_OBJECT(renderer), "foreground_gdk", &gvalue );
+        g_value_unset( &gvalue );
+
+        usingDefaultAttrs = false;
+    }
+    else
+    {
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, G_TYPE_BOOLEAN );
+        g_value_set_boolean( &gvalue, FALSE );
+        g_object_set_property( G_OBJECT(renderer), "foreground-set", &gvalue );
+        g_value_unset( &gvalue );
+    }
+
+    if (attr.GetItalic())
+    {
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, PANGO_TYPE_STYLE );
+        g_value_set_enum( &gvalue, PANGO_STYLE_ITALIC );
+        g_object_set_property( G_OBJECT(renderer), "style", &gvalue );
+        g_value_unset( &gvalue );
+
+        usingDefaultAttrs = false;
+    }
+    else
+    {
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, G_TYPE_BOOLEAN );
+        g_value_set_boolean( &gvalue, FALSE );
+        g_object_set_property( G_OBJECT(renderer), "style-set", &gvalue );
+        g_value_unset( &gvalue );
+    }
+
+
+    if (attr.GetBold())
+    {
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, PANGO_TYPE_WEIGHT );
+        g_value_set_enum( &gvalue, PANGO_WEIGHT_BOLD );
+        g_object_set_property( G_OBJECT(renderer), "weight", &gvalue );
+        g_value_unset( &gvalue );
+
+        usingDefaultAttrs = false;
+    }
+    else
+    {
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, G_TYPE_BOOLEAN );
+        g_value_set_boolean( &gvalue, FALSE );
+        g_object_set_property( G_OBJECT(renderer), "weight-set", &gvalue );
+        g_value_unset( &gvalue );
+    }
+
+#if 0
+    if (attr.HasBackgroundColour())
+    {
+        wxColour colour = attr.GetBackgroundColour();
+        const GdkColor * const gcol = colour.GetColor();
+
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, GDK_TYPE_COLOR );
+        g_value_set_boxed( &gvalue, gcol );
+        g_object_set_property( G_OBJECT(renderer), "cell-background_gdk", &gvalue );
+        g_value_unset( &gvalue );
+    }
+    else
+    {
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, G_TYPE_BOOLEAN );
+        g_value_set_boolean( &gvalue, FALSE );
+        g_object_set_property( G_OBJECT(renderer), "cell-background-set", &gvalue );
+        g_value_unset( &gvalue );
+    }
+#endif
  
  
-    model->SetValue( value, item, model_col );
-    model->ValueChanged( item, model_col );
+    return !usingDefaultAttrs;
  }
  
  }
  
+} // anonymous namespace
+
  IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer)
  
  wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode,
                                                  int align ) :
      wxDataViewRenderer( varianttype, mode, align )
  {
  IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer)
  
  wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode,
                                                  int align ) :
      wxDataViewRenderer( varianttype, mode, align )
  {
-    m_renderer = (GtkCellRenderer*) gtk_cell_renderer_text_new();
+    GtkWxCellRendererText *text_renderer = gtk_wx_cell_renderer_text_new();
+    text_renderer->wx_renderer = this;
+    m_renderer = (GtkCellRenderer*) text_renderer;
  
      if (mode & wxDATAVIEW_CELL_EDITABLE)
      {
  
      if (mode & wxDATAVIEW_CELL_EDITABLE)
      {
@@ -1340,36 +2154,33 @@ wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxD
          g_value_unset( &gvalue );
  
          g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this );
          g_value_unset( &gvalue );
  
          g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this );
+
+        GtkInitHandlers();
      }
  
      SetMode(mode);
      SetAlignment(align);
  }
  
      }
  
      SetMode(mode);
      SetAlignment(align);
  }
  
-bool wxDataViewTextRenderer::SetValue( const wxVariant &value )
+bool wxDataViewTextRenderer::SetTextValue(const wxString& str)
  {
  {
-    wxString tmp = value;
-
      GValue gvalue = { 0, };
      g_value_init( &gvalue, G_TYPE_STRING );
      GValue gvalue = { 0, };
      g_value_init( &gvalue, G_TYPE_STRING );
-    g_value_set_string( &gvalue, wxGTK_CONV_FONT( tmp, GetOwner()->GetOwner()->GetFont() ) );
+    g_value_set_string( &gvalue, wxGTK_CONV_FONT( str, GetOwner()->GetOwner()->GetFont() ) );
      g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
      g_value_unset( &gvalue );
  
      return true;
  }
  
      g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
      g_value_unset( &gvalue );
  
      return true;
  }
  
-bool wxDataViewTextRenderer::GetValue( wxVariant &value ) const
+bool wxDataViewTextRenderer::GetTextValue(wxString& str) const
  {
      GValue gvalue = { 0, };
      g_value_init( &gvalue, G_TYPE_STRING );
      g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );
  {
      GValue gvalue = { 0, };
      g_value_init( &gvalue, G_TYPE_STRING );
      g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );
-    wxString tmp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ),
-        wx_const_cast(wxDataViewTextRenderer*, this)->GetOwner()->GetOwner()->GetFont() );
+    str = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ), const_cast<wxDataViewTextRenderer*>(this)->GetOwner()->GetOwner()->GetFont() );
      g_value_unset( &gvalue );
  
      g_value_unset( &gvalue );
  
-    value = tmp;
-
      return true;
  }
  
      return true;
  }
  
@@ -1377,8 +2188,10 @@ void wxDataViewTextRenderer::SetAlignment( int align )
  {
      wxDataViewRenderer::SetAlignment(align);
  
  {
      wxDataViewRenderer::SetAlignment(align);
  
+#ifndef __WXGTK3__
      if (gtk_check_version(2,10,0))
          return;
      if (gtk_check_version(2,10,0))
          return;
+#endif
  
      // horizontal alignment:
      PangoAlignment pangoAlign = PANGO_ALIGN_LEFT;
  
      // horizontal alignment:
      PangoAlignment pangoAlign = PANGO_ALIGN_LEFT;
@@ -1394,17 +2207,42 @@ void wxDataViewTextRenderer::SetAlignment( int align )
      g_value_unset( &gvalue );
  }
  
      g_value_unset( &gvalue );
  }
  
+bool wxDataViewTextRenderer::GtkSetAttr(const wxDataViewItemAttr& attr)
+{
+    return GtkApplyAttr(GtkGetTextRenderer(), attr);
+}
+
+GtkCellRendererText *wxDataViewTextRenderer::GtkGetTextRenderer() const
+{
+    return GTK_CELL_RENDERER_TEXT(m_renderer);
+}
+
  // ---------------------------------------------------------
  // wxDataViewBitmapRenderer
  // ---------------------------------------------------------
  
  // ---------------------------------------------------------
  // wxDataViewBitmapRenderer
  // ---------------------------------------------------------
  
+namespace
+{
+
+// set "pixbuf" property on the given renderer
+void SetPixbufProp(GtkCellRenderer *renderer, GdkPixbuf *pixbuf)
+{
+    GValue gvalue = { 0, };
+    g_value_init( &gvalue, G_TYPE_OBJECT );
+    g_value_set_object( &gvalue, pixbuf );
+    g_object_set_property( G_OBJECT(renderer), "pixbuf", &gvalue );
+    g_value_unset( &gvalue );
+}
+
+} // anonymous namespace
+
  IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer)
  
  wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode,
                                                      int align ) :
      wxDataViewRenderer( varianttype, mode, align )
  {
  IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer)
  
  wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode,
                                                      int align ) :
      wxDataViewRenderer( varianttype, mode, align )
  {
-    m_renderer = (GtkCellRenderer*) gtk_cell_renderer_pixbuf_new();
+    m_renderer = gtk_cell_renderer_pixbuf_new();
  
      SetMode(mode);
      SetAlignment(align);
  
      SetMode(mode);
      SetAlignment(align);
@@ -1417,41 +2255,26 @@ bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value )
          wxBitmap bitmap;
          bitmap << value;
  
          wxBitmap bitmap;
          bitmap << value;
  
-        // This may create a Pixbuf representation in the
-        // wxBitmap object (and it will stay there)
-        GdkPixbuf *pixbuf = bitmap.GetPixbuf();
-
-        GValue gvalue = { 0, };
-        g_value_init( &gvalue, G_TYPE_OBJECT );
-        g_value_set_object( &gvalue, pixbuf );
-        g_object_set_property( G_OBJECT(m_renderer), "pixbuf", &gvalue );
-        g_value_unset( &gvalue );
-
-        return true;
+        // GetPixbuf() may create a Pixbuf representation in the wxBitmap
+        // object (and it will stay there and remain owned by wxBitmap)
+        SetPixbufProp(m_renderer, bitmap.GetPixbuf());
      }
      }
-
-    if (value.GetType() == wxT("wxIcon"))
+    else if (value.GetType() == wxT("wxIcon"))
      {
      {
-        wxIcon bitmap;
-        bitmap << value;
-
-        // This may create a Pixbuf representation in the
-        // wxBitmap object (and it will stay there)
-        GdkPixbuf *pixbuf = bitmap.GetPixbuf();
-
-        GValue gvalue = { 0, };
-        g_value_init( &gvalue, G_TYPE_OBJECT );
-        g_value_set_object( &gvalue, pixbuf );
-        g_object_set_property( G_OBJECT(m_renderer), "pixbuf", &gvalue );
-        g_value_unset( &gvalue );
+        wxIcon icon;
+        icon << value;
  
  
-        return true;
+        SetPixbufProp(m_renderer, icon.GetPixbuf());
+    }
+    else
+    {
+        return false;
      }
  
      }
  
-    return false;
+    return true;
  }
  
  }
  
-bool wxDataViewBitmapRenderer::GetValue( wxVariant &value ) const
+bool wxDataViewBitmapRenderer::GetValue( wxVariant &WXUNUSED(value) ) const
  {
      return false;
  }
  {
      return false;
  }
@@ -1474,27 +2297,21 @@ static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
      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 );
-    g_value_unset( &gvalue );
      // invert it
      // invert it
-    tmp = !tmp;
+    wxVariant value = !g_value_get_boolean( &gvalue );
+    g_value_unset( &gvalue );
  
  
-    wxVariant value = tmp;
      if (!cell->Validate( value ))
          return;
  
      if (!cell->Validate( value ))
          return;
  
-    wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel();
+    wxDataViewCtrl * const ctrl = cell->GetOwner()->GetOwner();
+    wxDataViewModel *model = ctrl->GetModel();
  
  
-    GtkTreePath *gtk_path = gtk_tree_path_new_from_string( path );
-    GtkTreeIter iter;
-    cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, gtk_path );
-    wxDataViewItem item( (void*) iter.user_data );;
-    gtk_tree_path_free( gtk_path );
+    wxDataViewItem item(ctrl->GTKPathToItem(wxGtkTreePath(path)));
  
      unsigned int model_col = cell->GetOwner()->GetModelColumn();
  
  
      unsigned int model_col = cell->GetOwner()->GetModelColumn();
  
-    model->SetValue( value, item, model_col );
-    model->ValueChanged( item, model_col );
+    model->ChangeValue( value, item, model_col );
  }
  
  IMPLEMENT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer)
  }
  
  IMPLEMENT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer)
@@ -1541,11 +2358,9 @@ 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 );
+    value = g_value_get_boolean( &gvalue ) != 0;
      g_value_unset( &gvalue );
  
      g_value_unset( &gvalue );
  
-    value = tmp;
-
      return true;
  }
  
      return true;
  }
  
@@ -1553,27 +2368,39 @@ bool wxDataViewToggleRenderer::GetValue( wxVariant &value ) const
  // wxDataViewCustomRenderer
  // ---------------------------------------------------------
  
  // wxDataViewCustomRenderer
  // ---------------------------------------------------------
  
-class wxDataViewCtrlDC: public wxWindowDC
+#ifndef __WXGTK3__
+class wxDataViewCtrlDCImpl: public wxWindowDCImpl
  {
  public:
  {
  public:
-    wxDataViewCtrlDC( wxDataViewCtrl *window )
-    {
+   wxDataViewCtrlDCImpl( wxDC *owner, wxDataViewCtrl *window ) :
+       wxWindowDCImpl( owner )
+   {
          GtkWidget *widget = window->m_treeview;
          // Set later
          GtkWidget *widget = window->m_treeview;
          // Set later
-        m_window = NULL;
+        m_gdkwindow = NULL;
+
+        m_window = window;
  
  
-        m_context = window->GtkGetPangoDefaultContext();
+        m_context = window->GTKGetPangoDefaultContext();
          m_layout = pango_layout_new( m_context );
          m_layout = pango_layout_new( m_context );
-        m_fontdesc = pango_font_description_copy( widget->style->font_desc );
+        m_fontdesc = pango_font_description_copy(gtk_widget_get_style(widget)->font_desc);
  
          m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget );
  
  
          m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget );
  
-        // Set m_window later
+        // Set m_gdkwindow later
          // SetUpDC();
          // SetUpDC();
-        // m_owner = window;
      }
  };
  
      }
  };
  
+class wxDataViewCtrlDC: public wxWindowDC
+{
+public:
+    wxDataViewCtrlDC( wxDataViewCtrl *window ) :
+        wxWindowDC( new wxDataViewCtrlDCImpl( this, window ) )
+        { }
+};
+#endif
+
  // ---------------------------------------------------------
  // wxDataViewCustomRenderer
  // ---------------------------------------------------------
  // ---------------------------------------------------------
  // wxDataViewCustomRenderer
  // ---------------------------------------------------------
@@ -1581,11 +2408,14 @@ public:
  IMPLEMENT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
  
  wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
  IMPLEMENT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
  
  wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
-                                                    wxDataViewCellMode mode, int align,
-                                                    bool no_init ) :
-    wxDataViewRenderer( varianttype, mode, align )
+                                                    wxDataViewCellMode mode,
+                                                    int align,
+                                                    bool no_init )
+    : wxDataViewCustomRendererBase( varianttype, mode, align )
  {
      m_dc = NULL;
  {
      m_dc = NULL;
+    m_text_renderer = NULL;
+    m_renderParams = NULL;
  
      if (no_init)
          m_renderer = NULL;
  
      if (no_init)
          m_renderer = NULL;
@@ -1593,6 +2423,62 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
          Init(mode, align);
  }
  
          Init(mode, align);
  }
  
+void wxDataViewCustomRenderer::GtkInitTextRenderer()
+{
+    m_text_renderer = GTK_CELL_RENDERER_TEXT(gtk_cell_renderer_text_new());
+    g_object_ref_sink(m_text_renderer);
+
+    GtkApplyAlignment(GTK_CELL_RENDERER(m_text_renderer));
+}
+
+GtkCellRendererText *wxDataViewCustomRenderer::GtkGetTextRenderer() const
+{
+    if ( !m_text_renderer )
+    {
+        // we create it on demand so need to do it even from a const function
+        const_cast<wxDataViewCustomRenderer *>(this)->GtkInitTextRenderer();
+    }
+
+    return m_text_renderer;
+}
+
+void wxDataViewCustomRenderer::RenderText( const wxString &text,
+                                           int xoffset,
+                                           wxRect cell,
+                                           wxDC *WXUNUSED(dc),
+                                           int WXUNUSED(state) )
+{
+
+    GtkCellRendererText * const textRenderer = GtkGetTextRenderer();
+
+    GValue gvalue = { 0, };
+    g_value_init( &gvalue, G_TYPE_STRING );
+    g_value_set_string( &gvalue, wxGTK_CONV_FONT( text, GetOwner()->GetOwner()->GetFont() ) );
+    g_object_set_property( G_OBJECT(textRenderer), "text", &gvalue );
+    g_value_unset( &gvalue );
+
+    GtkApplyAttr(textRenderer, GetAttr());
+
+    GdkRectangle cell_area;
+    wxRectToGDKRect(cell, cell_area);
+    cell_area.x += xoffset;
+    cell_area.width -= xoffset;
+
+    gtk_cell_renderer_render( GTK_CELL_RENDERER(textRenderer),
+#ifdef __WXGTK3__
+        m_renderParams->cr,
+#else
+        m_renderParams->window,
+#endif
+        m_renderParams->widget,
+        m_renderParams->background_area,
+        &cell_area,
+#ifndef __WXGTK3__
+        m_renderParams->expose_area,
+#endif
+        GtkCellRendererState(m_renderParams->flags));
+}
+
  bool wxDataViewCustomRenderer::Init(wxDataViewCellMode mode, int align)
  {
      GtkWxCellRenderer *renderer = (GtkWxCellRenderer *) gtk_wx_cell_renderer_new();
  bool wxDataViewCustomRenderer::Init(wxDataViewCellMode mode, int align)
  {
      GtkWxCellRenderer *renderer = (GtkWxCellRenderer *) gtk_wx_cell_renderer_new();
@@ -1603,6 +2489,8 @@ bool wxDataViewCustomRenderer::Init(wxDataViewCellMode mode, int align)
      SetMode(mode);
      SetAlignment(align);
  
      SetMode(mode);
      SetAlignment(align);
  
+    GtkInitHandlers();
+
      return true;
  }
  
      return true;
  }
  
@@ -1610,17 +2498,27 @@ wxDataViewCustomRenderer::~wxDataViewCustomRenderer()
  {
      if (m_dc)
          delete m_dc;
  {
      if (m_dc)
          delete m_dc;
+
+    if (m_text_renderer)
+        g_object_unref(m_text_renderer);
  }
  
  wxDC *wxDataViewCustomRenderer::GetDC()
  {
      if (m_dc == NULL)
      {
  }
  
  wxDC *wxDataViewCustomRenderer::GetDC()
  {
      if (m_dc == NULL)
      {
+#ifdef __WXGTK3__
+        wxASSERT(m_renderParams);
+        cairo_t* cr = m_renderParams->cr;
+        wxASSERT(cr && cairo_status(cr) == 0);
+        m_dc = new wxGTKCairoDC(cr);
+#else
          if (GetOwner() == NULL)
              return NULL;
          if (GetOwner()->GetOwner() == NULL)
              return NULL;
          m_dc = new wxDataViewCtrlDC( GetOwner()->GetOwner() );
          if (GetOwner() == NULL)
              return NULL;
          if (GetOwner()->GetOwner() == NULL)
              return NULL;
          m_dc = new wxDataViewCtrlDC( GetOwner()->GetOwner() );
+#endif
      }
  
      return m_dc;
      }
  
      return m_dc;
@@ -1638,28 +2536,23 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label,
  {
      m_label = label;
      m_value = 0;
  {
      m_label = label;
      m_value = 0;
+    m_renderer = (GtkCellRenderer*) gtk_cell_renderer_progress_new();
  
  
-#ifdef __WXGTK26__
-    if (!gtk_check_version(2,6,0))
-    {
-        m_renderer = (GtkCellRenderer*) gtk_cell_renderer_progress_new();
-
-        GValue gvalue = { 0, };
-        g_value_init( &gvalue, G_TYPE_STRING );
-
-        // FIXME: font encoding support
-        g_value_set_string( &gvalue, wxGTK_CONV_SYS(m_label) );
-        g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
-        g_value_unset( &gvalue );
+    SetMode(mode);
+    SetAlignment(align);
  
  
-        SetMode(mode);
-        SetAlignment(align);
-    }
+#if !wxUSE_UNICODE
+    // We can't initialize the renderer just yet because we don't have the
+    // pointer to the column that uses this renderer yet and so attempt to
+    // dereference GetOwner() to get the font that is used as a source of
+    // encoding in multibyte-to-Unicode conversion in GTKSetLabel() in
+    // non-Unicode builds would crash. So simply remember to do it later.
+    if ( !m_label.empty() )
+        m_needsToSetLabel = true;
      else
      else
-#endif
+#endif // !wxUSE_UNICODE
      {
      {
-        // Use custom cell code
-        wxDataViewCustomRenderer::Init(mode, align);
+        GTKSetLabel();
      }
  }
  
      }
  }
  
@@ -1667,36 +2560,51 @@ wxDataViewProgressRenderer::~wxDataViewProgressRenderer()
  {
  }
  
  {
  }
  
-bool wxDataViewProgressRenderer::SetValue( const wxVariant &value )
+void wxDataViewProgressRenderer::GTKSetLabel()
  {
  {
-#ifdef __WXGTK26__
-    if (!gtk_check_version(2,6,0))
-    {
-        gint tmp = (long) value;
-        GValue gvalue = { 0, };
-        g_value_init( &gvalue, G_TYPE_INT );
-        g_value_set_int( &gvalue, tmp );
-        g_object_set_property( G_OBJECT(m_renderer), "value", &gvalue );
-        g_value_unset( &gvalue );
-    }
+    GValue gvalue = { 0, };
+    g_value_init( &gvalue, G_TYPE_STRING );
+
+    // Take care to not use GetOwner() here if the label is empty, we can be
+    // called from ctor when GetOwner() is still NULL in this case.
+    wxScopedCharBuffer buf;
+    if ( m_label.empty() )
+        buf = wxScopedCharBuffer::CreateNonOwned("");
      else
      else
-#endif
-    {
-        m_value = (long) value;
+        buf = wxGTK_CONV_FONT(m_label, GetOwner()->GetOwner()->GetFont());
  
  
-        if (m_value < 0) m_value = 0;
-        if (m_value > 100) m_value = 100;
-    }
+    g_value_set_string( &gvalue, buf);
+    g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
+    g_value_unset( &gvalue );
+
+#if !wxUSE_UNICODE
+    m_needsToSetLabel = false;
+#endif // !wxUSE_UNICODE
+}
+
+bool wxDataViewProgressRenderer::SetValue( const wxVariant &value )
+{
+#if !wxUSE_UNICODE
+    if ( m_needsToSetLabel )
+        GTKSetLabel();
+#endif // !wxUSE_UNICODE
+
+    gint tmp = (long) value;
+    GValue gvalue = { 0, };
+    g_value_init( &gvalue, G_TYPE_INT );
+    g_value_set_int( &gvalue, tmp );
+    g_object_set_property( G_OBJECT(m_renderer), "value", &gvalue );
+    g_value_unset( &gvalue );
  
      return true;
  }
  
  
      return true;
  }
  
-bool wxDataViewProgressRenderer::GetValue( wxVariant &value ) const
+bool wxDataViewProgressRenderer::GetValue( wxVariant &WXUNUSED(value) ) const
  {
      return false;
  }
  
  {
      return false;
  }
  
-bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int state )
+bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
  {
      double pct = (double)m_value / 100.0;
      wxRect bar = cell;
  {
      double pct = (double)m_value / 100.0;
      wxRect bar = cell;
@@ -1717,118 +2625,213 @@ wxSize wxDataViewProgressRenderer::GetSize() const
      return wxSize(40,12);
  }
  
      return wxSize(40,12);
  }
  
-// ---------------------------------------------------------
-// wxDataViewDateRenderer
-// ---------------------------------------------------------
+// -------------------------------------
+// wxDataViewChoiceRenderer
+// -------------------------------------
  
  
-class wxDataViewDateRendererPopupTransient: public wxPopupTransientWindow
+wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString &choices,
+                            wxDataViewCellMode mode, int alignment  ) :
+    wxDataViewCustomRenderer( "string", mode, alignment, true )
  {
  {
-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()
+    m_choices = choices;
+    m_renderer = (GtkCellRenderer*) gtk_cell_renderer_combo_new();
+    GtkListStore *store = gtk_list_store_new( 1, G_TYPE_STRING );
+    for (size_t n = 0; n < m_choices.GetCount(); n++)
      {
      {
+        gtk_list_store_insert_with_values(
+            store, NULL, n, 0,
+            static_cast<const char *>(m_choices[n].utf8_str()), -1 );
      }
  
      }
  
-    void OnCalendar( wxCalendarEvent &event );
-
-    wxCalendarCtrl   *m_cal;
-    wxDataViewModel  *m_model;
-    wxDataViewItem    m_item;
-    unsigned int      m_col;
-
-private:
-    DECLARE_EVENT_TABLE()
-};
+    g_object_set (m_renderer,
+            "model", store,
+            "text-column", 0,
+            "has-entry", FALSE,
+            NULL);
  
  
-BEGIN_EVENT_TABLE(wxDataViewDateRendererPopupTransient,wxPopupTransientWindow)
-    EVT_CALENDAR( -1, wxDataViewDateRendererPopupTransient::OnCalendar )
-END_EVENT_TABLE()
+    bool editable = (mode & wxDATAVIEW_CELL_EDITABLE) != 0;
+    g_object_set (m_renderer, "editable", editable, NULL);
  
  
-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();
-}
+    SetAlignment(alignment);
  
  
-IMPLEMENT_CLASS(wxDataViewDateRenderer, wxDataViewCustomRenderer)
+    g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this );
  
  
-wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype,
-                        wxDataViewCellMode mode, int align ) :
-    wxDataViewCustomRenderer( varianttype, mode, align )
-{
-    SetMode(mode);
-    SetAlignment(align);
+    GtkInitHandlers();
  }
  
  }
  
-bool wxDataViewDateRenderer::SetValue( const wxVariant &value )
+bool wxDataViewChoiceRenderer::Render( wxRect rect, wxDC *dc, int state )
  {
  {
-    m_date = value.GetDateTime();
-
+    RenderText( m_data, 0, rect, dc, state );
      return true;
  }
  
      return true;
  }
  
-bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const
+wxSize wxDataViewChoiceRenderer::GetSize() const
  {
  {
-    return false;
+    return wxSize(70,20);
  }
  
  }
  
-bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state )
+bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value )
  {
  {
-    dc->SetFont( GetOwner()->GetOwner()->GetFont() );
-    wxString tmp = m_date.FormatDate();
-    dc->DrawText( tmp, cell.x, cell.y );
+    GValue gvalue = { 0, };
+    g_value_init( &gvalue, G_TYPE_STRING );
+    g_value_set_string(&gvalue,
+                       wxGTK_CONV_FONT(value.GetString(),
+                                       GetOwner()->GetOwner()->GetFont()));
+    g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
+    g_value_unset( &gvalue );
  
      return true;
  }
  
  
      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 )
+bool wxDataViewChoiceRenderer::GetValue( wxVariant &value ) const
  {
  {
-    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 );
+    GValue gvalue = { 0, };
+    g_value_init( &gvalue, G_TYPE_STRING );
+    g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );
+    wxString temp = wxGTK_CONV_BACK_FONT(g_value_get_string(&gvalue),
+                                         GetOwner()->GetOwner()->GetFont());
+    g_value_unset( &gvalue );
+    value = temp;
  
      return true;
  }
  
  
      return true;
  }
  
-// ---------------------------------------------------------
-// wxDataViewColumn
-// ---------------------------------------------------------
-
+void wxDataViewChoiceRenderer::SetAlignment( int align )
+{
+    wxDataViewCustomRenderer::SetAlignment(align);
+
+#ifndef __WXGTK3__
+    if (gtk_check_version(2,10,0))
+        return;
+#endif
+
+    // 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 );
+}
+
+// ----------------------------------------------------------------------------
+// wxDataViewChoiceByIndexRenderer
+// ----------------------------------------------------------------------------
+
+wxDataViewChoiceByIndexRenderer::wxDataViewChoiceByIndexRenderer( const wxArrayString &choices,
+                              wxDataViewCellMode mode, int alignment ) :
+      wxDataViewChoiceRenderer( choices, mode, alignment )
+{
+}
+
+void wxDataViewChoiceByIndexRenderer::GtkOnTextEdited(const char *itempath, const wxString& str)
+{
+    wxVariant value( (long) GetChoices().Index( str ) );
+
+    if (!Validate( value ))
+        return;
+
+    wxDataViewItem
+        item(GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(itempath)));
+
+    GtkOnCellChanged(value, item, GetOwner()->GetModelColumn());
+}
+
+bool wxDataViewChoiceByIndexRenderer::SetValue( const wxVariant &value )
+{
+    wxVariant string_value = GetChoice( value.GetLong() );
+    return wxDataViewChoiceRenderer::SetValue( string_value );
+}
+
+bool wxDataViewChoiceByIndexRenderer::GetValue( wxVariant &value ) const
+{
+    wxVariant string_value;
+    if (!wxDataViewChoiceRenderer::GetValue( string_value ))
+         return false;
+
+    value = (long) GetChoices().Index( string_value.GetString() );
+    return true;
+}
+
+// ---------------------------------------------------------
+// wxDataViewIconTextRenderer
+// ---------------------------------------------------------
+
+IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer)
+
+wxDataViewIconTextRenderer::wxDataViewIconTextRenderer
+                            (
+                             const wxString &varianttype,
+                             wxDataViewCellMode mode,
+                             int align
+                            )
+    : wxDataViewTextRenderer(varianttype, mode, align)
+{
+    m_rendererIcon = gtk_cell_renderer_pixbuf_new();
+}
+
+wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer()
+{
+}
+
+void wxDataViewIconTextRenderer::GtkPackIntoColumn(GtkTreeViewColumn *column)
+{
+    // add the icon renderer first
+    gtk_tree_view_column_pack_start(column, m_rendererIcon, FALSE /* !expand */);
+
+    // add the text renderer too
+    wxDataViewRenderer::GtkPackIntoColumn(column);
+}
+
+bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )
+{
+    m_value << value;
+
+    SetTextValue(m_value.GetText());
+
+    const wxIcon& icon = m_value.GetIcon();
+    SetPixbufProp(m_rendererIcon, icon.IsOk() ? icon.GetPixbuf() : NULL);
+
+    return true;
+}
+
+bool wxDataViewIconTextRenderer::GetValue(wxVariant& value) const
+{
+    wxString str;
+    if ( !GetTextValue(str) )
+        return false;
+
+    // user doesn't have any way to edit the icon so leave it unchanged
+    value << wxDataViewIconText(str, m_value.GetIcon());
+
+    return true;
+}
+
+void
+wxDataViewIconTextRenderer::GtkOnCellChanged(const wxVariant& value,
+                                             const wxDataViewItem& item,
+                                             unsigned col)
+{
+    // we receive just the text part of our value as it's the only one which
+    // can be edited, but we need the full wxDataViewIconText value for the
+    // model
+    wxVariant valueIconText;
+    valueIconText << wxDataViewIconText(value.GetString(), m_value.GetIcon());
+    wxDataViewTextRenderer::GtkOnCellChanged(valueIconText, item, col);
+}
+
+// ---------------------------------------------------------
+// wxDataViewColumn
+// ---------------------------------------------------------
+
  
  static gboolean
  
  static gboolean
-gtk_dataview_header_button_press_callback( GtkWidget *widget,
+gtk_dataview_header_button_press_callback( GtkWidget *WXUNUSED(widget),
                                             GdkEventButton *gdk_event,
                                             wxDataViewColumn *column )
  {
                                             GdkEventButton *gdk_event,
                                             wxDataViewColumn *column )
  {
@@ -1837,27 +2840,33 @@ gtk_dataview_header_button_press_callback( GtkWidget *widget,
  
      if (gdk_event->button == 1)
      {
  
      if (gdk_event->button == 1)
      {
+        gs_lastLeftClickHeader = column;
+
          wxDataViewCtrl *dv = column->GetOwner();
          wxDataViewCtrl *dv = column->GetOwner();
-        wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() );
+        wxDataViewEvent event( wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() );
          event.SetDataViewColumn( column );
          event.SetModel( dv->GetModel() );
          event.SetDataViewColumn( column );
          event.SetModel( dv->GetModel() );
-        if (dv->GetEventHandler()->ProcessEvent( event ))
-            return TRUE;
+        if (dv->HandleWindowEvent( event ))
+            return FALSE;
      }
  
      }
  
-    return FALSE;
-}
+    if (gdk_event->button == 3)
+    {
+        wxDataViewCtrl *dv = column->GetOwner();
+        wxDataViewEvent event( wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, dv->GetId() );
+        event.SetDataViewColumn( column );
+        event.SetModel( dv->GetModel() );
+        if (dv->HandleWindowEvent( event ))
+            return FALSE;
+    }
  
  
-extern "C" {
-static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
-                            GtkCellRenderer *cell,
-                            GtkTreeModel *model,
-                            GtkTreeIter *iter,
-                            gpointer data );
+    return FALSE;
  }
  
  }
  
+extern "C"
+{
  
  
-static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
+static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column),
                              GtkCellRenderer *renderer,
                              GtkTreeModel *model,
                              GtkTreeIter *iter,
                              GtkCellRenderer *renderer,
                              GtkTreeModel *model,
                              GtkTreeIter *iter,
@@ -1870,60 +2879,97 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
  
      wxDataViewItem item( (void*) iter->user_data );
  
  
      wxDataViewItem item( (void*) iter->user_data );
  
+    wxDataViewModel *wx_model = tree_model->internal->GetDataViewModel();
+
+    if (!wx_model->IsVirtualListModel())
+    {
+        gboolean visible;
+        if (wx_model->IsContainer( item ))
+        {
+            visible = wx_model->HasContainerColumns( item ) ||
+                        (cell->GetOwner()->GetModelColumn() == 0);
+        }
+        else
+        {
+            visible = true;
+        }
+
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, G_TYPE_BOOLEAN );
+        g_value_set_boolean( &gvalue, visible );
+        g_object_set_property( G_OBJECT(renderer), "visible", &gvalue );
+        g_value_unset( &gvalue );
+
+        if ( !visible )
+            return;
+    }
+
      wxVariant value;
      wxVariant value;
-    tree_model->internal->GetDataViewModel()->GetValue( value, item, cell->GetOwner()->GetModelColumn() );
+    wx_model->GetValue( value, item, cell->GetOwner()->GetModelColumn() );
  
      if (value.GetType() != cell->GetVariantType())
  
      if (value.GetType() != cell->GetVariantType())
+    {
          wxLogError( wxT("Wrong type, required: %s but: %s"),
                      value.GetType().c_str(),
                      cell->GetVariantType().c_str() );
          wxLogError( wxT("Wrong type, required: %s but: %s"),
                      value.GetType().c_str(),
                      cell->GetVariantType().c_str() );
+    }
  
      cell->SetValue( value );
  
  
      cell->SetValue( value );
  
-#if 0
-    wxListItemAttr attr;
-    tree_model->model->GetAttr( attr, cell->GetOwner()->GetModelColumn(), model_row );
+    // deal with disabled items
+    bool enabled = wx_model->IsEnabled( item, cell->GetOwner()->GetModelColumn() );
  
  
-    if (attr.HasBackgroundColour())
-    {
-        wxColour colour = attr.GetBackgroundColour();
-        const GdkColor * const gcol = colour.GetColor();
+    // a) this sets the appearance to disabled grey    
+    GValue gvalue = { 0, };
+    g_value_init( &gvalue, G_TYPE_BOOLEAN );
+    g_value_set_boolean( &gvalue, enabled );
+    g_object_set_property( G_OBJECT(renderer), "sensitive", &gvalue );
+    g_value_unset( &gvalue );
  
  
-        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 );
-    }
+    // b) this actually disables the control/renderer
+    if (enabled)
+        cell->SetMode( cell->GtkGetMode() );
      else
      else
+        cell->SetMode( wxDATAVIEW_CELL_INERT );
+        
+
+    // deal with attributes: if the renderer doesn't support them at all, we
+    // don't even need to query the model for them
+    if ( !cell->GtkSupportsAttrs() )
+        return;
+
+    // it can support attributes so check if this item has any
+    wxDataViewItemAttr attr;
+    if ( wx_model->GetAttr( item, cell->GetOwner()->GetModelColumn(), attr )
+            || !cell->GtkIsUsingDefaultAttrs() )
      {
      {
-        GValue gvalue = { 0, };
-        g_value_init( &gvalue, G_TYPE_BOOLEAN );
-        g_value_set_boolean( &gvalue, FALSE );
-        g_object_set_property( G_OBJECT(renderer), "cell-background-set", &gvalue );
-        g_value_unset( &gvalue );
+        bool usingDefaultAttrs = !cell->GtkSetAttr(attr);
+        cell->GtkSetUsingDefaultAttrs(usingDefaultAttrs);
      }
      }
-#endif
-
+    // else: no custom attributes specified and we're already using the default
+    //       ones -- nothing to do
+    
  }
  
  }
  
-IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
+} // extern "C"
+
+#include <wx/listimpl.cpp>
+WX_DEFINE_LIST(wxDataViewColumnList)
  
  wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell,
                                      unsigned int model_column, int width,
  
  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 )
+                                    wxAlignment align, int flags )
+    : wxDataViewColumnBase( cell, model_column )
  {
      Init( align, flags, width );
  
  {
      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,
      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 )
+                                    wxAlignment align, int flags )
+    : wxDataViewColumnBase( bitmap, cell, model_column )
  {
      Init( align, flags, width );
  
  {
      Init( align, flags, width );
  
@@ -1934,30 +2980,31 @@ void wxDataViewColumn::Init(wxAlignment align, int flags, int width)
  {
      m_isConnected = false;
  
  {
      m_isConnected = false;
  
-    GtkCellRenderer *renderer = (GtkCellRenderer *) GetRenderer()->GetGtkHandle();
      GtkTreeViewColumn *column = gtk_tree_view_column_new();
      m_column = (GtkWidget*) column;
  
      SetFlags( flags );
      SetAlignment( align );
  
      GtkTreeViewColumn *column = gtk_tree_view_column_new();
      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
+    SetWidth( width );
  
  
-    // 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 );
+    // Create container for icon and label
+    GtkWidget* box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
+    gtk_widget_show( box );
+    // gtk_container_set_border_width((GtkContainer*)box, 2);
+    m_image = gtk_image_new();
+    gtk_box_pack_start(GTK_BOX(box), m_image, FALSE, FALSE, 1);
+    m_label = gtk_label_new("");
+    gtk_box_pack_end( GTK_BOX(box), GTK_WIDGET(m_label), FALSE, FALSE, 1 );
+    gtk_tree_view_column_set_widget( column, box );
  
  
-    gtk_tree_view_column_pack_end( column, renderer, TRUE );
+    wxDataViewRenderer * const colRenderer = GetRenderer();
+    GtkCellRenderer * const cellRenderer = colRenderer->GetGtkHandle();
  
  
-    gtk_tree_view_column_set_cell_data_func( column, renderer,
-        wxGtkTreeCellDataFunc, (gpointer) GetRenderer(), NULL );
-}
+    colRenderer->GtkPackIntoColumn(column);
  
  
-wxDataViewColumn::~wxDataViewColumn()
-{
+    gtk_tree_view_column_set_cell_data_func( column, cellRenderer,
+        wxGtkTreeCellDataFunc, (gpointer) colRenderer, NULL );
  }
  
  void wxDataViewColumn::OnInternalIdle()
  }
  
  void wxDataViewColumn::OnInternalIdle()
@@ -1965,14 +3012,18 @@ void wxDataViewColumn::OnInternalIdle()
      if (m_isConnected)
          return;
  
      if (m_isConnected)
          return;
  
-    if (GTK_WIDGET_REALIZED(GetOwner()->m_treeview))
+    if (gtk_widget_get_realized(GetOwner()->m_treeview))
      {
          GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
      {
          GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
-        if (column->button)
+        GtkWidget* button = gtk_tree_view_column_get_button(column);
+        if (button)
          {
          {
-            g_signal_connect(column->button, "button_press_event",
+            g_signal_connect(button, "button_press_event",
                        G_CALLBACK (gtk_dataview_header_button_press_callback), this);
  
                        G_CALLBACK (gtk_dataview_header_button_press_callback), this);
  
+            // otherwise the event will be blocked by GTK+
+            gtk_tree_view_column_set_clickable( column, TRUE );
+
              m_isConnected = true;
          }
      }
              m_isConnected = true;
          }
      }
@@ -1989,61 +3040,37 @@ void wxDataViewColumn::SetOwner( wxDataViewCtrl *owner )
  
  void wxDataViewColumn::SetTitle( const wxString &title )
  {
  
  void wxDataViewColumn::SetTitle( const wxString &title )
  {
-    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
-
-    if (m_isConnected)
-    {
-        // disconnect before column->button gets recreated
-        g_signal_handlers_disconnect_by_func( column->button,
-                      (GtkWidget*) gtk_dataview_header_button_press_callback, this);
-
-        m_isConnected = false;
-    }
-
-    // FIXME: can it really happen that we don't have the owner here??
      wxDataViewCtrl *ctrl = GetOwner();
      wxDataViewCtrl *ctrl = GetOwner();
-    gtk_tree_view_column_set_title( column, ctrl ? wxGTK_CONV_FONT(title, ctrl->GetFont())
+    gtk_label_set_text( GTK_LABEL(m_label), ctrl ? wxGTK_CONV_FONT(title, ctrl->GetFont())
                                                   : wxGTK_CONV_SYS(title) );
                                                   : wxGTK_CONV_SYS(title) );
-
-    gtk_tree_view_column_set_widget( column, NULL );
+    if (title.empty())
+        gtk_widget_hide( m_label );
+    else
+        gtk_widget_show( m_label );
  }
  
  wxString wxDataViewColumn::GetTitle() const
  {
  }
  
  wxString wxDataViewColumn::GetTitle() const
  {
-    const gchar *str = gtk_tree_view_column_get_title( GTK_TREE_VIEW_COLUMN(m_column) );
-    return wxConvFileName->cMB2WX(str);
+    return wxGTK_CONV_BACK_FONT(
+            gtk_label_get_text( GTK_LABEL(m_label) ),
+            GetOwner()->GetFont()
+           );
  }
  
  void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap )
  {
      wxDataViewColumnBase::SetBitmap( bitmap );
  
  }
  
  void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap )
  {
      wxDataViewColumnBase::SetBitmap( bitmap );
  
-    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
-    if (bitmap.Ok())
+    if (bitmap.IsOk())
      {
      {
-        GtkImage *gtk_image = GTK_IMAGE( gtk_image_new() );
+        GtkImage *gtk_image = GTK_IMAGE(m_image);
  
  
-        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) );
+        gtk_image_set_from_pixbuf(GTK_IMAGE(gtk_image), bitmap.GetPixbuf());
+        gtk_widget_show( m_image );
      }
      else
      {
      }
      else
      {
-        gtk_tree_view_column_set_widget( column, NULL );
+        gtk_widget_hide( m_image );
      }
  }
  
      }
  }
  
@@ -2052,9 +3079,9 @@ void wxDataViewColumn::SetHidden( bool hidden )
      gtk_tree_view_column_set_visible( GTK_TREE_VIEW_COLUMN(m_column), !hidden );
  }
  
      gtk_tree_view_column_set_visible( GTK_TREE_VIEW_COLUMN(m_column), !hidden );
  }
  
-void wxDataViewColumn::SetResizeable( bool resizeable )
+void wxDataViewColumn::SetResizeable( bool resizable )
  {
  {
-    gtk_tree_view_column_set_resizable( GTK_TREE_VIEW_COLUMN(m_column), resizeable );
+    gtk_tree_view_column_set_resizable( GTK_TREE_VIEW_COLUMN(m_column), resizable );
  }
  
  void wxDataViewColumn::SetAlignment( wxAlignment align )
  }
  
  void wxDataViewColumn::SetAlignment( wxAlignment align )
@@ -2069,6 +3096,9 @@ void wxDataViewColumn::SetAlignment( wxAlignment align )
          xalign = 0.5;
  
      gtk_tree_view_column_set_alignment( column, xalign );
          xalign = 0.5;
  
      gtk_tree_view_column_set_alignment( column, xalign );
+
+    if (m_renderer && m_renderer->GetAlignment() == -1)
+        m_renderer->GtkUpdateAlignment();
  }
  
  wxAlignment wxDataViewColumn::GetAlignment() const
  }
  
  wxAlignment wxDataViewColumn::GetAlignment() const
@@ -2086,23 +3116,35 @@ wxAlignment wxDataViewColumn::GetAlignment() const
  void wxDataViewColumn::SetSortable( bool sortable )
  {
      GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
  void wxDataViewColumn::SetSortable( bool sortable )
  {
      GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
-    
-    if (sortable)
+
+    if ( sortable )
+    {
          gtk_tree_view_column_set_sort_column_id( column, GetModelColumn() );
          gtk_tree_view_column_set_sort_column_id( column, GetModelColumn() );
+    }
      else
      else
+    {
          gtk_tree_view_column_set_sort_column_id( column, -1 );
          gtk_tree_view_column_set_sort_column_id( column, -1 );
+        gtk_tree_view_column_set_sort_indicator( column, FALSE );
+        gtk_tree_view_column_set_clickable( column, FALSE );
+    }
  }
  
  bool wxDataViewColumn::IsSortable() const
  {
      GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
  }
  
  bool wxDataViewColumn::IsSortable() const
  {
      GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
-    return (gtk_tree_view_column_get_sort_column_id( column ) != -1);
+    return gtk_tree_view_column_get_clickable( column ) != 0;
+}
+
+bool wxDataViewColumn::IsSortKey() const
+{
+    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+    return gtk_tree_view_column_get_sort_indicator( column ) != 0;
  }
  
  bool wxDataViewColumn::IsResizeable() const
  {
      GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
  }
  
  bool wxDataViewColumn::IsResizeable() const
  {
      GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
-    return gtk_tree_view_column_get_resizable( column );
+    return gtk_tree_view_column_get_resizable( column ) != 0;
  }
  
  bool wxDataViewColumn::IsHidden() const
  }
  
  bool wxDataViewColumn::IsHidden() const
@@ -2119,6 +3161,8 @@ void wxDataViewColumn::SetSortOrder( bool ascending )
          gtk_tree_view_column_set_sort_order( column, GTK_SORT_ASCENDING );
      else
          gtk_tree_view_column_set_sort_order( column, GTK_SORT_DESCENDING );
          gtk_tree_view_column_set_sort_order( column, GTK_SORT_ASCENDING );
      else
          gtk_tree_view_column_set_sort_order( column, GTK_SORT_DESCENDING );
+
+    gtk_tree_view_column_set_sort_indicator( column, TRUE );
  }
  
  bool wxDataViewColumn::IsSortOrderAscending() const
  }
  
  bool wxDataViewColumn::IsSortOrderAscending() const
@@ -2145,18 +3189,70 @@ int wxDataViewColumn::GetWidth() const
  
  void wxDataViewColumn::SetWidth( int width )
  {
  
  void wxDataViewColumn::SetWidth( int width )
  {
-    gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), width );
+    if ( width == wxCOL_WIDTH_AUTOSIZE )
+    {
+        // NB: this disables user resizing
+        gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_AUTOSIZE );
+    }
+    else
+    {
+        if ( width == wxCOL_WIDTH_DEFAULT )
+        {
+            // TODO find a better calculation
+            width = wxDVC_DEFAULT_WIDTH;
+        }
+
+        gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_FIXED );
+        gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), width );
+    }
+}
+
+void wxDataViewColumn::SetReorderable( bool reorderable )
+{
+    gtk_tree_view_column_set_reorderable( GTK_TREE_VIEW_COLUMN(m_column), reorderable );
  }
  
  }
  
+bool wxDataViewColumn::IsReorderable() const
+{
+    return gtk_tree_view_column_get_reorderable( GTK_TREE_VIEW_COLUMN(m_column) ) != 0;
+}
  
  //-----------------------------------------------------------------------------
  // wxGtkTreeModelNode
  //-----------------------------------------------------------------------------
  
  
  //-----------------------------------------------------------------------------
  // wxGtkTreeModelNode
  //-----------------------------------------------------------------------------
  
+#if 0
+class wxGtkTreeModelChildWithPos
+{
+public:
+    unsigned int pos;
+    void        *id;
+};
+
+static
+int wxGtkTreeModelChildWithPosCmp( const void* data1, const void* data2, const void* user_data )
+{
+    const wxGtkTreeModelChildWithPos* child1 = (const wxGtkTreeModelChildWithPos*) data1;
+    const wxGtkTreeModelChildWithPos* child2 = (const wxGtkTreeModelChildWithPos*) data2;
+    const wxDataViewCtrlInternal *internal = (const wxDataViewCtrlInternal *) user_data;
+    int ret = internal->GetDataViewModel()->Compare( child1->id, child2->id,
+        internal->GetSortColumn(), (internal->GetSortOrder() == GTK_SORT_DESCENDING) );
+
+    return ret;
+}
+#else
+static
+int LINKAGEMODE wxGtkTreeModelChildPtrCmp( void*** data1, void*** data2 )
+{
+    return gs_internal->GetDataViewModel()->Compare( wxDataViewItem(**data1), wxDataViewItem(**data2),
+        gs_internal->GetSortColumn(), (gs_internal->GetSortOrder() == GTK_SORT_ASCENDING) );
+}
+
+WX_DEFINE_ARRAY_PTR( void**, wxGtkTreeModelChildrenPtr );
+#endif
+
  void wxGtkTreeModelNode::Resort()
  {
  void wxGtkTreeModelNode::Resort()
  {
-    g_internal = m_internal;
-    
      size_t child_count = GetChildCount();
      if (child_count == 0)
          return;
      size_t child_count = GetChildCount();
      if (child_count == 0)
          return;
@@ -2173,57 +3269,89 @@ void wxGtkTreeModelNode::Resort()
          return;
      }
  
          return;
      }
  
-    wxGtkTreeModelChildren *new_array = new wxGtkTreeModelChildren( wxGtkTreeModelNodeCmp );
+    gint *new_order = new gint[child_count];
  
  
-    size_t pos;
-    for (pos = 0; pos < child_count; pos++)
-        new_array->Add( m_children->Item( pos ) );
+#if 1
+    // m_children has the original *void
+    // ptrs points to these
+    wxGtkTreeModelChildrenPtr ptrs;
+    size_t i;
+    for (i = 0; i < child_count; i++)
+       ptrs.Add( &(m_children[i]) );
+    // Sort the ptrs
+    gs_internal = m_internal;
+    ptrs.Sort( &wxGtkTreeModelChildPtrCmp );
+
+    wxGtkTreeModelChildren temp;
+    void** base_ptr = &(m_children[0]);
+    // Transfer positions to new_order array and
+    // IDs to temp
+    for (i = 0; i < child_count; i++)
+    {
+        new_order[i] = ptrs[i] - base_ptr;
+        temp.Add( *ptrs[i] );
+    }
  
  
-    gint *new_order = new gint[child_count];
-    
-    for (pos = 0; pos < child_count; pos++)
+    // Transfer IDs back to m_children
+    m_children.Clear();
+    WX_APPEND_ARRAY( temp, m_children );
+#endif
+#if 0
+    // Too slow
+
+    // Build up array with IDs and original positions
+    wxGtkTreeModelChildWithPos* temp = new wxGtkTreeModelChildWithPos[child_count];
+    size_t i;
+    for (i = 0; i < child_count; i++)
      {
      {
-        void *id = new_array->Item( pos );
-        size_t old_pos;
-        for (old_pos = 0; old_pos < child_count; old_pos++)
-        {
-            if (id == m_children->Item(old_pos))
-            {
-                new_order[pos] = old_pos;
-                break;
-            }
-        }
+       temp[i].pos = i;
+       temp[i].id = m_children[i];
      }
      }
-        
-//    for (pos = 0; pos < count; pos++)
-//        m_children->Clear();
-    delete m_children;
-    
-    m_children = new_array;
-    
-    GtkTreeModel *gtk_tree_model = GTK_TREE_MODEL( m_internal->GetGtkModel() );
+    // Sort array keeping original positions
+    wxQsort( temp, child_count, sizeof(wxGtkTreeModelChildWithPos),
+             &wxGtkTreeModelChildWithPosCmp, m_internal );
+    // Transfer positions to new_order array and
+    // IDs to m_children
+    m_children.Clear();
+    for (i = 0; i < child_count; i++)
+    {
+       new_order[i] = temp[i].pos;
+       m_children.Add( temp[i].id );
+    }
+    // Delete array
+    delete [] temp;
+#endif
+
+#if 0
+    // Too slow
+
+    wxGtkTreeModelChildren temp;
+    WX_APPEND_ARRAY( temp, m_children );
  
  
-    GtkTreePath *path = gtk_tree_path_new ();
-    wxGtkTreeModelNode *parent = GetParent();
-    void *id = GetItem().GetID();
+    gs_internal = m_internal;
+    m_children.Sort( &wxGtkTreeModelChildCmp );
  
  
-    while (parent)
+    unsigned int pos;
+    for (pos = 0; pos < child_count; pos++)
      {
      {
-        int pos = parent->GetChildren().Index( id );
-        gtk_tree_path_prepend_index( path, pos );
-        id = parent->GetItem().GetID();
-        parent = parent->GetParent();
+        void *id = m_children.Item( pos );
+        int old_pos = temp.Index( id );
+        new_order[pos] = old_pos;
      }
      }
-    
+#endif
+
+    GtkTreeModel *gtk_tree_model = GTK_TREE_MODEL( m_internal->GetGtkModel() );
+
      GtkTreeIter iter;
      GtkTreeIter iter;
-    iter.user_data = id;
+    iter.user_data = GetItem().GetID();
      iter.stamp = m_internal->GetGtkModel()->stamp;
      iter.stamp = m_internal->GetGtkModel()->stamp;
-    gtk_tree_model_rows_reordered( gtk_tree_model, path, &iter, new_order );
-    
-    gtk_tree_path_free (path);
-    
+
+    gtk_tree_model_rows_reordered( gtk_tree_model,
+            wxGtkTreePath(m_internal->get_path(&iter)), &iter, new_order );
+
      delete [] new_order;
      delete [] new_order;
-    
+
+    unsigned int pos;
      for (pos = 0; pos < node_count; pos++)
      {
          wxGtkTreeModelNode *node = m_nodes.Item( pos );
      for (pos = 0; pos < node_count; pos++)
      {
          wxGtkTreeModelNode *node = m_nodes.Item( pos );
@@ -2235,156 +3363,444 @@ void wxGtkTreeModelNode::Resort()
  // wxDataViewCtrlInternal
  //-----------------------------------------------------------------------------
  
  // wxDataViewCtrlInternal
  //-----------------------------------------------------------------------------
  
-wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, 
-    wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model )
-{ 
+wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model )
+{
      m_owner = owner;
      m_owner = owner;
-    m_wx_model = wx_model; 
-    m_gtk_model = gtk_model; 
-    m_root = NULL; 
+    m_wx_model = wx_model;
+
+    m_root = NULL;
      m_sort_order = GTK_SORT_ASCENDING;
      m_sort_order = GTK_SORT_ASCENDING;
-    m_sort_column = 0;
-    InitTree();
+    m_sort_column = -1;
+    m_dataview_sort_column = NULL;
+
+    m_dragDataObject = NULL;
+    m_dropDataObject = NULL;
+
+    m_dirty = false;
+
+    m_gtk_model = wxgtk_tree_model_new();
+    m_gtk_model->internal = this;
+
+    m_notifier = new wxGtkDataViewModelNotifier( wx_model, this );
+
+    wx_model->AddNotifier( m_notifier );
+
+    // g_object_unref( gtk_model ); ???
+
+    if (!m_wx_model->IsVirtualListModel())
+        InitTree();
+
+    gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->GtkGetTreeView()), GTK_TREE_MODEL(m_gtk_model) );
  }
  }
-    
+
  wxDataViewCtrlInternal::~wxDataViewCtrlInternal()
  {
  wxDataViewCtrlInternal::~wxDataViewCtrlInternal()
  {
+    m_wx_model->RemoveNotifier( m_notifier );
+
+    // remove the model from the GtkTreeView before it gets destroyed
+    gtk_tree_view_set_model( GTK_TREE_VIEW( m_owner->GtkGetTreeView() ), NULL );
+
      g_object_unref( m_gtk_model );
      g_object_unref( m_gtk_model );
+
+    delete m_dragDataObject;
+    delete m_dropDataObject;
  }
  }
-    
-void wxDataViewCtrlInternal::InitTree()
-{
-    wxDataViewItem item;
-    m_root = new wxGtkTreeModelNode( NULL, item, this );
  
  
-    BuildBranch( m_root );
+void wxDataViewCtrlInternal::ScheduleRefresh()
+{
+    m_dirty = true;
  }
  
  }
  
-void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node )
+void wxDataViewCtrlInternal::OnInternalIdle()
  {
  {
-    if (node->GetChildCount() == 0)
+    if (m_dirty)
      {
      {
-        wxDataViewItem child = m_wx_model->GetFirstChild( node->GetItem() );
-        while (child.IsOk())
+        GtkWidget *widget = m_owner->GtkGetTreeView();
+        gtk_widget_queue_draw( widget );
+        m_dirty = false;
+    }
+}
+
+void wxDataViewCtrlInternal::InitTree()
+{
+    wxDataViewItem item;
+    m_root = new wxGtkTreeModelNode( NULL, item, this );
+
+    BuildBranch( m_root );
+}
+
+void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node )
+{
+    if (node->GetChildCount() == 0)
+    {
+        wxDataViewItemArray children;
+        unsigned int count = m_wx_model->GetChildren( node->GetItem(), children );
+
+        unsigned int pos;
+        for (pos = 0; pos < count; pos++)
          {
          {
+            wxDataViewItem child = children[pos];
+
              if (m_wx_model->IsContainer( child ))
                  node->AddNode( new wxGtkTreeModelNode( node, child, this ) );
              else
              if (m_wx_model->IsContainer( child ))
                  node->AddNode( new wxGtkTreeModelNode( node, child, this ) );
              else
-                node->AddLeave( child.GetID() );
-    
+                node->AddLeaf( child.GetID() );
+
              // Don't send any events here
              // Don't send any events here
-    
-            child = m_wx_model->GetNextSibling( child );
          }
      }
  }
  
          }
      }
  }
  
-void wxDataViewCtrlInternal::Resort()
+// GTK+ dnd iface
+
+bool wxDataViewCtrlInternal::EnableDragSource( const wxDataFormat &format )
  {
  {
-    m_root->Resort();
+    wxGtkString atom_str( gdk_atom_name( format  ) );
+    m_dragSourceTargetEntryTarget = wxCharBuffer( atom_str );
+
+    m_dragSourceTargetEntry.target =  m_dragSourceTargetEntryTarget.data();
+    m_dragSourceTargetEntry.flags = 0;
+    m_dragSourceTargetEntry.info = static_cast<guint>(-1);
+
+    gtk_tree_view_enable_model_drag_source( GTK_TREE_VIEW(m_owner->GtkGetTreeView() ),
+       GDK_BUTTON1_MASK, &m_dragSourceTargetEntry, 1, (GdkDragAction) GDK_ACTION_COPY );
+
+    return true;
  }
  
  }
  
-bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
+bool wxDataViewCtrlInternal::EnableDropTarget( const wxDataFormat &format )
  {
  {
-    wxGtkTreeModelNode *parent_node = FindNode( parent );
-    if (m_wx_model->IsContainer( item ))
-        parent_node->AddNode( new wxGtkTreeModelNode( parent_node, item, this ) );
-    else
-        parent_node->AddLeave( item.GetID() );
-        
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_ADDED, m_owner->GetId() );
+    wxGtkString atom_str( gdk_atom_name( format  ) );
+    m_dropTargetTargetEntryTarget = wxCharBuffer( atom_str );
+
+    m_dropTargetTargetEntry.target =  m_dropTargetTargetEntryTarget.data();
+    m_dropTargetTargetEntry.flags = 0;
+    m_dropTargetTargetEntry.info = static_cast<guint>(-1);
+
+    gtk_tree_view_enable_model_drag_dest( GTK_TREE_VIEW(m_owner->GtkGetTreeView() ),
+       &m_dropTargetTargetEntry, 1, (GdkDragAction) GDK_ACTION_COPY );
+
+    return true;
+}
+
+gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag_source),
+    GtkTreePath *path )
+{
+    delete m_dragDataObject;
+    m_dragDataObject = NULL;
+
+    wxDataViewItem item(GetOwner()->GTKPathToItem(path));
+    if ( !item )
+        return FALSE;
+
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() );
      event.SetEventObject( m_owner );
      event.SetEventObject( m_owner );
-    event.SetModel( m_owner->GetModel() );
      event.SetItem( item );
      event.SetItem( item );
-    m_owner->GetEventHandler()->ProcessEvent( event );
+    event.SetModel( m_wx_model );
+    gint x, y;
+    gtk_widget_get_pointer(m_owner->GtkGetTreeView(), &x, &y);
+    event.SetPosition(x, y);
+    if (!m_owner->HandleWindowEvent( event ))
+        return FALSE;
  
  
-    return true;
+    if (!event.IsAllowed())
+        return FALSE;
+
+    wxDataObject *obj = event.GetDataObject();
+    if (!obj)
+        return FALSE;
+
+    m_dragDataObject = obj;
+
+    return TRUE;
  }
  
  }
  
-bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
+gboolean
+wxDataViewCtrlInternal::drag_data_delete(GtkTreeDragSource *WXUNUSED(drag_source),
+                                         GtkTreePath *WXUNUSED(path))
  {
  {
-    wxGtkTreeModelNode *parent_node = FindNode( parent );
-    parent_node->DeleteChild( item.GetID() );
-    
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_DELETED, m_owner->GetId() );
+    return FALSE;
+}
+
+gboolean wxDataViewCtrlInternal::drag_data_get( GtkTreeDragSource *WXUNUSED(drag_source),
+    GtkTreePath *path, GtkSelectionData *selection_data )
+{
+    wxDataViewItem item(GetOwner()->GTKPathToItem(path));
+    if ( !item )
+        return FALSE;
+
+    GdkAtom target = gtk_selection_data_get_target(selection_data);
+    if (!m_dragDataObject->IsSupported(target))
+        return FALSE;
+
+    size_t size = m_dragDataObject->GetDataSize(target);
+    if (size == 0)
+        return FALSE;
+
+    void *buf = malloc( size );
+
+    gboolean res = FALSE;
+    if (m_dragDataObject->GetDataHere(target, buf))
+    {
+        res = TRUE;
+
+        gtk_selection_data_set(selection_data, target,
+            8, (const guchar*) buf, size );
+    }
+
+    free( buf );
+
+    return res;
+}
+
+gboolean
+wxDataViewCtrlInternal::drag_data_received(GtkTreeDragDest *WXUNUSED(drag_dest),
+                                           GtkTreePath *path,
+                                           GtkSelectionData *selection_data)
+{
+    wxDataViewItem item(GetOwner()->GTKPathToItem(path));
+    if ( !item )
+        return FALSE;
+
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP, m_owner->GetId() );
      event.SetEventObject( m_owner );
      event.SetEventObject( m_owner );
-    event.SetModel( m_owner->GetModel() );
      event.SetItem( item );
      event.SetItem( item );
-    m_owner->GetEventHandler()->ProcessEvent( event );
+    event.SetModel( m_wx_model );
+    event.SetDataFormat(gtk_selection_data_get_target(selection_data));
+    event.SetDataSize(gtk_selection_data_get_length(selection_data));
+    event.SetDataBuffer(const_cast<guchar*>(gtk_selection_data_get_data(selection_data)));
+    if (!m_owner->HandleWindowEvent( event ))
+        return FALSE;
  
  
-    return true;
+    if (!event.IsAllowed())
+        return FALSE;
+
+    return TRUE;
  }
  
  }
  
-bool wxDataViewCtrlInternal::ItemChanged( const wxDataViewItem &item )
+gboolean
+wxDataViewCtrlInternal::row_drop_possible(GtkTreeDragDest *WXUNUSED(drag_dest),
+                                          GtkTreePath *path,
+                                          GtkSelectionData *selection_data)
  {
  {
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_CHANGED, m_owner->GetId() );
+    wxDataViewItem item(GetOwner()->GTKPathToItem(path));
+    if ( !item )
+        return FALSE;
+
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
      event.SetEventObject( m_owner );
      event.SetEventObject( m_owner );
-    event.SetModel( m_owner->GetModel() );
      event.SetItem( item );
      event.SetItem( item );
-    m_owner->GetEventHandler()->ProcessEvent( event );
-    
+    event.SetModel( m_wx_model );
+    event.SetDataFormat(gtk_selection_data_get_target(selection_data));
+    event.SetDataSize(gtk_selection_data_get_length(selection_data));
+    if (!m_owner->HandleWindowEvent( event ))
+        return FALSE;
+
+    if (!event.IsAllowed())
+        return FALSE;
+
+    return TRUE;
+}
+
+// notifications from wxDataViewModel
+
+bool wxDataViewCtrlInternal::Cleared()
+{
+    if (m_root)
+    {
+        delete m_root;
+        m_root = NULL;
+    }
+
+    InitTree();
+
+    ScheduleRefresh();
+
+    return true;
+}
+
+void wxDataViewCtrlInternal::Resort()
+{
+    if (!m_wx_model->IsVirtualListModel())
+        m_root->Resort();
+
+    ScheduleRefresh();
+}
+
+bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
+{
+    if (!m_wx_model->IsVirtualListModel())
+    {
+        wxGtkTreeModelNode *parent_node = FindNode( parent );
+        wxCHECK_MSG(parent_node, false,
+            "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel");
+
+        wxDataViewItemArray modelSiblings;
+        m_wx_model->GetChildren(parent, modelSiblings);
+        const int modelSiblingsSize = modelSiblings.size();
+
+        int posInModel = modelSiblings.Index(item, /*fromEnd=*/true);
+        wxCHECK_MSG( posInModel != wxNOT_FOUND, false, "adding non-existent item?" );
+
+        const wxGtkTreeModelChildren& nodeSiblings = parent_node->GetChildren();
+        const int nodeSiblingsSize = nodeSiblings.size();
+
+        int nodePos = 0;
+
+        if ( posInModel == modelSiblingsSize - 1 )
+        {
+            nodePos = nodeSiblingsSize;
+        }
+        else if ( modelSiblingsSize == nodeSiblingsSize + 1 )
+        {
+            // This is the simple case when our node tree already matches the
+            // model and only this one item is missing.
+            nodePos = posInModel;
+        }
+        else
+        {
+            // It's possible that a larger discrepancy between the model and
+            // our realization exists. This can happen e.g. when adding a bunch
+            // of items to the model and then calling ItemsAdded() just once
+            // afterwards. In this case, we must find the right position by
+            // looking at sibling items.
+
+            // append to the end if we won't find a better position:
+            nodePos = nodeSiblingsSize;
+
+            for ( int nextItemPos = posInModel + 1;
+                  nextItemPos < modelSiblingsSize;
+                  nextItemPos++ )
+            {
+                int nextNodePos = parent_node->FindChildByItem(modelSiblings[nextItemPos]);
+                if ( nextNodePos != wxNOT_FOUND )
+                {
+                    nodePos = nextNodePos;
+                    break;
+                }
+            }
+        }
+
+        if (m_wx_model->IsContainer( item ))
+            parent_node->InsertNode( new wxGtkTreeModelNode( parent_node, item, this ), nodePos );
+        else
+            parent_node->InsertLeaf( item.GetID(), nodePos );
+    }
+
+    ScheduleRefresh();
+
      return true;
  }
  
      return true;
  }
  
-bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned int col )
+bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
  {
  {
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED, m_owner->GetId() );
+    if (!m_wx_model->IsVirtualListModel())
+    {
+        wxGtkTreeModelNode *parent_node = FindNode( parent );
+        wxASSERT_MSG(parent_node,
+            "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel");
+
+        parent_node->DeleteChild( item.GetID() );
+    }
+
+    ScheduleRefresh();
+
+    return true;
+}
+
+bool wxDataViewCtrlInternal::ItemChanged( const wxDataViewItem &item )
+{
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, m_owner->GetId() );
      event.SetEventObject( m_owner );
      event.SetModel( m_owner->GetModel() );
      event.SetEventObject( m_owner );
      event.SetModel( m_owner->GetModel() );
-    event.SetColumn( col );
      event.SetItem( item );
      event.SetItem( item );
-    m_owner->GetEventHandler()->ProcessEvent( event );
-    
+    m_owner->HandleWindowEvent( event );
+
      return true;
  }
  
      return true;
  }
  
-bool wxDataViewCtrlInternal::Cleared()
+bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned int view_column )
  {
  {
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED, m_owner->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, m_owner->GetId() );
      event.SetEventObject( m_owner );
      event.SetModel( m_owner->GetModel() );
      event.SetEventObject( m_owner );
      event.SetModel( m_owner->GetModel() );
-    m_owner->GetEventHandler()->ProcessEvent( event );
-    
+    event.SetColumn( view_column );
+    event.SetDataViewColumn( GetOwner()->GetColumn(view_column) );
+    event.SetItem( item );
+    m_owner->HandleWindowEvent( event );
+
      return true;
  }
  
      return true;
  }
  
+// GTK+ model iface
+
+GtkTreeModelFlags wxDataViewCtrlInternal::get_flags()
+{
+    int flags = 0;
+
+    if ( m_wx_model->IsListModel() )
+        flags |= GTK_TREE_MODEL_LIST_ONLY;
+
+    if ( !m_wx_model->IsVirtualListModel() )
+        flags |= GTK_TREE_MODEL_ITERS_PERSIST;
+
+    return GtkTreeModelFlags(flags);
+}
+
  gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path )
  {
  gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path )
  {
-    g_internal = this;
-    
-    int depth = gtk_tree_path_get_depth( path );
  
  
-    wxGtkTreeModelNode *node = m_root;
+    if (m_wx_model->IsVirtualListModel())
+    {
+        wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model;
  
  
-    int i;
-    for (i = 0; i < depth; i++)    
+        unsigned int i = (unsigned int)gtk_tree_path_get_indices (path)[0];
+
+        if (i >= wx_model->GetCount())
+            return FALSE;
+
+        iter->stamp = m_gtk_model->stamp;
+        // user_data is just the index +1
+        iter->user_data = wxUIntToPtr(i+1);
+
+        return TRUE;
+    }
+    else
      {
      {
-        BuildBranch( node );
-        
-        gint pos = gtk_tree_path_get_indices (path)[i];
-        if (pos < 0) return FALSE;
-        if ((size_t)pos >= node->GetChildCount()) return FALSE;
-        
-        void* id = node->GetChildren().Item( (size_t) pos );
-        
-        if (i == depth-1)
-        {
-            iter->stamp = m_gtk_model->stamp;
-            iter->user_data = id;
-            return TRUE;
-        }
+        int depth = gtk_tree_path_get_depth( path );
+
+        wxGtkTreeModelNode *node = m_root;
  
  
-        size_t count = node->GetNodes().GetCount();
-        size_t pos2;
-        for (pos2 = 0; pos2 < count; pos2++)
+        int i;
+        for (i = 0; i < depth; i++)
          {
          {
-            wxGtkTreeModelNode *child_node = node->GetNodes().Item( pos2 );
-            if (child_node->GetItem().GetID() == id)
+            BuildBranch( node );
+
+            gint pos = gtk_tree_path_get_indices (path)[i];
+            if (pos < 0) return FALSE;
+            if ((size_t)pos >= node->GetChildCount()) return FALSE;
+
+            void* id = node->GetChildren().Item( (size_t) pos );
+
+            if (i == depth-1)
              {
              {
-                node = child_node;
-                break;
+                iter->stamp = m_gtk_model->stamp;
+                iter->user_data = id;
+                return TRUE;
              }
              }
-        }        
+
+            size_t count = node->GetNodes().GetCount();
+            size_t pos2;
+            for (pos2 = 0; pos2 < count; pos2++)
+            {
+                wxGtkTreeModelNode *child_node = node->GetNodes().Item( pos2 );
+                if (child_node->GetItem().GetID() == id)
+                {
+                    node = child_node;
+                    break;
+                }
+            }
+        }
      }
  
      return FALSE;
      }
  
      return FALSE;
@@ -2392,160 +3808,283 @@ gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path
  
  GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter )
  {
  
  GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter )
  {
-    g_internal = this;
-    
+    // When this is called from ItemDeleted(), the item is already
+    // deleted in the model.
+
      GtkTreePath *retval = gtk_tree_path_new ();
      GtkTreePath *retval = gtk_tree_path_new ();
-    void *id = iter->user_data;    
-    
-    wxGtkTreeModelNode *node = FindParentNode( iter );
-    while (node)
+
+    if (m_wx_model->IsVirtualListModel())
      {
      {
-        int pos = node->GetChildren().Index( id );
-        gtk_tree_path_prepend_index( retval, pos );
-        
-        id = node->GetItem().GetID();
-        node = node->GetParent();
+        // iter is root, add nothing
+        if (!iter->user_data)
+           return retval;
+
+        // user_data is just the index +1
+        int i = ( (wxUIntPtr) iter->user_data ) -1;
+        gtk_tree_path_append_index (retval, i);
+    }
+    else
+    {
+        void *id = iter->user_data;
+
+        wxGtkTreeModelNode *node = FindParentNode( iter );
+        while (node)
+        {
+            int pos = node->GetChildren().Index( id );
+
+            gtk_tree_path_prepend_index( retval, pos );
+
+            id = node->GetItem().GetID();
+            node = node->GetParent();
+        }
      }
  
      return retval;
  }
  
      }
  
      return retval;
  }
  
-GtkTreePath *wxDataViewCtrlInternal::get_path_safe( GtkTreeIter *iter )
+gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter )
  {
  {
-    g_internal = this;
-    
-    GtkTreePath *retval = gtk_tree_path_new ();
-    void *id = iter->user_data;    
-    
-    wxGtkTreeModelNode *node = FindParentNode( iter );
-    while (node)
+    if (m_wx_model->IsVirtualListModel())
      {
      {
-        size_t pos;
-        for (pos = 0; pos < node->GetChildren().GetCount(); pos++)
+        wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model;
+
+        // user_data is just the index +1
+        int n = ( (wxUIntPtr) iter->user_data ) -1;
+
+        if (n == -1)
          {
          {
-            if (id == node->GetChildren().Item( pos ))
-            {
-                gtk_tree_path_prepend_index( retval, (int) pos );
-                continue;
-            }
+            iter->user_data = NULL;
+            return FALSE;
          }
  
          }
  
-        id = node->GetItem().GetID();
-        node = node->GetParent();
+        if (n >= (int) wx_model->GetCount()-1)
+        {
+            iter->user_data = NULL;
+            return FALSE;
+        }
+
+        // user_data is just the index +1 (+2 because we need the next)
+        iter->user_data = wxUIntToPtr(n+2);
      }
      }
+    else
+    {
+        wxGtkTreeModelNode *parent = FindParentNode( iter );
+        if( parent == NULL )
+        {
+            iter->user_data = NULL;
+            return FALSE;
+        }
  
  
-    return retval;
-}
+        int pos = parent->GetChildren().Index( iter->user_data );
  
  
-gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter )
-{
-    g_internal = this;
-    
-    wxGtkTreeModelNode *parent = FindParentNode( iter );
-    if( parent == NULL )
-        return FALSE;
+        if (pos == (int) parent->GetChildCount()-1)
+        {
+            iter->user_data = NULL;
+            return FALSE;
+        }
  
  
-    unsigned int pos = parent->GetChildren().Index( iter->user_data );
-    
-    if (pos == parent->GetChildCount()-1)
-        return FALSE;
-        
-    iter->stamp = m_gtk_model->stamp;
-    iter->user_data = parent->GetChildren().Item( pos+1 );
+        iter->user_data = parent->GetChildren().Item( pos+1 );
+    }
  
      return TRUE;
  }
  
  gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *parent )
  {
  
      return TRUE;
  }
  
  gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *parent )
  {
-    g_internal = this;
-    
-    wxDataViewItem item( (void*) parent->user_data );
-    
-    if (!m_wx_model->IsContainer( item ))
-        return FALSE;
-        
-    wxGtkTreeModelNode *parent_node = FindNode( parent );
-    BuildBranch( parent_node );
-    
-    if (parent_node->GetChildCount() == 0)
-        return FALSE;
-        
-    iter->stamp = m_gtk_model->stamp;
-    iter->user_data = (gpointer) parent_node->GetChildren().Item( 0 );
+    if (m_wx_model->IsVirtualListModel())
+    {
+        // this is a list, nodes have no children
+        if (parent)
+            return FALSE;
+
+        iter->stamp = m_gtk_model->stamp;
+        iter->user_data = (gpointer) 1;
+
+        return TRUE;
+    }
+    else
+    {
+        if (iter == NULL)
+        {
+            if (m_root->GetChildCount() == 0) return FALSE;
+            iter->stamp = m_gtk_model->stamp;
+            iter->user_data = (gpointer) m_root->GetChildren().Item( 0 );
+            return TRUE;
+        }
+
+
+        wxDataViewItem item;
+        if (parent)
+            item = wxDataViewItem( (void*) parent->user_data );
+
+        if (!m_wx_model->IsContainer( item ))
+            return FALSE;
+
+        wxGtkTreeModelNode *parent_node = FindNode( parent );
+        wxASSERT_MSG(parent_node,
+            "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel");
+
+        BuildBranch( parent_node );
+
+        if (parent_node->GetChildCount() == 0)
+            return FALSE;
+
+        iter->stamp = m_gtk_model->stamp;
+        iter->user_data = (gpointer) parent_node->GetChildren().Item( 0 );
+    }
  
      return TRUE;
  }
  
  gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter )
  {
  
      return TRUE;
  }
  
  gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter )
  {
-    g_internal = this;
-    
-    wxDataViewItem item( (void*) iter->user_data );
-    bool is_container = m_wx_model->IsContainer( item );
-    
-    if (!is_container)
+    if (m_wx_model->IsVirtualListModel())
+    {
+        wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model;
+
+        if (iter == NULL)
+            return (wx_model->GetCount() > 0);
+
+        // this is a list, nodes have no children
          return FALSE;
          return FALSE;
-    
-    wxGtkTreeModelNode *node = FindNode( iter );
-    BuildBranch( node );
-    
-    return (node->GetChildCount() > 0);
+    }
+    else
+    {
+        if (iter == NULL)
+            return (m_root->GetChildCount() > 0);
+
+        wxDataViewItem item( (void*) iter->user_data );
+
+        bool is_container = m_wx_model->IsContainer( item );
+
+        if (!is_container)
+            return FALSE;
+
+        wxGtkTreeModelNode *node = FindNode( iter );
+        wxASSERT_MSG(node,
+            "Did you forget a call to ItemAdded()? The iterator is unknown to the wxGtkTreeModel");
+
+        BuildBranch( node );
+
+        return (node->GetChildCount() > 0);
+    }
  }
  
  gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter )
  {
  }
  
  gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter )
  {
-    g_internal = this;
-    
-    wxDataViewItem item( (void*) iter->user_data );
-    
-    if (!m_wx_model->IsContainer( item ))
+    if (m_wx_model->IsVirtualListModel())
+    {
+        wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model;
+
+        if (iter == NULL)
+            return (gint) wx_model->GetCount();
+
          return 0;
          return 0;
-    
-    wxGtkTreeModelNode *parent_node = FindNode( iter );
-    BuildBranch( parent_node );
+    }
+    else
+    {
+        if (iter == NULL)
+            return m_root->GetChildCount();
  
  
-    // wxPrintf( "iter_n_children %d\n", parent_node->GetChildCount() );
-    
-    return parent_node->GetChildCount();
+        wxDataViewItem item( (void*) iter->user_data );
+
+        if (!m_wx_model->IsContainer( item ))
+            return 0;
+
+        wxGtkTreeModelNode *parent_node = FindNode( iter );
+        wxASSERT_MSG(parent_node,
+            "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel");
+
+        BuildBranch( parent_node );
+
+        return parent_node->GetChildCount();
+    }
  }
  
  gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n )
  {
  }
  
  gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n )
  {
-    g_internal = this;
-    
-    void* id = NULL;
-    if (parent) id = (void*) parent->user_data;
-    wxDataViewItem item( id );
-    
-    if (!m_wx_model->IsContainer( item ))
-        return FALSE;
-    
-    wxGtkTreeModelNode *parent_node = FindNode( parent );
-    BuildBranch( parent_node );
+    if (m_wx_model->IsVirtualListModel())
+    {
+        wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model;
  
  
-    // wxPrintf( "iter_nth_child %d\n", n );
-    
-    iter->stamp = m_gtk_model->stamp;
-    iter->user_data = parent_node->GetChildren().Item( n );
+        if (parent)
+            return FALSE;
  
  
-    return TRUE;
+        if (n < 0)
+            return FALSE;
+
+        if (n >= (gint) wx_model->GetCount())
+            return FALSE;
+
+        iter->stamp = m_gtk_model->stamp;
+        // user_data is just the index +1
+        iter->user_data = wxUIntToPtr(n+1);
+
+        return TRUE;
+    }
+    else
+    {
+        void* id = NULL;
+        if (parent) id = (void*) parent->user_data;
+        wxDataViewItem item( id );
+
+        if (!m_wx_model->IsContainer( item ))
+            return FALSE;
+
+        wxGtkTreeModelNode *parent_node = FindNode( parent );
+        wxASSERT_MSG(parent_node,
+            "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel");
+
+        BuildBranch( parent_node );
+
+        iter->stamp = m_gtk_model->stamp;
+        iter->user_data = parent_node->GetChildren().Item( n );
+
+        return TRUE;
+    }
  }
  
  gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *child )
  {
  }
  
  gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *child )
  {
-    g_internal = this;
-
-    wxGtkTreeModelNode *node = FindParentNode( child );
-    if (!node)
+    if (m_wx_model->IsVirtualListModel())
+    {
          return FALSE;
          return FALSE;
-    
-    iter->stamp = m_gtk_model->stamp;
-    iter->user_data = (gpointer) node->GetItem().GetID();
+    }
+    else
+    {
+        wxGtkTreeModelNode *node = FindParentNode( child );
+        if (!node)
+            return FALSE;
  
  
-    return TRUE;
+        iter->stamp = m_gtk_model->stamp;
+        iter->user_data = (gpointer) node->GetItem().GetID();
+
+        return TRUE;
+    }
  }
  }
-    
+
+// item can be deleted already in the model
+int wxDataViewCtrlInternal::GetIndexOf( const wxDataViewItem &parent, const wxDataViewItem &item )
+{
+    if (m_wx_model->IsVirtualListModel())
+    {
+        return wxPtrToUInt(item.GetID()) - 1;
+    }
+    else
+    {
+        wxGtkTreeModelNode *parent_node = FindNode( parent );
+        wxGtkTreeModelChildren &children = parent_node->GetChildren();
+        size_t j;
+        for (j = 0; j < children.GetCount(); j++)
+        {
+            if (children[j] == item.GetID())
+               return j;
+        }
+    }
+    return -1;
+}
+
+
  static wxGtkTreeModelNode*
  wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item )
  {
  static wxGtkTreeModelNode*
  wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item )
  {
@@ -2555,6 +4094,7 @@ wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *tr
      ItemList list;
      list.DeleteContents( true );
      wxDataViewItem it( item );
      ItemList list;
      list.DeleteContents( true );
      wxDataViewItem it( item );
+
      while( it.IsOk() )
      {
          wxDataViewItem * pItem = new wxDataViewItem( it );
      while( it.IsOk() )
      {
          wxDataViewItem * pItem = new wxDataViewItem( it );
@@ -2568,7 +4108,7 @@ wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *tr
          if( node && node->GetNodes().GetCount() != 0 )
          {
              int len = node->GetNodes().GetCount();
          if( node && node->GetNodes().GetCount() != 0 )
          {
              int len = node->GetNodes().GetCount();
-            wxGtkTreeModelNodes nodes = node->GetNodes();
+            wxGtkTreeModelNodes &nodes = node->GetNodes();
              int j = 0;
              for( ; j < len; j ++)
              {
              int j = 0;
              for( ; j < len; j ++)
              {
@@ -2576,7 +4116,7 @@ wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *tr
                  {
                      node = nodes[j];
                      break;
                  {
                      node = nodes[j];
                      break;
-                }    
+                }
              }
  
              if( j == len )
              }
  
              if( j == len )
@@ -2599,16 +4139,19 @@ wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( GtkTreeIter *iter )
      wxDataViewItem item( (void*) iter->user_data );
      if (!item.IsOk())
          return m_root;
      wxDataViewItem item( (void*) iter->user_data );
      if (!item.IsOk())
          return m_root;
-    
+
      wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item );
      wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item );
-    
+
+/*
      if (!result)
      {
      if (!result)
      {
-        wxPrintf( "Not found %d\n", (int) iter->user_data );
+        wxLogDebug( "Not found %p", iter->user_data );
          char *crash = NULL;
          *crash = 0;
      }
          char *crash = NULL;
          *crash = 0;
      }
-    
+    // TODO: remove this code
+*/
+
      return result;
  }
  
      return result;
  }
  
@@ -2618,14 +4161,17 @@ wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( const wxDataViewItem &item
          return m_root;
  
      wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item );
          return m_root;
  
      wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item );
-    
+
+/*
      if (!result)
      {
      if (!result)
      {
-        wxPrintf( "Not found %d\n", (int) item.GetID() );
+        wxLogDebug( "Not found %p", item.GetID() );
          char *crash = NULL;
          *crash = 0;
      }
          char *crash = NULL;
          *crash = 0;
      }
-    
+    // TODO: remove this code
+*/
+
      return result;
  }
  
      return result;
  }
  
@@ -2662,7 +4208,7 @@ wxDataViewCtrlInternal_FindParentNode( wxDataViewModel * model, wxGtkTreeModelNo
                  {
                      node = nodes[j];
                      break;
                  {
                      node = nodes[j];
                      break;
-                }    
+                }
              }
  
              if( j == len )
              }
  
              if( j == len )
@@ -2687,7 +4233,7 @@ wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( GtkTreeIter *iter )
  {
      if (!iter)
          return NULL;
  {
      if (!iter)
          return NULL;
-        
+
      wxDataViewItem item( (void*) iter->user_data );
      if (!item.IsOk())
          return NULL;
      wxDataViewItem item( (void*) iter->user_data );
      if (!item.IsOk())
          return NULL;
@@ -2708,46 +4254,91 @@ wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( const wxDataViewItem
  //-----------------------------------------------------------------------------
  
  static void
  //-----------------------------------------------------------------------------
  
  static void
-wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCtrl *dv )
+wxdataview_selection_changed_callback( GtkTreeSelection* WXUNUSED(selection), wxDataViewCtrl *dv )
  {
  {
-    if (!GTK_WIDGET_REALIZED(dv->m_widget))
+    if (!gtk_widget_get_realized(dv->m_widget))
          return;
  
          return;
  
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_SELECTED, dv->GetId() );
-    // TODO: item
+    wxDataViewEvent event( wxEVT_DATAVIEW_SELECTION_CHANGED, dv->GetId() );
+    event.SetItem( dv->GetSelection() );
      event.SetModel( dv->GetModel() );
      event.SetModel( dv->GetModel() );
-    dv->GetEventHandler()->ProcessEvent( event );
+    dv->HandleWindowEvent( event );
  }
  
  static void
  }
  
  static void
-wxdataview_row_activated_callback( GtkTreeView* treeview, GtkTreePath *path,
-                                   GtkTreeViewColumn *column, wxDataViewCtrl *dv )
+wxdataview_row_activated_callback( GtkTreeView* WXUNUSED(treeview), GtkTreePath *path,
+                                   GtkTreeViewColumn *WXUNUSED(column), wxDataViewCtrl *dv )
  {
  {
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, dv->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_ACTIVATED, dv->GetId() );
  
  
-    GtkTreeIter iter;
-    dv->GtkGetInternal()->get_iter( &iter, path );
-    wxDataViewItem item( (void*) iter.user_data );;
+    wxDataViewItem item(dv->GTKPathToItem(path));
      event.SetItem( item );
      event.SetModel( dv->GetModel() );
      event.SetItem( item );
      event.SetModel( dv->GetModel() );
-    dv->GetEventHandler()->ProcessEvent( event );
+    dv->HandleWindowEvent( event );
  }
  
  }
  
-//-----------------------------------------------------------------------------
-// wxDataViewCtrl
-//-----------------------------------------------------------------------------
+static gboolean
+wxdataview_test_expand_row_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
+                                     GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )
+{
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_EXPANDING, dv->GetId() );
+
+    wxDataViewItem item( (void*) iter->user_data );;
+    event.SetItem( item );
+    event.SetModel( dv->GetModel() );
+    dv->HandleWindowEvent( event );
+
+    return !event.IsAllowed();
+}
+
+static void
+wxdataview_row_expanded_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
+                                  GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )
+{
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_EXPANDED, dv->GetId() );
+
+    wxDataViewItem item( (void*) iter->user_data );;
+    event.SetItem( item );
+    event.SetModel( dv->GetModel() );
+    dv->HandleWindowEvent( event );
+}
+
+static gboolean
+wxdataview_test_collapse_row_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
+                                       GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )
+{
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_COLLAPSING, dv->GetId() );
+
+    wxDataViewItem item( (void*) iter->user_data );;
+    event.SetItem( item );
+    event.SetModel( dv->GetModel() );
+    dv->HandleWindowEvent( event );
+
+    return !event.IsAllowed();
+}
+
+static void
+wxdataview_row_collapsed_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
+                                   GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )
+{
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_COLLAPSED, dv->GetId() );
+
+    wxDataViewItem item( (void*) iter->user_data );;
+    event.SetItem( item );
+    event.SetModel( dv->GetModel() );
+    dv->HandleWindowEvent( event );
+}
  
  //-----------------------------------------------------------------------------
  
  //-----------------------------------------------------------------------------
-// InsertChild for wxDataViewCtrl
+    // wxDataViewCtrl
  //-----------------------------------------------------------------------------
  
  //-----------------------------------------------------------------------------
  
-static void wxInsertChildInDataViewCtrl( wxWindowGTK* parent, wxWindowGTK* child )
+void wxDataViewCtrl::AddChildGTK(wxWindowGTK* child)
  {
  {
-    wxDataViewCtrl * dvc = (wxDataViewCtrl*) parent;
-    GtkWidget *treeview = dvc->GtkGetTreeView();
+    GtkWidget* treeview = GtkGetTreeView();
  
      // Insert widget in GtkTreeView
  
      // Insert widget in GtkTreeView
-    if (GTK_WIDGET_REALIZED(treeview))
+    if (gtk_widget_get_realized(treeview))
          gtk_widget_set_parent_window( child->m_widget,
            gtk_tree_view_get_bin_window( GTK_TREE_VIEW(treeview) ) );
      gtk_widget_set_parent( child->m_widget, treeview );
          gtk_widget_set_parent_window( child->m_widget,
            gtk_tree_view_get_bin_window( GTK_TREE_VIEW(treeview) ) );
      gtk_widget_set_parent( child->m_widget, treeview );
@@ -2755,7 +4346,7 @@ static void wxInsertChildInDataViewCtrl( wxWindowGTK* parent, wxWindowGTK* child
  
  static
  void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget),
  
  static
  void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget),
-                                     GtkAllocation *alloc,
+                                     GtkAllocation *WXUNUSED(gtk_alloc),
                                       wxDataViewCtrl *win )
  {
      wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
                                       wxDataViewCtrl *win )
  {
      wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
@@ -2764,7 +4355,7 @@ void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget),
          wxWindow *child = node->GetData();
  
          GtkRequisition req;
          wxWindow *child = node->GetData();
  
          GtkRequisition req;
-        gtk_widget_size_request( child->m_widget, &req );
+        gtk_widget_get_preferred_size(child->m_widget, NULL, &req);
  
          GtkAllocation alloc;
          alloc.x = child->m_x;
  
          GtkAllocation alloc;
          alloc.x = child->m_x;
@@ -2778,55 +4369,154 @@ void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget),
  }
  
  
  }
  
  
+//-----------------------------------------------------------------------------
+// "motion_notify_event"
+//-----------------------------------------------------------------------------
+
+static gboolean
+gtk_dataview_motion_notify_callback( GtkWidget *WXUNUSED(widget),
+                                     GdkEventMotion *gdk_event,
+                                     wxDataViewCtrl *dv )
+{
+    int x = gdk_event->x;
+    int y = gdk_event->y;
+    if (gdk_event->is_hint)
+    {
+#ifdef __WXGTK3__
+        gdk_window_get_device_position(gdk_event->window, gdk_event->device, &x, &y, NULL);
+#else
+        gdk_window_get_pointer(gdk_event->window, &x, &y, NULL);
+#endif
+    }
+
+    wxGtkTreePath path;
+    GtkTreeViewColumn *column = NULL;
+    gint cell_x = 0;
+    gint cell_y = 0;
+    if (gtk_tree_view_get_path_at_pos(
+        GTK_TREE_VIEW(dv->GtkGetTreeView()),
+        x, y,
+        path.ByRef(),
+        &column,
+        &cell_x,
+        &cell_y))
+    {
+        if (path)
+        {
+            GtkTreeIter iter;
+            dv->GtkGetInternal()->get_iter( &iter, path );
+        }
+    }
+
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "button_press_event"
+//-----------------------------------------------------------------------------
+
+static gboolean
+gtk_dataview_button_press_callback( GtkWidget *WXUNUSED(widget),
+                                    GdkEventButton *gdk_event,
+                                    wxDataViewCtrl *dv )
+{
+    if ((gdk_event->button == 3) && (gdk_event->type == GDK_BUTTON_PRESS))
+    {
+        wxGtkTreePath path;
+        GtkTreeViewColumn *column = NULL;
+        gint cell_x = 0;
+        gint cell_y = 0;
+        gtk_tree_view_get_path_at_pos
+        (
+            GTK_TREE_VIEW(dv->GtkGetTreeView()),
+            (int) gdk_event->x, (int) gdk_event->y,
+            path.ByRef(),
+            &column,
+            &cell_x,
+            &cell_y
+        );
+
+        wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, dv->GetId() );
+        if (path)
+            event.SetItem(dv->GTKPathToItem(path));
+        event.SetModel( dv->GetModel() );
+        return dv->HandleWindowEvent( event );
+    }
+
+    return FALSE;
+}
  
  IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
  
  wxDataViewCtrl::~wxDataViewCtrl()
  {
  
  IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
  
  wxDataViewCtrl::~wxDataViewCtrl()
  {
-    if (m_notifier)
-        GetModel()->RemoveNotifier( m_notifier );
+    // Stop editing before destroying the control to remove any event handlers
+    // which are added when editing started: if we didn't do this, the base
+    // class dtor would assert as it checks for any leftover handlers.
+    if ( m_treeview )
+    {
+        GtkTreeViewColumn *col;
+        gtk_tree_view_get_cursor(GTK_TREE_VIEW(m_treeview), NULL, &col);
+
+        wxDataViewColumn * const wxcol = FromGTKColumn(col);
+        if ( wxcol )
+        {
+            // This won't do anything if we're not editing it
+            wxcol->GetRenderer()->CancelEditing();
+        }
+
+        GTKDisconnect(m_treeview);
+        GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(m_treeview));
+        if (selection)
+            GTKDisconnect(selection);
+    }
+
+    m_cols.Clear();
  
  
-    // remove the model from the GtkTreeView before it gets destroyed by the
-    // wxDataViewCtrlBase's dtor
-    gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), NULL );
-    
      delete m_internal;
  }
  
  void wxDataViewCtrl::Init()
  {
      delete m_internal;
  }
  
  void wxDataViewCtrl::Init()
  {
-    m_notifier = NULL;
+    m_treeview = NULL;
+    m_internal = NULL;
+
+    m_cols.DeleteContents( true );
+
+    m_uniformRowHeight = -1;
  }
  
  }
  
-bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos, const wxSize& size,
-           long style, const wxValidator& validator )
+bool wxDataViewCtrl::Create(wxWindow *parent,
+                            wxWindowID id,
+                            const wxPoint& pos,
+                            const wxSize& size,
+                            long style,
+                            const wxValidator& validator,
+                            const wxString& name)
  {
  {
-    Init();
-
      if (!PreCreation( parent, pos, size ) ||
      if (!PreCreation( parent, pos, size ) ||
-        !CreateBase( parent, id, pos, size, style, validator ))
+        !CreateBase( parent, id, pos, size, style, validator, name ))
      {
          wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") );
          return false;
      }
  
      {
          wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") );
          return false;
      }
  
-    m_insertCallback = wxInsertChildInDataViewCtrl;
-
      m_widget = gtk_scrolled_window_new (NULL, NULL);
      m_widget = gtk_scrolled_window_new (NULL, NULL);
+    g_object_ref(m_widget);
  
  
-    GtkScrolledWindowSetBorder(m_widget, style);
+    GTKScrolledWindowSetBorder(m_widget, style);
  
      m_treeview = gtk_tree_view_new();
      gtk_container_add (GTK_CONTAINER (m_widget), m_treeview);
  
  
      m_treeview = gtk_tree_view_new();
      gtk_container_add (GTK_CONTAINER (m_widget), m_treeview);
  
+    m_focusWidget = GTK_WIDGET(m_treeview);
+
      g_signal_connect (m_treeview, "size_allocate",
                       G_CALLBACK (gtk_dataviewctrl_size_callback), this);
  
      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
+    bool fixed = (style & wxDV_VARIABLE_LINE_HEIGHT) == 0;
+    gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed );
  
      if (style & wxDV_MULTIPLE)
      {
  
      if (style & wxDV_MULTIPLE)
      {
@@ -2837,7 +4527,9 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
      gtk_tree_view_set_headers_visible( GTK_TREE_VIEW(m_treeview), (style & wxDV_NO_HEADER) == 0 );
  
  #ifdef __WXGTK210__
      gtk_tree_view_set_headers_visible( GTK_TREE_VIEW(m_treeview), (style & wxDV_NO_HEADER) == 0 );
  
  #ifdef __WXGTK210__
+#ifndef __WXGTK3__
      if (!gtk_check_version(2,10,0))
      if (!gtk_check_version(2,10,0))
+#endif
      {
          GtkTreeViewGridLines grid = GTK_TREE_VIEW_GRID_LINES_NONE;
  
      {
          GtkTreeViewGridLines grid = GTK_TREE_VIEW_GRID_LINES_NONE;
  
@@ -2849,16 +4541,15 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
          else if (style & wxDV_HORIZ_RULES)
              grid = GTK_TREE_VIEW_GRID_LINES_HORIZONTAL;
  
          else if (style & wxDV_HORIZ_RULES)
              grid = GTK_TREE_VIEW_GRID_LINES_HORIZONTAL;
  
-        gtk_tree_view_set_grid_lines( GTK_TREE_VIEW(m_treeview), grid );
+        if (grid != GTK_TREE_VIEW_GRID_LINES_NONE)
+            gtk_tree_view_set_grid_lines( GTK_TREE_VIEW(m_treeview), grid );
      }
      }
-    else
  #endif
  #endif
-    {
-        gtk_tree_view_set_rules_hint( GTK_TREE_VIEW(m_treeview), (style & wxDV_HORIZ_RULES) != 0 );
-    }
+
+    gtk_tree_view_set_rules_hint( GTK_TREE_VIEW(m_treeview), (style & wxDV_ROW_LINES) != 0 );
  
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget),
  
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget),
-        GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
      gtk_widget_show (m_treeview);
  
      m_parent->DoAddChild( this );
      gtk_widget_show (m_treeview);
  
      m_parent->DoAddChild( this );
@@ -2867,16 +4558,44 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
  
      GtkEnableSelectionEvents();
  
  
      GtkEnableSelectionEvents();
  
-    g_signal_connect_after (m_treeview, "row_activated",
+    g_signal_connect_after (m_treeview, "row-activated",
                              G_CALLBACK (wxdataview_row_activated_callback), this);
  
                              G_CALLBACK (wxdataview_row_activated_callback), this);
  
+    g_signal_connect (m_treeview, "test-collapse-row",
+                            G_CALLBACK (wxdataview_test_collapse_row_callback), this);
+
+    g_signal_connect_after (m_treeview, "row-collapsed",
+                            G_CALLBACK (wxdataview_row_collapsed_callback), this);
+
+    g_signal_connect (m_treeview, "test-expand-row",
+                            G_CALLBACK (wxdataview_test_expand_row_callback), this);
+
+    g_signal_connect_after (m_treeview, "row-expanded",
+                            G_CALLBACK (wxdataview_row_expanded_callback), this);
+
+    g_signal_connect (m_treeview, "motion_notify_event",
+                      G_CALLBACK (gtk_dataview_motion_notify_callback), this);
+
+    g_signal_connect (m_treeview, "button_press_event",
+                      G_CALLBACK (gtk_dataview_button_press_callback), this);
+
      return true;
  }
  
      return true;
  }
  
+wxDataViewItem wxDataViewCtrl::GTKPathToItem(GtkTreePath *path) const
+{
+    GtkTreeIter iter;
+    return wxDataViewItem(path && m_internal->get_iter(&iter, path)
+                            ? iter.user_data
+                            : NULL);
+}
+
  void wxDataViewCtrl::OnInternalIdle()
  {
      wxWindow::OnInternalIdle();
  
  void wxDataViewCtrl::OnInternalIdle()
  {
      wxWindow::OnInternalIdle();
  
+    m_internal->OnInternalIdle();
+
      unsigned int cols = GetColumnCount();
      unsigned int i;
      for (i = 0; i < cols; i++)
      unsigned int cols = GetColumnCount();
      unsigned int i;
      for (i = 0; i < cols; i++)
@@ -2884,27 +4603,41 @@ void wxDataViewCtrl::OnInternalIdle()
          wxDataViewColumn *col = GetColumn( i );
          col->OnInternalIdle();
      }
          wxDataViewColumn *col = GetColumn( i );
          col->OnInternalIdle();
      }
+
+    if (m_ensureVisibleDefered.IsOk())
+    {
+        ExpandAncestors(m_ensureVisibleDefered);
+        GtkTreeIter iter;
+        iter.user_data = (gpointer) m_ensureVisibleDefered.GetID();
+        wxGtkTreePath path(m_internal->get_path( &iter ));
+        gtk_tree_view_scroll_to_cell( GTK_TREE_VIEW(m_treeview), path, NULL, false, 0.0, 0.0 );
+        m_ensureVisibleDefered = wxDataViewItem(0);
+    }
  }
  
  bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
  {
  }
  
  bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
  {
+    wxDELETE(m_internal);
+
      if (!wxDataViewCtrlBase::AssociateModel( model ))
          return false;
  
      if (!wxDataViewCtrlBase::AssociateModel( model ))
          return false;
  
-    GtkWxTreeModel *gtk_model = wxgtk_tree_model_new();
-    m_internal = new wxDataViewCtrlInternal( this, model, gtk_model );
-    gtk_model->internal = m_internal;
+    bool fixed = (((GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) == 0) || (model->IsVirtualListModel()));
+    gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed );
  
  
-    m_notifier = new wxGtkDataViewModelNotifier( gtk_model, model, this );
+    m_internal = new wxDataViewCtrlInternal( this, model );
  
  
-    model->AddNotifier( m_notifier );
+    return true;
+}
  
  
-    gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_model) );
-    
-    // unref in wxDataViewCtrlInternal
-    // g_object_unref( gtk_model );
+bool wxDataViewCtrl::EnableDragSource( const wxDataFormat &format )
+{
+    return m_internal->EnableDragSource( format );
+}
  
  
-    return true;
+bool wxDataViewCtrl::EnableDropTarget( const wxDataFormat &format )
+{
+    return m_internal->EnableDropTarget( format );
  }
  
  bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
  }
  
  bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
@@ -2912,35 +4645,440 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
      if (!wxDataViewCtrlBase::AppendColumn(col))
          return false;
  
      if (!wxDataViewCtrlBase::AppendColumn(col))
          return false;
  
-    GtkTreeViewColumn *column = (GtkTreeViewColumn *)col->GetGtkHandle();
+    m_cols.Append( col );
+
+    if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
+           GTK_TREE_VIEW_COLUMN_FIXED)
+    {
+        gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
+    }
+
+    gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview),
+                                 GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) );
+
+    return true;
+}
+
+bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
+{
+    if (!wxDataViewCtrlBase::PrependColumn(col))
+        return false;
+
+    m_cols.Insert( col );
+
+    if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
+           GTK_TREE_VIEW_COLUMN_FIXED)
+    {
+        gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
+    }
+
+    gtk_tree_view_insert_column( GTK_TREE_VIEW(m_treeview),
+                                 GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()), 0 );
+
+    return true;
+}
+
+bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col )
+{
+    if (!wxDataViewCtrlBase::InsertColumn(pos,col))
+        return false;
+
+    m_cols.Insert( pos, col );
  
  
-    gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), column );
+    if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
+           GTK_TREE_VIEW_COLUMN_FIXED)
+    {
+        gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
+    }
+
+    gtk_tree_view_insert_column( GTK_TREE_VIEW(m_treeview),
+                                 GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()), pos );
+
+    return true;
+}
+
+unsigned int wxDataViewCtrl::GetColumnCount() const
+{
+    return m_cols.GetCount();
+}
+
+wxDataViewColumn* wxDataViewCtrl::FromGTKColumn(GtkTreeViewColumn *gtk_col) const
+{
+    if ( !gtk_col )
+        return NULL;
+
+    wxDataViewColumnList::const_iterator iter;
+    for (iter = m_cols.begin(); iter != m_cols.end(); ++iter)
+    {
+        wxDataViewColumn *col = *iter;
+        if (GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) == gtk_col)
+        {
+            return col;
+        }
+    }
+
+    wxFAIL_MSG( "No matching column?" );
+
+    return NULL;
+}
+
+wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
+{
+    GtkTreeViewColumn *gtk_col = gtk_tree_view_get_column( GTK_TREE_VIEW(m_treeview), pos );
+
+    return FromGTKColumn(gtk_col);
+}
+
+bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
+{
+    gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview),
+                                 GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()) );
+
+    m_cols.DeleteObject( column );
+
+    return true;
+}
+
+bool wxDataViewCtrl::ClearColumns()
+{
+    wxDataViewColumnList::iterator iter;
+    for (iter = m_cols.begin(); iter != m_cols.end(); ++iter)
+    {
+        wxDataViewColumn *col = *iter;
+        gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview),
+                                     GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) );
+    }
+
+    m_cols.Clear();
  
      return true;
  }
  
  
      return true;
  }
  
-wxDataViewItem wxDataViewCtrl::GetSelection()
+int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
+{
+    GtkTreeViewColumn *gtk_column = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle());
+
+    wxGtkList list(gtk_tree_view_get_columns(GTK_TREE_VIEW(m_treeview)));
+
+    return g_list_index( list, (gconstpointer)  gtk_column );
+}
+
+wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
+{
+    return m_internal->GetDataViewSortColumn();
+}
+
+void wxDataViewCtrl::Expand( const wxDataViewItem & item )
+{
+    GtkTreeIter iter;
+    iter.user_data = item.GetID();
+    wxGtkTreePath path(m_internal->get_path( &iter ));
+    gtk_tree_view_expand_row( GTK_TREE_VIEW(m_treeview), path, false );
+}
+
+void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
+{
+    GtkTreeIter iter;
+    iter.user_data = item.GetID();
+    wxGtkTreePath path(m_internal->get_path( &iter ));
+    gtk_tree_view_collapse_row( GTK_TREE_VIEW(m_treeview), path );
+}
+
+bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
+{
+    GtkTreeIter iter;
+    iter.user_data = item.GetID();
+    wxGtkTreePath path(m_internal->get_path( &iter ));
+    return gtk_tree_view_row_expanded( GTK_TREE_VIEW(m_treeview), path ) != 0;
+}
+
+wxDataViewItem wxDataViewCtrl::DoGetCurrentItem() const
+{
+    // The tree doesn't have any current item if it hadn't been created yet but
+    // it's arguably not an error to call this function in this case so just
+    // return an invalid item without asserting.
+    if ( !m_treeview )
+        return wxDataViewItem();
+
+    wxGtkTreePath path;
+    gtk_tree_view_get_cursor(GTK_TREE_VIEW(m_treeview), path.ByRef(), NULL);
+
+    return GTKPathToItem(path);
+}
+
+void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item)
+{
+    wxCHECK_RET( m_treeview,
+                 "Current item can't be set before creating the control." );
+
+    // We need to make sure the model knows about this item or the path would
+    // be invalid and gtk_tree_view_set_cursor() would silently do nothing.
+    ExpandAncestors(item);
+
+    // We also need to preserve the existing selection from changing.
+    // Unfortunately the only way to do it seems to use our own selection
+    // function and forbid any selection changes during set cursor call.
+    wxGtkTreeSelectionLock
+        lock(gtk_tree_view_get_selection(GTK_TREE_VIEW(m_treeview)));
+
+    // Do move the cursor now.
+    GtkTreeIter iter;
+    iter.user_data = item.GetID();
+    wxGtkTreePath path(m_internal->get_path( &iter ));
+
+    gtk_tree_view_set_cursor(GTK_TREE_VIEW(m_treeview), path, NULL, FALSE);
+}
+
+wxDataViewColumn *wxDataViewCtrl::GetCurrentColumn() const
+{
+    // The tree doesn't have any current item if it hadn't been created yet but
+    // it's arguably not an error to call this function in this case so just
+    // return NULL without asserting.
+    if ( !m_treeview )
+        return NULL;
+
+    GtkTreeViewColumn *col;
+    gtk_tree_view_get_cursor(GTK_TREE_VIEW(m_treeview), NULL, &col);
+    return FromGTKColumn(col);
+}
+
+void wxDataViewCtrl::EditItem(const wxDataViewItem& item, const wxDataViewColumn *column)
+{
+    wxCHECK_RET( m_treeview,
+                 "Current item can't be set before creating the control." );
+    wxCHECK_RET( item.IsOk(), "invalid item" );
+    wxCHECK_RET( column, "no column provided" );
+
+    // We need to make sure the model knows about this item or the path would
+    // be invalid and gtk_tree_view_set_cursor() would silently do nothing.
+    ExpandAncestors(item);
+
+    GtkTreeViewColumn *gcolumn = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle());
+
+    // We also need to preserve the existing selection from changing.
+    // Unfortunately the only way to do it seems to use our own selection
+    // function and forbid any selection changes during set cursor call.
+    wxGtkTreeSelectionLock
+        lock(gtk_tree_view_get_selection(GTK_TREE_VIEW(m_treeview)));
+
+    // Do move the cursor now.
+    GtkTreeIter iter;
+    iter.user_data = item.GetID();
+    wxGtkTreePath path(m_internal->get_path( &iter ));
+
+    gtk_tree_view_set_cursor(GTK_TREE_VIEW(m_treeview), path, gcolumn, TRUE);
+}
+
+int wxDataViewCtrl::GetSelectedItemsCount() const
  {
      GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
  {
      GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
-    
-    if (m_windowStyle & wxDV_MULTIPLE)
+
+    return gtk_tree_selection_count_selected_rows(selection);
+}
+
+int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const
+{
+    sel.Clear();
+
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+    if (HasFlag(wxDV_MULTIPLE))
      {
      {
+        GtkTreeModel *model;
+        wxGtkTreePathList list(gtk_tree_selection_get_selected_rows(selection, &model));
+
+        for ( GList* current = list; current; current = g_list_next(current) )
+        {
+            GtkTreePath *path = (GtkTreePath*) current->data;
+
+            sel.Add(GTKPathToItem(path));
+        }
      }
      else
      {
          GtkTreeIter iter;
          if (gtk_tree_selection_get_selected( selection, NULL, &iter ))
          {
      }
      else
      {
          GtkTreeIter iter;
          if (gtk_tree_selection_get_selected( selection, NULL, &iter ))
          {
-            wxDataViewItem item( (void*) iter.user_data );
-            return item;
+            sel.Add( wxDataViewItem(iter.user_data) );
+        }
+    }
+
+    return sel.size();
+}
+
+void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
+{
+    GtkDisableSelectionEvents();
+
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+
+    gtk_tree_selection_unselect_all( selection );
+
+    wxDataViewItem last_parent;
+
+    size_t i;
+    for (i = 0; i < sel.GetCount(); i++)
+    {
+        wxDataViewItem item = sel[i];
+        wxDataViewItem parent = GetModel()->GetParent( item );
+        if (parent)
+        {
+            if (parent != last_parent)
+                ExpandAncestors(item);
          }
          }
+        last_parent = parent;
+
+        GtkTreeIter iter;
+        iter.stamp = m_internal->GetGtkModel()->stamp;
+        iter.user_data = (gpointer) item.GetID();
+        gtk_tree_selection_select_iter( selection, &iter );
      }
      }
+
+    GtkEnableSelectionEvents();
+}
+
+void wxDataViewCtrl::Select( const wxDataViewItem & item )
+{
+    ExpandAncestors(item);
+
+    GtkDisableSelectionEvents();
+
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+
+    GtkTreeIter iter;
+    iter.stamp = m_internal->GetGtkModel()->stamp;
+    iter.user_data = (gpointer) item.GetID();
+    gtk_tree_selection_select_iter( selection, &iter );
+
+    GtkEnableSelectionEvents();
+}
+
+void wxDataViewCtrl::Unselect( const wxDataViewItem & item )
+{
+    GtkDisableSelectionEvents();
+
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+
+    GtkTreeIter iter;
+    iter.stamp = m_internal->GetGtkModel()->stamp;
+    iter.user_data = (gpointer) item.GetID();
+    gtk_tree_selection_unselect_iter( selection, &iter );
+
+    GtkEnableSelectionEvents();
+}
+
+bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const
+{
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+
+    GtkTreeIter iter;
+    iter.stamp = m_internal->GetGtkModel()->stamp;
+    iter.user_data = (gpointer) item.GetID();
+
+    return gtk_tree_selection_iter_is_selected( selection, &iter ) != 0;
+}
+
+void wxDataViewCtrl::SelectAll()
+{
+    GtkDisableSelectionEvents();
+
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+
+    gtk_tree_selection_select_all( selection );
+
+    GtkEnableSelectionEvents();
+}
+
+void wxDataViewCtrl::UnselectAll()
+{
+    GtkDisableSelectionEvents();
+
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+
+    gtk_tree_selection_unselect_all( selection );
+
+    GtkEnableSelectionEvents();
+}
+
+void wxDataViewCtrl::EnsureVisible(const wxDataViewItem& item,
+                                   const wxDataViewColumn *WXUNUSED(column))
+{
+    m_ensureVisibleDefered = item;
+    ExpandAncestors(item);
+
+    GtkTreeIter iter;
+    iter.user_data = (gpointer) item.GetID();
+    wxGtkTreePath path(m_internal->get_path( &iter ));
+    gtk_tree_view_scroll_to_cell( GTK_TREE_VIEW(m_treeview), path, NULL, false, 0.0, 0.0 );
+}
+
+void wxDataViewCtrl::HitTest(const wxPoint& point,
+                             wxDataViewItem& item,
+                             wxDataViewColumn *& column) const
+{
+    // gtk_tree_view_get_dest_row_at_pos() is the right one. But it does not tell the column.
+    // gtk_tree_view_get_path_at_pos() is the wrong function. It doesn't mind the header but returns column.
+    // See http://mail.gnome.org/archives/gtkmm-list/2005-January/msg00080.html
+    // So we have to use both of them.
+    item = wxDataViewItem(0);
+    column = NULL;
+    wxGtkTreePath path, pathScratch;
+    GtkTreeViewColumn* GtkColumn = NULL;
+    GtkTreeViewDropPosition pos = GTK_TREE_VIEW_DROP_INTO_OR_AFTER;
+    gint cell_x = 0;
+    gint cell_y = 0;
+    
+    // cannot directly call GtkGetTreeView(), HitTest is const and so is this pointer
+    wxDataViewCtrl* self = const_cast<wxDataViewCtrl *>(this); // ugly workaround, self is NOT const
+    GtkTreeView* treeView = GTK_TREE_VIEW(self->GtkGetTreeView());
      
      
-    return wxDataViewItem(0);
+    // is there possibly a better suited function to get the column?
+    gtk_tree_view_get_path_at_pos(                // and this is the wrong call but it delivers the column
+      treeView,
+      (int) point.x, (int) point.y,
+      pathScratch.ByRef(),
+      &GtkColumn,                                 // here we get the GtkColumn
+      &cell_x,
+      &cell_y );
+      
+    if ( GtkColumn != NULL )
+    {                                             
+        // we got GTK column
+        // the right call now which takes the header into account
+        gtk_tree_view_get_dest_row_at_pos( treeView, (int) point.x, (int) point.y, path.ByRef(), &pos);
+          
+        if (path)
+            item = wxDataViewItem(GTKPathToItem(path));
+        // else we got a GTK column but the position is not over an item, e.g. below last item
+        for ( unsigned int i=0, cols=GetColumnCount(); i<cols; ++i )  // search the wx column
+        {
+            wxDataViewColumn* col = GetColumn(i);
+            if ( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) == GtkColumn )
+            {
+                column = col;                      // here we get the wx column
+                break;
+            }
+        }
+    }
+    // else no column and thus no item, both null
+}
+
+wxRect
+wxDataViewCtrl::GetItemRect(const wxDataViewItem& WXUNUSED(item),
+                            const wxDataViewColumn *WXUNUSED(column)) const
+{
+    return wxRect();
+}
+
+bool wxDataViewCtrl::SetRowHeight(int rowHeight)
+{
+    m_uniformRowHeight = rowHeight;
+    return true;
  }
  
  void wxDataViewCtrl::DoSetExpanderColumn()
  {
  }
  
  void wxDataViewCtrl::DoSetExpanderColumn()
  {
+    gtk_tree_view_set_expander_column( GTK_TREE_VIEW(m_treeview),
+        GTK_TREE_VIEW_COLUMN( GetExpanderColumn()->GetGtkHandle() ) );
  }
  
  void wxDataViewCtrl::DoSetIndent()
  }
  
  void wxDataViewCtrl::DoSetIndent()
@@ -2950,27 +5088,34 @@ void wxDataViewCtrl::DoSetIndent()
  void wxDataViewCtrl::GtkDisableSelectionEvents()
  {
      GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
  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);
+    g_signal_handlers_disconnect_by_func( selection,
+                            (gpointer) (wxdataview_selection_changed_callback), this);
  }
  
  void wxDataViewCtrl::GtkEnableSelectionEvents()
  {
      GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
  }
  
  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);
+    g_signal_connect_after (selection, "changed",
+                            G_CALLBACK (wxdataview_selection_changed_callback), this);
  }
  
  }
  
+// ----------------------------------------------------------------------------
+// visual attributes stuff
+// ----------------------------------------------------------------------------
+
  // static
  wxVisualAttributes
  wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
  {
  // static
  wxVisualAttributes
  wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
  {
-    return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new());
  }
  
  }
  
+void wxDataViewCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+    wxDataViewCtrlBase::DoApplyWidgetStyle(style);
+    GTKApplyStyle(m_treeview, style);
+}
  
  
-#endif
-    // !wxUSE_GENERICDATAVIEWCTRL
+#endif // !wxUSE_GENERICDATAVIEWCTRL
  
  
-#endif
-    // wxUSE_DATAVIEWCTRL
+#endif // wxUSE_DATAVIEWCTRL