pure CF code

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

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index cd82fc102cd7095c1470b6889c9b2cf3bbc0ea8f..dcaa4c1af9b99b430796975ec3a898fdfa5a30c8 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -20,25 +20,21 @@
     #include "wx/log.h"
     #include "wx/dcclient.h"
     #include "wx/sizer.h"
     #include "wx/log.h"
     #include "wx/dcclient.h"
     #include "wx/sizer.h"

+    #include "wx/icon.h"
+    #include "wx/list.h"
+    #include "wx/settings.h"
+    #include "wx/dataobj.h"
+    #include "wx/crt.h"

 #endif
 
 #include "wx/stockitem.h"
 #include "wx/calctrl.h"
 #include "wx/popupwin.h"
 #endif
 
 #include "wx/stockitem.h"
 #include "wx/calctrl.h"
 #include "wx/popupwin.h"

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

 #include "wx/listimpl.cpp"
 
 #include "wx/listimpl.cpp"
 

-

 #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/dc.h"
+#include "wx/gtk/dcclient.h"

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


@@ -58,14 +54,16 @@ typedef struct _GtkWxTreeModel       GtkWxTreeModel;
 //-----------------------------------------------------------------------------
 
 WX_DECLARE_LIST(wxDataViewItem, ItemList);
 //-----------------------------------------------------------------------------
 
 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, GtkWxTreeModel *gtk_model );

     ~wxDataViewCtrlInternal();
     ~wxDataViewCtrlInternal();

-    
+
+    // model iface
+    GtkTreeModelFlags get_flags();

     gboolean get_iter( GtkTreeIter *iter, GtkTreePath *path );
     GtkTreePath *get_path( GtkTreeIter *iter);
     gboolean iter_next( GtkTreeIter *iter );
     gboolean get_iter( GtkTreeIter *iter, GtkTreePath *path );
     GtkTreePath *get_path( GtkTreeIter *iter);
     gboolean iter_next( GtkTreeIter *iter );


@@ -74,30 +72,42 @@ public:
     gint iter_n_children( GtkTreeIter *iter );
     gboolean iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n );
     gboolean iter_parent( GtkTreeIter *iter, GtkTreeIter *child );
     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
+    gboolean row_draggable( GtkTreeDragSource *drag_source, GtkTreePath *path );
+    gboolean drag_data_delete( GtkTreeDragSource *drag_source, GtkTreePath* path );
+    gboolean drag_data_get( GtkTreeDragSource *drag_source, GtkTreePath *path,
+        GtkSelectionData *selection_data );
+    gboolean drag_data_received( GtkTreeDragDest *drag_dest, GtkTreePath *dest,
+        GtkSelectionData *selection_data );
+    gboolean row_drop_possible( GtkTreeDragDest *drag_dest, GtkTreePath *dest_path,
+        GtkSelectionData *selection_data );
+
+    // notifactions from wxDataViewModel

     bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
     bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
     bool ItemChanged( const wxDataViewItem &item );
     bool ValueChanged( const wxDataViewItem &item, unsigned int col );
     bool Cleared();
     void Resort();
     bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
     bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
     bool ItemChanged( const wxDataViewItem &item );
     bool ValueChanged( const wxDataViewItem &item, unsigned int col );
     bool Cleared();
     void Resort();

-    
+
+    // sorting interface

     void SetSortOrder( GtkSortType sort_order ) { m_sort_order = sort_order; }
     GtkSortType GetSortOrder()                  { return m_sort_order; }
 
     void SetSortColumn( int column )            { m_sort_column = column; }
     int GetSortColumn()                         { return m_sort_column; }
     void SetSortOrder( GtkSortType sort_order ) { m_sort_order = sort_order; }
     GtkSortType GetSortOrder()                  { return m_sort_order; }
 
     void SetSortColumn( int column )            { m_sort_column = column; }
     int GetSortColumn()                         { return m_sort_column; }

-    
+

     void SetDataViewSortColumn( wxDataViewColumn *column ) { m_dataview_sort_column = column; }
     wxDataViewColumn *GetDataViewSortColumn()   { return m_dataview_sort_column; }
     void SetDataViewSortColumn( wxDataViewColumn *column ) { m_dataview_sort_column = column; }
     wxDataViewColumn *GetDataViewSortColumn()   { return m_dataview_sort_column; }

-    
+

     bool IsSorted()                             { return (m_sort_column >= 0); }
     bool IsSorted()                             { return (m_sort_column >= 0); }

-    
-    
+
+    // accessors
+    wxDataViewModel* GetDataViewModel() { return m_wx_model; }
+    wxDataViewCtrl* GetOwner()          { return m_owner; }
+    GtkWxTreeModel* GetGtkModel()       { return m_gtk_model; }
+

 protected:
     void InitTree();
     wxGtkTreeModelNode *FindNode( const wxDataViewItem &item );
 protected:
     void InitTree();
     wxGtkTreeModelNode *FindNode( const wxDataViewItem &item );


@@ -105,7 +115,7 @@ protected:
     wxGtkTreeModelNode *FindParentNode( const wxDataViewItem &item );
     wxGtkTreeModelNode *FindParentNode( GtkTreeIter *iter );
     void BuildBranch( wxGtkTreeModelNode *branch );
     wxGtkTreeModelNode *FindParentNode( const wxDataViewItem &item );
     wxGtkTreeModelNode *FindParentNode( GtkTreeIter *iter );
     void BuildBranch( wxGtkTreeModelNode *branch );

-    
+

 private:
     wxGtkTreeModelNode   *m_root;
     wxDataViewModel      *m_wx_model;
 private:
     wxGtkTreeModelNode   *m_root;
     wxDataViewModel      *m_wx_model;


@@ -123,9 +133,9 @@ private:
 
 int LINKAGEMODE wxGtkTreeModelChildCmp( void** id1, void** id2 )
 {
 
 int LINKAGEMODE wxGtkTreeModelChildCmp( void** id1, void** id2 )
 {

-    int ret = g_internal->GetDataViewModel()->Compare( *id1, *id2, 
+    int ret = g_internal->GetDataViewModel()->Compare( *id1, *id2,

         g_internal->GetSortColumn(), (g_internal->GetSortOrder() == GTK_SORT_ASCENDING) );
         g_internal->GetSortColumn(), (g_internal->GetSortOrder() == GTK_SORT_ASCENDING) );

-        
+

     return ret;
 }
 
     return ret;
 }
 


@@ -137,15 +147,15 @@ class wxGtkTreeModelNode
 public:
     wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item,
       wxDataViewCtrlInternal *internal )
 public:
     wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item,
       wxDataViewCtrlInternal *internal )

-    { 
-        m_parent = parent; 
+    {
+        m_parent = parent;

         m_item = item;
         m_internal = internal;
     }
         m_item = item;
         m_internal = internal;
     }

-    
+

     ~wxGtkTreeModelNode()
     ~wxGtkTreeModelNode()

-    { 
-        size_t count = m_children.GetCount();
+    {
+        size_t count = m_nodes.GetCount();

         size_t i;
         for (i = 0; i < count; i++)
         {
         size_t i;
         for (i = 0; i < count; i++)
         {


@@ -154,12 +164,12 @@ public:
         }
     }
 
         }
     }
 

-    unsigned int AddNode( wxGtkTreeModelNode* child ) 
-        { 
+    unsigned int AddNode( wxGtkTreeModelNode* child )
+        {

             m_nodes.Add( child );
             m_nodes.Add( child );

-            
+

             void *id = child->GetItem().GetID();
             void *id = child->GetItem().GetID();

-            
+

             m_children.Add( id );
 
             if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare())
             m_children.Add( id );
 
             if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare())


@@ -171,7 +181,7 @@ public:
 
             return m_children.GetCount()-1;
         }
 
             return m_children.GetCount()-1;
         }

-        
+

     unsigned int AddLeave( void* id )
         {
             m_children.Add( id );
     unsigned int AddLeave( void* id )
         {
             m_children.Add( id );


@@ -185,15 +195,15 @@ public:
 
             return m_children.GetCount()-1;
         }
 
             return m_children.GetCount()-1;
         }

-        
+

     void DeleteChild( void* id )
         {
             m_children.Remove( id );
     void DeleteChild( void* id )
         {
             m_children.Remove( id );

-            
+

             unsigned int count = m_nodes.GetCount();
             unsigned int pos;
             for (pos = 0; pos < count; pos++)
             unsigned int count = m_nodes.GetCount();
             unsigned int pos;
             for (pos = 0; pos < count; pos++)

-            {   
+            {

                 wxGtkTreeModelNode *node = m_nodes.Item( pos );
                 if (node->GetItem().GetID() == id)
                 {
                 wxGtkTreeModelNode *node = m_nodes.Item( pos );
                 if (node->GetItem().GetID() == id)
                 {


@@ -202,29 +212,29 @@ public:
                     break;
                 }
             }
                     break;
                 }
             }

-            
+

         }
         }

-        
-    wxGtkTreeModelNode* GetParent() 
+
+    wxGtkTreeModelNode* GetParent()

         { return m_parent; }
         { return m_parent; }

-    wxGtkTreeModelNodes &GetNodes() 
+    wxGtkTreeModelNodes &GetNodes()

         { return m_nodes; }
         { return m_nodes; }

-    wxGtkTreeModelChildren &GetChildren() 
+    wxGtkTreeModelChildren &GetChildren()

         { return m_children; }
         { return m_children; }

-        
+

     unsigned int GetChildCount() { return m_children.GetCount(); }
     unsigned int GetNodesCount() { return m_nodes.GetCount(); }
 
     wxDataViewItem &GetItem() { return m_item; }
     wxDataViewCtrlInternal *GetInternal() { return m_internal; }
     unsigned int GetChildCount() { return m_children.GetCount(); }
     unsigned int GetNodesCount() { return m_nodes.GetCount(); }
 
     wxDataViewItem &GetItem() { return m_item; }
     wxDataViewCtrlInternal *GetInternal() { return m_internal; }

-    
+

     void Resort();
     void Resort();

-    
+

 private:
     wxGtkTreeModelNode         *m_parent;
     wxGtkTreeModelNodes         m_nodes;
     wxGtkTreeModelChildren      m_children;
 private:
     wxGtkTreeModelNode         *m_parent;
     wxGtkTreeModelNodes         m_nodes;
     wxGtkTreeModelChildren      m_children;

-    wxDataViewItem              m_item; 
+    wxDataViewItem              m_item;

     wxDataViewCtrlInternal     *m_internal;
 };
 
     wxDataViewCtrlInternal     *m_internal;
 };
 


@@ -269,8 +279,12 @@ struct _GtkWxTreeModelClass
 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 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_tree_model_init (GtkTreeModelIface       *iface);
+static void         wxgtk_tree_model_sortable_init   (GtkTreeSortableIface    *iface);
+static void         wxgtk_tree_model_drag_source_init(GtkTreeDragSourceIface  *iface);
+static void         wxgtk_tree_model_drag_dest_init  (GtkTreeDragDestIface    *iface);
+

 static void         wxgtk_tree_model_finalize        (GObject           *object);
 static GtkTreeModelFlags wxgtk_tree_model_get_flags  (GtkTreeModel      *tree_model);
 static gint         wxgtk_tree_model_get_n_columns   (GtkTreeModel      *tree_model);
 static void         wxgtk_tree_model_finalize        (GObject           *object);
 static GtkTreeModelFlags wxgtk_tree_model_get_flags  (GtkTreeModel      *tree_model);
 static gint         wxgtk_tree_model_get_n_columns   (GtkTreeModel      *tree_model);


@@ -304,22 +318,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,
+                                                        GtkDestroyNotify       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,
+                                                        GtkDestroyNotify       destroy);

 static gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable       *sortable);
 
 static gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable       *sortable);
 

+/* drag'n'drop */
+static gboolean wxgtk_tree_model_row_draggable         (GtkTreeDragSource     *drag_source,
+                                                        GtkTreePath           *path);
+static gboolean wxgtk_tree_model_drag_data_delete      (GtkTreeDragSource     *drag_source,
+                                                        GtkTreePath           *path);
+static gboolean wxgtk_tree_model_drag_data_get         (GtkTreeDragSource     *drag_source,
+                                                        GtkTreePath           *path,
+                                                        GtkSelectionData      *selection_data);
+static gboolean wxgtk_tree_model_drag_data_received    (GtkTreeDragDest       *drag_dest,
+                                                        GtkTreePath           *dest,
+                                                        GtkSelectionData      *selection_data);
+static gboolean wxgtk_tree_model_row_drop_possible     (GtkTreeDragDest       *drag_dest,
+                                                        GtkTreePath           *dest_path,
+                                                       GtkSelectionData      *selection_data);

 
 
 static GObjectClass *list_parent_class = NULL;
 
 
 static GObjectClass *list_parent_class = NULL;


@@ -358,6 +386,20 @@ gtk_wx_tree_model_get_type (void)
             NULL
         };
 
             NULL
         };
 

+        static const GInterfaceInfo drag_source_iface_info =
+        {
+            (GInterfaceInitFunc) wxgtk_tree_model_drag_source_init,
+            NULL,
+            NULL
+        };
+
+        static const GInterfaceInfo drag_dest_iface_info =
+        {
+            (GInterfaceInitFunc) wxgtk_tree_model_drag_dest_init,
+            NULL,
+            NULL
+        };
+

         tree_model_type = g_type_register_static (G_TYPE_OBJECT, "GtkWxTreeModel",
                                                 &tree_model_info, (GTypeFlags)0 );
 
         tree_model_type = g_type_register_static (G_TYPE_OBJECT, "GtkWxTreeModel",
                                                 &tree_model_info, (GTypeFlags)0 );
 


@@ -367,6 +409,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;


@@ -414,6 +462,21 @@ wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface)
     iface->has_default_sort_func = wxgtk_tree_model_has_default_sort_func;
 }
 
     iface->has_default_sort_func = wxgtk_tree_model_has_default_sort_func;
 }
 

+static void
+wxgtk_tree_model_drag_source_init(GtkTreeDragSourceIface  *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  (GtkTreeDragDestIface    *iface)
+{
+    iface->drag_data_received = wxgtk_tree_model_drag_data_received;
+    iface->row_drop_possible = wxgtk_tree_model_row_drop_possible;
+}
+

 static void
 wxgtk_tree_model_init (GtkWxTreeModel *tree_model)
 {
 static void
 wxgtk_tree_model_init (GtkWxTreeModel *tree_model)
 {


@@ -438,9 +501,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


@@ -528,6 +592,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;

+
+    if (wxtree_model->stamp != iter->stamp)
+       wxPrintf( "crash\n" );
+

     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
     g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE);
 
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
     g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE);
 


@@ -588,85 +656,157 @@ 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;
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+
+    return wxtree_model->internal->row_draggable( drag_source, path );
+}
+
+static gboolean
+wxgtk_tree_model_drag_data_delete (GtkTreeDragSource *drag_source,
+                                   GtkTreePath       *path)
+{
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+
+    return wxtree_model->internal->drag_data_delete( drag_source, path );
+}
+
+static gboolean
+wxgtk_tree_model_drag_data_get (GtkTreeDragSource *drag_source,
+                                GtkTreePath       *path,
+                                GtkSelectionData  *selection_data)
+{
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+
+#if 0
+    wxPrintf( "drag_get_data\n");
+
+    wxGtkString atom_selection(gdk_atom_name(selection_data->selection));
+    wxPrintf( "selection %s\n", wxString::FromAscii(atom_selection) );
+
+    wxGtkString atom_target(gdk_atom_name(selection_data->target));
+    wxPrintf( "target %s\n", wxString::FromAscii(atom_target) );
+
+    wxGtkString atom_type(gdk_atom_name(selection_data->type));
+    wxPrintf( "type %s\n", wxString::FromAscii(atom_type) );
+
+    wxPrintf( "format %d\n", selection_data->format );
+#endif
+
+    return wxtree_model->internal->drag_data_get( drag_source, path, selection_data );
+}
+
+static gboolean
+wxgtk_tree_model_drag_data_received (GtkTreeDragDest  *drag_dest,
+                                     GtkTreePath      *dest,
+                                     GtkSelectionData *selection_data)
+{
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_dest;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+
+    return wxtree_model->internal->drag_data_received( drag_dest, dest, selection_data );
+}
+
+static gboolean
+wxgtk_tree_model_row_drop_possible (GtkTreeDragDest  *drag_dest,
+                                    GtkTreePath      *dest_path,
+                                   GtkSelectionData *selection_data)
+{
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_dest;
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+
+    return wxtree_model->internal->row_drop_possible( drag_dest, dest_path, selection_data );
+}
+
+/* sortable iface */
+static gboolean
+wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortable,
+                                     gint            *sort_column_id,
+                                     GtkSortType     *order)
+{
+    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) sortable;

 
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE);
 
 
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE);
 

-    if (!tree_model->internal->IsSorted())
+    if (!wxtree_model->internal->IsSorted())

     {
         if (sort_column_id)
             *sort_column_id = -1;
     {
         if (sort_column_id)
             *sort_column_id = -1;

-            
+

         return TRUE;
     }
 
 
     if (sort_column_id)
         return TRUE;
     }
 
 
     if (sort_column_id)

-        *sort_column_id = tree_model->internal->GetSortColumn();
-        
+        *sort_column_id = wxtree_model->internal->GetSortColumn();
+

     if (order)
     if (order)

-        *order = tree_model->internal->GetSortOrder();
-        
+        *order = wxtree_model->internal->GetSortOrder();
+

     return TRUE;
 }
 
 wxDataViewColumn *gs_lastLeftClickHeader = NULL;
 
     return TRUE;
 }
 
 wxDataViewColumn *gs_lastLeftClickHeader = NULL;
 

-void     wxgtk_tree_model_set_sort_column_id  (GtkTreeSortable        *sortable,
-                                                     gint                      sort_column_id,
-                                                     GtkSortType               order)
+static void
+wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable,
+                                     gint             sort_column_id,
+                                     GtkSortType      order)

 {
     GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable;
     g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
 
     tree_model->internal->SetDataViewSortColumn( gs_lastLeftClickHeader );
 {
     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 );
     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);
         gtk_tree_sortable_sort_column_changed (sortable);

-    
+

         tree_model->internal->GetDataViewModel()->Resort();
     }
 
     if (gs_lastLeftClickHeader)
     {
         tree_model->internal->GetDataViewModel()->Resort();
     }
 
     if (gs_lastLeftClickHeader)
     {

-        wxDataViewCtrl *dv = tree_model->internal->GetOwner();    
+        wxDataViewCtrl *dv = tree_model->internal->GetOwner();

         wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, dv->GetId() );
         event.SetDataViewColumn( gs_lastLeftClickHeader );
         event.SetModel( dv->GetModel() );
         wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, dv->GetId() );
         event.SetDataViewColumn( gs_lastLeftClickHeader );
         event.SetModel( dv->GetModel() );

-        dv->GetEventHandler()->ProcessEvent( event );
+        dv->HandleWindowEvent( event );

     }
     }

-    
+

     gs_lastLeftClickHeader = NULL;
 }
 
     gs_lastLeftClickHeader = NULL;
 }
 

-void     wxgtk_tree_model_set_sort_func         (GtkTreeSortable        *sortable,
-                                                     gint                      sort_column_id,
-                                                     GtkTreeIterCompareFunc    func,
-                                                     gpointer                  data,
-                                                     GtkDestroyNotify          destroy)
+static void
+wxgtk_tree_model_set_sort_func (GtkTreeSortable        *sortable,
+                                gint                    WXUNUSED(sort_column_id),
+                                GtkTreeIterCompareFunc  func,
+                                gpointer                WXUNUSED(data),
+                                GtkDestroyNotify        WXUNUSED(destroy) )

 {
     g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
     g_return_if_fail (func != NULL);
 }
 
 {
     g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
     g_return_if_fail (func != NULL);
 }
 

-void     wxgtk_tree_model_set_default_sort_func (GtkTreeSortable        *sortable,
-                                                     GtkTreeIterCompareFunc    func,
-                                                     gpointer                  data,
-                                                     GtkDestroyNotify          destroy)
+void     wxgtk_tree_model_set_default_sort_func (GtkTreeSortable          *sortable,
+                                                GtkTreeIterCompareFunc    func,
+                                                gpointer                  WXUNUSED(data),
+                                                GtkDestroyNotify          WXUNUSED(destroy) )

 {
     g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
     g_return_if_fail (func != NULL);
 {
     g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
     g_return_if_fail (func != NULL);


@@ -676,6 +816,8 @@ void     wxgtk_tree_model_set_default_sort_func (GtkTreeSortable        *sortabl
 
 gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable        *sortable)
 {
 
 gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable        *sortable)
 {

+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE );
+

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -824,17 +966,23 @@ gtk_wx_cell_renderer_new (void)
 
 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            *WXUNUSED(background_area),

                         GdkRectangle            *cell_area,
                         GdkRectangle            *cell_area,

-                        GtkCellRendererState     flags )
+                        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,
 
     GdkRectangle rect;
     gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,


@@ -864,7 +1012,7 @@ 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,
+                               GtkWidget       *WXUNUSED(widget),

                                GdkRectangle    *cell_area,
                                gint            *x_offset,
                                gint            *y_offset,
                                GdkRectangle    *cell_area,
                                gint            *x_offset,
                                gint            *y_offset,


@@ -920,6 +1068,13 @@ gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
     wxDataViewCustomRenderer *cell = wxrenderer->cell;
 
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
     wxDataViewCustomRenderer *cell = wxrenderer->cell;
 

+    cell->window = window;
+    cell->widget = widget;
+    cell->background_area = (void*) background_area;
+    cell->cell_area = (void*) cell_area;
+    cell->expose_area = (void*) expose_area;
+    cell->flags = (int) flags;
+

     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,


@@ -931,16 +1086,17 @@ gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
     rect.y += cell_area->y;
     rect.width  -= renderer->xpad * 2;
     rect.height -= renderer->ypad * 2;
     rect.y += cell_area->y;
     rect.width  -= renderer->xpad * 2;
     rect.height -= renderer->ypad * 2;

-
+        

     GdkRectangle dummy;
     if (gdk_rectangle_intersect (expose_area, &rect, &dummy))
     {
         wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
         wxWindowDC* dc = (wxWindowDC*) cell->GetDC();
     GdkRectangle dummy;
     if (gdk_rectangle_intersect (expose_area, &rect, &dummy))
     {
         wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
         wxWindowDC* dc = (wxWindowDC*) cell->GetDC();

-        if (dc->m_window == NULL)
+        wxWindowDCImpl *impl = (wxWindowDCImpl *) dc->GetImpl();
+        if (impl->m_gdkwindow == NULL)

         {
         {

-            dc->m_window = window;
-            dc->SetUpDC();
+            impl->m_gdkwindow = window;
+            impl->SetUpDC();

         }
 
         int state = 0;
         }
 
         int state = 0;


@@ -964,9 +1120,9 @@ gtk_wx_cell_renderer_activate(
                         GdkEvent                *event,
                         GtkWidget               *widget,
                         const gchar             *path,
                         GdkEvent                *event,
                         GtkWidget               *widget,
                         const gchar             *path,

-                        GdkRectangle            *background_area,
+                        GdkRectangle            *WXUNUSED(background_area),

                         GdkRectangle            *cell_area,
                         GdkRectangle            *cell_area,

-                        GtkCellRendererState     flags )
+                        GtkCellRendererState     WXUNUSED(flags) )

 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
     wxDataViewCustomRenderer *cell = wxrenderer->cell;
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
     wxDataViewCustomRenderer *cell = wxrenderer->cell;


@@ -988,8 +1144,10 @@ gtk_wx_cell_renderer_activate(
     wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel();
 
     GtkTreePath *treepath = gtk_tree_path_new_from_string( path );
     wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel();
 
     GtkTreePath *treepath = gtk_tree_path_new_from_string( path );

-    // TODO
-    wxDataViewItem item;
+
+    GtkTreeIter iter;
+    cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, treepath );
+    wxDataViewItem item( iter.user_data );

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


@@ -1020,12 +1178,6 @@ gtk_wx_cell_renderer_activate(
                 if (cell->Activate( renderrect, model, item, model_col ))
                     ret = true;
         }
                 if (cell->Activate( renderrect, model, item, model_col ))
                     ret = true;
         }

-        if (button_event->button == 3)
-        {
-            if (cell->RightClick( pt, renderrect, model, item, model_col ))
-                ret = true;
-        }
-

         wxrenderer->last_click = button_event->time;
 
         return ret;
         wxrenderer->last_click = button_event->time;
 
         return ret;


@@ -1053,6 +1205,9 @@ public:
     virtual bool Cleared();
     virtual void Resort();
 
     virtual bool Cleared();
     virtual void Resort();
 

+    void SetGtkModel( GtkWxTreeModel *model ) { m_wxgtk_model = model; }
+
+private:

     GtkWxTreeModel      *m_wxgtk_model;
     wxDataViewModel     *m_wx_model;
     wxDataViewCtrl      *m_owner;
     GtkWxTreeModel      *m_wxgtk_model;
     wxDataViewModel     *m_wx_model;
     wxDataViewCtrl      *m_owner;


@@ -1085,9 +1240,9 @@ bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const
     iter.stamp = m_wxgtk_model->stamp;
     iter.user_data = (gpointer) item.GetID();
 
     iter.stamp = m_wxgtk_model->stamp;
     iter.user_data = (gpointer) item.GetID();
 

-    GtkTreePath *path = wxgtk_tree_model_get_path( 
+    GtkTreePath *path = wxgtk_tree_model_get_path(

         GTK_TREE_MODEL(m_wxgtk_model), &iter );
         GTK_TREE_MODEL(m_wxgtk_model), &iter );

-    gtk_tree_model_row_inserted( 
+    gtk_tree_model_row_inserted(

         GTK_TREE_MODEL(m_wxgtk_model), path, &iter);
     gtk_tree_path_free (path);
 
         GTK_TREE_MODEL(m_wxgtk_model), path, &iter);
     gtk_tree_path_free (path);
 


@@ -1100,14 +1255,14 @@ bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &parent, cons
     iter.stamp = m_wxgtk_model->stamp;
     iter.user_data = (gpointer) item.GetID();
 
     iter.stamp = m_wxgtk_model->stamp;
     iter.user_data = (gpointer) item.GetID();
 

-    GtkTreePath *path = wxgtk_tree_model_get_path( 
+    GtkTreePath *path = wxgtk_tree_model_get_path(

         GTK_TREE_MODEL(m_wxgtk_model), &iter );
     gtk_tree_model_row_deleted(
         GTK_TREE_MODEL(m_wxgtk_model), path );
     gtk_tree_path_free (path);
 
     m_owner->GtkGetInternal()->ItemDeleted( parent, item );
         GTK_TREE_MODEL(m_wxgtk_model), &iter );
     gtk_tree_model_row_deleted(
         GTK_TREE_MODEL(m_wxgtk_model), path );
     gtk_tree_path_free (path);
 
     m_owner->GtkGetInternal()->ItemDeleted( parent, item );

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -1122,14 +1277,14 @@ bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item )
     iter.stamp = m_wxgtk_model->stamp;
     iter.user_data = (gpointer) item.GetID();
 
     iter.stamp = m_wxgtk_model->stamp;
     iter.user_data = (gpointer) item.GetID();
 

-    GtkTreePath *path = wxgtk_tree_model_get_path( 
+    GtkTreePath *path = wxgtk_tree_model_get_path(

         GTK_TREE_MODEL(m_wxgtk_model), &iter );
     gtk_tree_model_row_changed(
         GTK_TREE_MODEL(m_wxgtk_model), path, &iter );
     gtk_tree_path_free (path);
 
     m_owner->GtkGetInternal()->ItemChanged( item );
         GTK_TREE_MODEL(m_wxgtk_model), &iter );
     gtk_tree_model_row_changed(
         GTK_TREE_MODEL(m_wxgtk_model), path, &iter );
     gtk_tree_path_free (path);
 
     m_owner->GtkGetInternal()->ItemChanged( item );

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -1149,7 +1304,7 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig
             GtkTreeIter iter;
             iter.stamp = m_wxgtk_model->stamp;
             iter.user_data = (gpointer) item.GetID();
             GtkTreeIter iter;
             iter.stamp = m_wxgtk_model->stamp;
             iter.user_data = (gpointer) item.GetID();

-            GtkTreePath *path = wxgtk_tree_model_get_path( 
+            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_MODEL(m_wxgtk_model), &iter );
             GdkRectangle cell_area;
             gtk_tree_view_get_cell_area( widget, path, gcolumn, &cell_area );


@@ -1163,9 +1318,9 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig
             // Redraw
             gtk_widget_queue_draw_area( GTK_WIDGET(widget),
                 cell_area.x - xdiff, ydiff + cell_area.y, cell_area.width, cell_area.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 );
             m_owner->GtkGetInternal()->ValueChanged( item, model_col );

-            
+

             return true;
         }
     }
             return true;
         }
     }


@@ -1175,10 +1330,15 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig
 
 bool wxGtkDataViewModelNotifier::Cleared()
 {
 
 bool wxGtkDataViewModelNotifier::Cleared()
 {

-    // TODO: delete everything
+    gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->m_treeview), NULL );

 
 

+    // this will create a new GTK model

     m_owner->GtkGetInternal()->Cleared();
     m_owner->GtkGetInternal()->Cleared();

-    
+
+    SetGtkModel( m_owner->GtkGetInternal()->GetGtkModel() );
+
+    gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->m_treeview), GTK_TREE_MODEL(m_wxgtk_model) );
+

     return false;
 }
 
     return false;
 }
 


@@ -1189,7 +1349,7 @@ bool wxGtkDataViewModelNotifier::Cleared()
 static gpointer s_user_data = NULL;
 
 static void
 static gpointer s_user_data = NULL;
 
 static void

-wxgtk_cell_editable_editing_done( GtkCellEditable *editable, 
+wxgtk_cell_editable_editing_done( GtkCellEditable *WXUNUSED(editable),

                                   wxDataViewRenderer *wxrenderer )
 {
     wxDataViewColumn *column = wxrenderer->GetOwner();
                                   wxDataViewRenderer *wxrenderer )
 {
     wxDataViewColumn *column = wxrenderer->GetOwner();


@@ -1199,11 +1359,11 @@ wxgtk_cell_editable_editing_done( GtkCellEditable *editable,
     event.SetModel( dv->GetModel() );
     wxDataViewItem item( s_user_data );
     event.SetItem( item );
     event.SetModel( dv->GetModel() );
     wxDataViewItem item( s_user_data );
     event.SetItem( item );

-    dv->GetEventHandler()->ProcessEvent( event );
+    dv->HandleWindowEvent( event );

 }
 
 }
 

-static void 
-wxgtk_renderer_editing_started( GtkCellRenderer *cell, GtkCellEditable *editable,
+static void
+wxgtk_renderer_editing_started( GtkCellRenderer *WXUNUSED(cell), GtkCellEditable *editable,

                                 gchar *path, wxDataViewRenderer *wxrenderer )
 {
     wxDataViewColumn *column = wxrenderer->GetOwner();
                                 gchar *path, wxDataViewRenderer *wxrenderer )
 {
     wxDataViewColumn *column = wxrenderer->GetOwner();


@@ -1217,16 +1377,16 @@ wxgtk_renderer_editing_started( GtkCellRenderer *cell, GtkCellEditable *editable
     gtk_tree_path_free( tree_path );
     wxDataViewItem item( iter.user_data );
     event.SetItem( item );
     gtk_tree_path_free( tree_path );
     wxDataViewItem item( iter.user_data );
     event.SetItem( item );

-    dv->GetEventHandler()->ProcessEvent( event );
+    dv->HandleWindowEvent( event );

 
     if (GTK_IS_CELL_EDITABLE(editable))
     {
         s_user_data = iter.user_data;
 
     if (GTK_IS_CELL_EDITABLE(editable))
     {
         s_user_data = iter.user_data;

-    
+

         g_signal_connect (GTK_CELL_EDITABLE (editable), "editing_done",
             G_CALLBACK (wxgtk_cell_editable_editing_done),
             (gpointer) wxrenderer );
         g_signal_connect (GTK_CELL_EDITABLE (editable), "editing_done",
             G_CALLBACK (wxgtk_cell_editable_editing_done),
             (gpointer) wxrenderer );

-        
+

     }
 }
 
     }
 }
 


@@ -1258,18 +1418,24 @@ void wxDataViewRenderer::SetMode( wxDataViewCellMode mode )
     GtkCellRendererMode gtkMode;
     switch (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;

     }
 
     }
 

-    // This value is most often ignored in GtkTreeView    
+    // 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 );


@@ -1286,15 +1452,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 );


@@ -1302,8 +1474,21 @@ wxDataViewCellMode wxDataViewRenderer::GetMode() const
     return ret;
 }
 
     return ret;
 }
 

-void wxDataViewRenderer::SetAlignment( int align )
+void wxDataViewRenderer::GtkUpdateAlignment()

 {
 {

+    int align = m_alignment;
+    
+    // query alignment from column ?
+    if (align == -1)
+    {
+        // None there yet
+        if (GetOwner() == NULL)
+            return;
+        
+        align = GetOwner()->GetAlignment();
+        align |= wxALIGN_CENTRE_VERTICAL;
+    }
+    

     // horizontal alignment:
 
     gfloat xalign = 0.0;
     // horizontal alignment:
 
     gfloat xalign = 0.0;


@@ -1333,40 +1518,16 @@ void wxDataViewRenderer::SetAlignment( int align )
     g_value_unset( &gvalue2 );
 }
 
     g_value_unset( &gvalue2 );
 }
 

-int wxDataViewRenderer::GetAlignment() const
+void wxDataViewRenderer::SetAlignment( int align )

 {
 {

-    int ret = 0;
-    GValue gvalue;
-
-    // horizontal alignment:
-
-    g_object_get( G_OBJECT(m_renderer), "xalign", &gvalue, NULL );
-    float xalign = g_value_get_float( &gvalue );
-    if (xalign < 0.5)
-        ret |= wxALIGN_LEFT;
-    else if (xalign == 0.5)
-        ret |= wxALIGN_CENTER_HORIZONTAL;
-    else
-        ret |= wxALIGN_RIGHT;
-    g_value_unset( &gvalue );
-
-
-    // vertical alignment:
-
-    g_object_get( G_OBJECT(m_renderer), "yalign", &gvalue, NULL );
-    float yalign = g_value_get_float( &gvalue );
-    if (yalign < 0.5)
-        ret |= wxALIGN_TOP;
-    else if (yalign == 0.5)
-        ret |= wxALIGN_CENTER_VERTICAL;
-    else
-        ret |= wxALIGN_BOTTOM;
-    g_value_unset( &gvalue );
-
-    return ret;
+    m_alignment = align;
+    GtkUpdateAlignment();

 }
 
 }
 

-
+int wxDataViewRenderer::GetAlignment() const
+{
+    return m_alignment;
+}

 
 // ---------------------------------------------------------
 // wxDataViewTextRenderer
 
 // ---------------------------------------------------------
 // wxDataViewTextRenderer


@@ -1377,7 +1538,7 @@ static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
     gchar *arg1, gchar *arg2, gpointer user_data );
 }
 
     gchar *arg1, gchar *arg2, gpointer user_data );
 }
 

-static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
+static void wxGtkTextRendererEditedCallback( GtkCellRendererText *WXUNUSED(renderer),

     gchar *arg1, gchar *arg2, gpointer user_data )
 {
     wxDataViewTextRenderer *cell = (wxDataViewTextRenderer*) user_data;
     gchar *arg1, gchar *arg2, gpointer user_data )
 {
     wxDataViewTextRenderer *cell = (wxDataViewTextRenderer*) user_data;


@@ -1418,7 +1579,7 @@ 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();
     }
 
         GtkInitHandlers();
     }
 


@@ -1444,8 +1605,7 @@ bool wxDataViewTextRenderer::GetValue( wxVariant &value ) const
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_STRING );
     g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_STRING );
     g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );

-    wxString tmp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ),
-        wx_const_cast(wxDataViewTextRenderer*, this)->GetOwner()->GetOwner()->GetFont() );
+    wxString tmp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ), wx_const_cast(wxDataViewTextRenderer*, this)->GetOwner()->GetOwner()->GetFont() );

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


@@ -1474,6 +1634,18 @@ void wxDataViewTextRenderer::SetAlignment( int align )
     g_value_unset( &gvalue );
 }
 
     g_value_unset( &gvalue );
 }
 

+// ---------------------------------------------------------
+// wxDataViewTextRendererAttr
+// ---------------------------------------------------------
+
+IMPLEMENT_CLASS(wxDataViewTextRendererAttr,wxDataViewTextRenderer)
+
+wxDataViewTextRendererAttr::wxDataViewTextRendererAttr( const wxString &varianttype,
+                            wxDataViewCellMode mode, int align ) :
+   wxDataViewTextRenderer( varianttype, mode, align )
+{
+}
+

 // ---------------------------------------------------------
 // wxDataViewBitmapRenderer
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxDataViewBitmapRenderer
 // ---------------------------------------------------------


@@ -1531,7 +1703,7 @@ bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value )
     return false;
 }
 
     return false;
 }
 

-bool wxDataViewBitmapRenderer::GetValue( wxVariant &value ) const
+bool wxDataViewBitmapRenderer::GetValue( wxVariant &WXUNUSED(value) ) const

 {
     return false;
 }
 {
     return false;
 }


@@ -1633,14 +1805,17 @@ bool wxDataViewToggleRenderer::GetValue( wxVariant &value ) const
 // wxDataViewCustomRenderer
 // ---------------------------------------------------------
 
 // wxDataViewCustomRenderer
 // ---------------------------------------------------------
 

-class wxDataViewCtrlDC: public wxWindowDC
+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_layout = pango_layout_new( m_context );
 
         m_context = window->GtkGetPangoDefaultContext();
         m_layout = pango_layout_new( m_context );


@@ -1648,12 +1823,20 @@ public:
 
         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 ) )
+        { }
+};
+
+

 // ---------------------------------------------------------
 // wxDataViewCustomRenderer
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxDataViewCustomRenderer
 // ---------------------------------------------------------


@@ -1666,6 +1849,7 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
     wxDataViewRenderer( varianttype, mode, align )
 {
     m_dc = NULL;
     wxDataViewRenderer( varianttype, mode, align )
 {
     m_dc = NULL;

+    m_text_renderer = NULL;

 
     if (no_init)
         m_renderer = NULL;
 
     if (no_init)
         m_renderer = NULL;


@@ -1673,6 +1857,42 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
         Init(mode, align);
 }
 
         Init(mode, align);
 }
 

+void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset,
+                                           wxRect WXUNUSED(cell), wxDC *WXUNUSED(dc), int WXUNUSED(state) )
+{
+#if 0
+    wxDataViewCtrl *view = GetOwner()->GetOwner();
+    wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ?
+                        wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) :
+                        view->GetForegroundColour();
+    dc->SetTextForeground(col);
+    dc->DrawText( text, cell.x + xoffset, cell.y + ((cell.height - dc->GetCharHeight()) / 2));
+#else
+    if (!m_text_renderer)
+        m_text_renderer = gtk_cell_renderer_text_new();
+
+    GValue gvalue = { 0, };
+    g_value_init( &gvalue, G_TYPE_STRING );
+    g_value_set_string( &gvalue, wxGTK_CONV_FONT( text, GetOwner()->GetOwner()->GetFont() ) );
+    g_object_set_property( G_OBJECT(m_text_renderer), "text", &gvalue );
+    g_value_unset( &gvalue );
+
+    ((GdkRectangle*) cell_area)->x += xoffset;
+    ((GdkRectangle*) cell_area)->width -= xoffset;
+
+    gtk_cell_renderer_render( m_text_renderer,
+        window,
+        widget,
+        (GdkRectangle*) background_area,
+        (GdkRectangle*) cell_area,
+        (GdkRectangle*) expose_area,
+        (GtkCellRendererState) flags );
+
+    ((GdkRectangle*) cell_area)->x -= xoffset;
+    ((GdkRectangle*) cell_area)->width += xoffset;
+#endif
+}
+

 bool wxDataViewCustomRenderer::Init(wxDataViewCellMode mode, int align)
 {
     GtkWxCellRenderer *renderer = (GtkWxCellRenderer *) gtk_wx_cell_renderer_new();
 bool wxDataViewCustomRenderer::Init(wxDataViewCellMode mode, int align)
 {
     GtkWxCellRenderer *renderer = (GtkWxCellRenderer *) gtk_wx_cell_renderer_new();


@@ -1684,7 +1904,7 @@ bool wxDataViewCustomRenderer::Init(wxDataViewCellMode mode, int align)
     SetAlignment(align);
 
     GtkInitHandlers();
     SetAlignment(align);
 
     GtkInitHandlers();

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -1692,6 +1912,9 @@ wxDataViewCustomRenderer::~wxDataViewCustomRenderer()
 {
     if (m_dc)
         delete m_dc;
 {
     if (m_dc)
         delete m_dc;

+
+    if (m_text_renderer)
+        gtk_object_sink( GTK_OBJECT(m_text_renderer) );

 }
 
 wxDC *wxDataViewCustomRenderer::GetDC()
 }
 
 wxDC *wxDataViewCustomRenderer::GetDC()


@@ -1729,8 +1952,7 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label,
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_STRING );
 
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_STRING );
 

-        // FIXME: font encoding support
-        g_value_set_string( &gvalue, wxGTK_CONV_SYS(m_label) );
+        g_value_set_string( &gvalue, wxGTK_CONV_FONT( m_label, GetOwner()->GetOwner()->GetFont() ) );

         g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
         g_value_unset( &gvalue );
 
         g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
         g_value_unset( &gvalue );
 


@@ -1773,12 +1995,12 @@ bool wxDataViewProgressRenderer::SetValue( const wxVariant &value )
     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;


@@ -1865,7 +2087,7 @@ bool wxDataViewDateRenderer::SetValue( const wxVariant &value )
     return true;
 }
 
     return true;
 }
 

-bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const
+bool wxDataViewDateRenderer::GetValue( wxVariant &WXUNUSED(value) ) const

 {
     return false;
 }
 {
     return false;
 }


@@ -1874,8 +2096,7 @@ bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state )
 {
     dc->SetFont( GetOwner()->GetOwner()->GetFont() );
     wxString tmp = m_date.FormatDate();
 {
     dc->SetFont( GetOwner()->GetOwner()->GetFont() );
     wxString tmp = m_date.FormatDate();

-    dc->DrawText( tmp, cell.x, cell.y );
-
+    RenderText( tmp, 0, cell, dc, state );

     return true;
 }
 
     return true;
 }
 


@@ -1887,7 +2108,7 @@ wxSize wxDataViewDateRenderer::GetSize() const
     return wxSize(x,y+d);
 }
 
     return wxSize(x,y+d);
 }
 

-bool wxDataViewDateRenderer::Activate( wxRect cell, wxDataViewModel *model,
+bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *model,

                                        const wxDataViewItem &item, unsigned int col )
 {
     wxVariant variant;
                                        const wxDataViewItem &item, unsigned int col )
 {
     wxVariant variant;


@@ -1905,13 +2126,13 @@ bool wxDataViewDateRenderer::Activate( wxRect cell, wxDataViewModel *model,
 }
 
 
 }
 
 

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 // wxDataViewIconTextRenderer
 // wxDataViewIconTextRenderer

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer)
 
 
 IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer)
 

-wxDataViewIconTextRenderer::wxDataViewIconTextRenderer( 
+wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(

   const wxString &varianttype, wxDataViewCellMode mode, int align ) :
     wxDataViewCustomRenderer( varianttype, mode, align )
 {
   const wxString &varianttype, wxDataViewCellMode mode, int align ) :
     wxDataViewCustomRenderer( varianttype, mode, align )
 {


@@ -1922,45 +2143,54 @@ wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(
 wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer()
 {
 }
 wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer()
 {
 }

-    
+

 bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )
 {
     m_value << value;
     return true;
 }
 
 bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )
 {
     m_value << value;
     return true;
 }
 

-bool wxDataViewIconTextRenderer::GetValue( wxVariant &value ) const
+bool wxDataViewIconTextRenderer::GetValue( wxVariant &WXUNUSED(value) ) const

 {
     return false;
 }
 {
     return false;
 }

-    
+

 bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state )
 {
 bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state )
 {

-    dc->SetFont( GetOwner()->GetOwner()->GetFont() );
-    

     const wxIcon &icon = m_value.GetIcon();
     const wxIcon &icon = m_value.GetIcon();

+    int offset = 0;

     if (icon.IsOk())
     {
     if (icon.IsOk())
     {

-        dc->DrawIcon( icon, cell.x, cell.y ); // TODO centre
-        cell.x += icon.GetWidth()+4;
+        int yoffset = wxMax( 0, (cell.height - icon.GetHeight()) / 2 );
+        dc->DrawIcon( icon, cell.x, cell.y + yoffset );
+        offset = icon.GetWidth() + 4;

     }
     }

-    
-    dc->DrawText( m_value.GetText(), cell.x, cell.y );
+
+    RenderText( m_value.GetText(), offset, cell, dc, state );

 
     return true;
 }
 
 wxSize wxDataViewIconTextRenderer::GetSize() const
 {
 
     return true;
 }
 
 wxSize wxDataViewIconTextRenderer::GetSize() const
 {

-    return wxSize(80,16);  // TODO
+    wxSize size;
+    if (m_value.GetIcon().IsOk())
+        size.x = 4 + m_value.GetIcon().GetWidth();
+    wxCoord x,y,d;
+    GetView()->GetTextExtent( m_value.GetText(), &x, &y, &d );
+    size.x += x;
+    size.y = y+d;
+    return size;

 }
 
 }
 

-wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
+wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl(
+    wxWindow *WXUNUSED(parent), wxRect WXUNUSED(labelRect), const wxVariant &WXUNUSED(value) )

 {
     return NULL;
 }
 
 {
     return NULL;
 }
 

-bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
+bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl(
+   wxControl* WXUNUSED(editor), wxVariant &WXUNUSED(value) )

 {
     return false;
 }
 {
     return false;
 }


@@ -1971,7 +2201,7 @@ bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVa
 
 
 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 )
 {


@@ -1981,12 +2211,12 @@ gtk_dataview_header_button_press_callback( GtkWidget *widget,
     if (gdk_event->button == 1)
     {
         gs_lastLeftClickHeader = column;
     if (gdk_event->button == 1)
     {
         gs_lastLeftClickHeader = column;

-    
+

         wxDataViewCtrl *dv = column->GetOwner();
         wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() );
         event.SetDataViewColumn( column );
         event.SetModel( dv->GetModel() );
         wxDataViewCtrl *dv = column->GetOwner();
         wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() );
         event.SetDataViewColumn( column );
         event.SetModel( dv->GetModel() );

-        if (dv->GetEventHandler()->ProcessEvent( event ))
+        if (dv->HandleWindowEvent( event ))

             return FALSE;
     }
 
             return FALSE;
     }
 


@@ -1996,7 +2226,7 @@ gtk_dataview_header_button_press_callback( GtkWidget *widget,
         wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, dv->GetId() );
         event.SetDataViewColumn( column );
         event.SetModel( dv->GetModel() );
         wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, dv->GetId() );
         event.SetDataViewColumn( column );
         event.SetModel( dv->GetModel() );

-        if (dv->GetEventHandler()->ProcessEvent( event ))
+        if (dv->HandleWindowEvent( event ))

             return FALSE;
     }
 
             return FALSE;
     }
 


@@ -2012,7 +2242,7 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
 }
 
 
 }
 
 

-static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
+static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column),

                             GtkCellRenderer *renderer,
                             GtkTreeModel *model,
                             GtkTreeIter *iter,
                             GtkCellRenderer *renderer,
                             GtkTreeModel *model,
                             GtkTreeIter *iter,


@@ -2027,6 +2257,9 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
 
     wxDataViewModel *wx_model = tree_model->internal->GetDataViewModel();
 
 
     wxDataViewModel *wx_model = tree_model->internal->GetDataViewModel();
 

+    if (!wx_model->IsVirtualListModel())
+    {
+

     if (wx_model->IsContainer( item ))
     {
         if (wx_model->HasContainerColumns( item ) || (cell->GetOwner()->GetModelColumn() == 0))
     if (wx_model->IsContainer( item ))
     {
         if (wx_model->HasContainerColumns( item ) || (cell->GetOwner()->GetModelColumn() == 0))


@@ -2044,7 +2277,7 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
             g_value_set_boolean( &gvalue, FALSE );
             g_object_set_property( G_OBJECT(renderer), "visible", &gvalue );
             g_value_unset( &gvalue );
             g_value_set_boolean( &gvalue, FALSE );
             g_object_set_property( G_OBJECT(renderer), "visible", &gvalue );
             g_value_unset( &gvalue );

-            
+

             return;
         }
     }
             return;
         }
     }


@@ -2057,6 +2290,8 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
         g_value_unset( &gvalue );
     }
 
         g_value_unset( &gvalue );
     }
 

+    }
+

     wxVariant value;
     wx_model->GetValue( value, item, cell->GetOwner()->GetModelColumn() );
 
     wxVariant value;
     wx_model->GetValue( value, item, cell->GetOwner()->GetModelColumn() );
 


@@ -2067,10 +2302,82 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
 
     cell->SetValue( value );
 
 
     cell->SetValue( value );
 

-#if 0
-    wxListItemAttr attr;
-    wx_model->GetAttr( item, attr, cell->GetOwner()->GetModelColumn() );
+    if (cell->GtkHasAttributes())
+    {
+        wxDataViewItemAttr attr;
+        bool colour_set = false;
+        bool style_set = false;
+        bool weight_set = false;
+
+        if (wx_model->GetAttr( item, cell->GetOwner()->GetModelColumn(), attr ))
+        {
+            // this must be a GtkCellRendererText
+            wxColour colour = attr.GetColour();
+            if (colour.IsOk())
+            {
+                const GdkColor * const gcol = colour.GetColor();
+
+                GValue gvalue = { 0, };
+                g_value_init( &gvalue, GDK_TYPE_COLOR );
+                g_value_set_boxed( &gvalue, gcol );
+                g_object_set_property( G_OBJECT(renderer), "foreground_gdk", &gvalue );
+                g_value_unset( &gvalue );
+
+                colour_set = true;
+            }
+
+            if (attr.GetItalic())
+            {
+                GValue gvalue = { 0, };
+                g_value_init( &gvalue, PANGO_TYPE_STYLE );
+                g_value_set_enum( &gvalue, PANGO_STYLE_ITALIC );
+                g_object_set_property( G_OBJECT(renderer), "style", &gvalue );
+                g_value_unset( &gvalue );
+
+                style_set = true;
+            }
+
+            if (attr.GetBold())
+            {
+                GValue gvalue = { 0, };
+                g_value_init( &gvalue, PANGO_TYPE_WEIGHT );
+                g_value_set_enum( &gvalue, PANGO_WEIGHT_BOLD );
+                g_object_set_property( G_OBJECT(renderer), "weight", &gvalue );
+                g_value_unset( &gvalue );
+
+                weight_set = true;
+            }
+        }
+
+        if (!style_set)
+        {
+            GValue gvalue = { 0, };
+            g_value_init( &gvalue, G_TYPE_BOOLEAN );
+            g_value_set_boolean( &gvalue, FALSE );
+            g_object_set_property( G_OBJECT(renderer), "style-set", &gvalue );
+            g_value_unset( &gvalue );
+        }
+
+        if (!weight_set)
+        {
+            GValue gvalue = { 0, };
+            g_value_init( &gvalue, G_TYPE_BOOLEAN );
+            g_value_set_boolean( &gvalue, FALSE );
+            g_object_set_property( G_OBJECT(renderer), "weight-set", &gvalue );
+            g_value_unset( &gvalue );
+        }
+
+        if (!colour_set)
+        {
+            GValue gvalue = { 0, };
+            g_value_init( &gvalue, G_TYPE_BOOLEAN );
+            g_value_set_boolean( &gvalue, FALSE );
+            g_object_set_property( G_OBJECT(renderer), "foreground-set", &gvalue );
+            g_value_unset( &gvalue );
+        }
+    }

 
 

+#if 0

     if (attr.HasBackgroundColour())
     {
         wxColour colour = attr.GetBackgroundColour();
     if (attr.HasBackgroundColour())
     {
         wxColour colour = attr.GetBackgroundColour();


@@ -2097,7 +2404,7 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
 IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
 
 #include <wx/listimpl.cpp>
 IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
 
 #include <wx/listimpl.cpp>

-WX_DEFINE_LIST(wxDataViewColumnList);
+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,


@@ -2131,15 +2438,18 @@ void wxDataViewColumn::Init(wxAlignment align, int flags, int width)
     SetFlags( flags );
     SetAlignment( align );
 
     SetFlags( flags );
     SetAlignment( align );
 

-    // NOTE: we prefer not to call SetMinWidth(wxDVC_DEFAULT_MINWIDTH);
-    //       as GTK+ is smart and unless explicitely told, will set the minimal
-    //       width to the title's lenght, which is a better default
-
-    // the GTK_TREE_VIEW_COLUMN_FIXED is required by the "fixed height" mode
-    // that we use for the wxDataViewCtrl
-    gtk_tree_view_column_set_fixed_width( column, width < 0 ? wxDVC_DEFAULT_WIDTH : width );
-    gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED );
-
+    SetWidth( width );
+
+    // Create container for icon and label
+    GtkWidget *box = gtk_hbox_new( FALSE, 1 );
+    gtk_widget_show( box );
+    // gtk_container_set_border_width((GtkContainer*)box, 2);
+    m_image = gtk_image_new();
+    gtk_box_pack_start(GTK_BOX(box), m_image, FALSE, FALSE, 1);
+    m_label = gtk_label_new("");
+    gtk_box_pack_end( GTK_BOX(box), GTK_WIDGET(m_label), FALSE, FALSE, 1 );
+    gtk_tree_view_column_set_widget( column, box );
+    

     gtk_tree_view_column_pack_end( column, renderer, TRUE );
 
     gtk_tree_view_column_set_cell_data_func( column, renderer,
     gtk_tree_view_column_pack_end( column, renderer, TRUE );
 
     gtk_tree_view_column_set_cell_data_func( column, renderer,


@@ -2179,39 +2489,27 @@ 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( gtk_label_get_text( GTK_LABEL(m_label) ) );

 }
 
 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.Ok())
     {

-        GtkImage *gtk_image = GTK_IMAGE( gtk_image_new() );
+        GtkImage *gtk_image = GTK_IMAGE(m_image);

 
         GdkBitmap *mask = (GdkBitmap *) NULL;
         if (bitmap.GetMask())
 
         GdkBitmap *mask = (GdkBitmap *) NULL;
         if (bitmap.GetMask())


@@ -2227,13 +2525,11 @@ void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap )
             gtk_image_set_from_pixmap(GTK_IMAGE(gtk_image),
                                       bitmap.GetPixmap(), mask);
         }
             gtk_image_set_from_pixmap(GTK_IMAGE(gtk_image),
                                       bitmap.GetPixmap(), mask);
         }

-        gtk_widget_show( GTK_WIDGET(gtk_image) );
-
-        gtk_tree_view_column_set_widget( column, GTK_WIDGET(gtk_image) );
+        gtk_widget_show( m_image );

     }
     else
     {
     }
     else
     {

-        gtk_tree_view_column_set_widget( column, NULL );
+        gtk_widget_hide( m_image );

     }
 }
 
     }
 }
 


@@ -2259,6 +2555,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


@@ -2276,7 +2575,7 @@ 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)
     {
         gtk_tree_view_column_set_sort_column_id( column, GetModelColumn() );
     if (sortable)
     {
         gtk_tree_view_column_set_sort_column_id( column, GetModelColumn() );


@@ -2342,9 +2641,36 @@ 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 < 0)
+    {
+#if 1
+        gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_FIXED );
+
+        // TODO find a better calculation
+        gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), wxDVC_DEFAULT_WIDTH );
+#else
+        // this is unpractical for large numbers of items and disables
+        // user resizing, which is totally unexpected
+        gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_AUTOSIZE );
+#endif
+    }
+    else
+    {
+        gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_FIXED );
+
+        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) );
+}

 
 //-----------------------------------------------------------------------------
 // wxGtkTreeModelNode
 
 //-----------------------------------------------------------------------------
 // wxGtkTreeModelNode


@@ -2370,12 +2696,12 @@ void wxGtkTreeModelNode::Resort()
 
     wxGtkTreeModelChildren temp;
     WX_APPEND_ARRAY( temp, m_children );
 
     wxGtkTreeModelChildren temp;
     WX_APPEND_ARRAY( temp, m_children );

-    
+

     g_internal = m_internal;
     m_children.Sort( &wxGtkTreeModelChildCmp );
 
     gint *new_order = new gint[child_count];
     g_internal = m_internal;
     m_children.Sort( &wxGtkTreeModelChildCmp );
 
     gint *new_order = new gint[child_count];

-    
+

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


@@ -2383,21 +2709,21 @@ void wxGtkTreeModelNode::Resort()
         int old_pos = temp.Index( id );
         new_order[pos] = old_pos;
     }
         int old_pos = temp.Index( id );
         new_order[pos] = old_pos;
     }

-        
+

     GtkTreeModel *gtk_tree_model = GTK_TREE_MODEL( m_internal->GetGtkModel() );
 
     GtkTreeIter iter;
     iter.user_data = GetItem().GetID();
     iter.stamp = m_internal->GetGtkModel()->stamp;
     GtkTreeModel *gtk_tree_model = GTK_TREE_MODEL( m_internal->GetGtkModel() );
 
     GtkTreeIter iter;
     iter.user_data = GetItem().GetID();
     iter.stamp = m_internal->GetGtkModel()->stamp;

-    
+

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

-    
+

     gtk_tree_model_rows_reordered( gtk_tree_model, path, &iter, new_order );
     gtk_tree_model_rows_reordered( gtk_tree_model, path, &iter, new_order );

-    
+

     gtk_tree_path_free (path);
     gtk_tree_path_free (path);

-    
+

     delete [] new_order;
     delete [] new_order;

-    
+

     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 );


@@ -2409,24 +2735,26 @@ void wxGtkTreeModelNode::Resort()
 // wxDataViewCtrlInternal
 //-----------------------------------------------------------------------------
 
 // wxDataViewCtrlInternal
 //-----------------------------------------------------------------------------
 

-wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, 
+wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner,

     wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model )
     wxDataViewModel *wx_model, GtkWxTreeModel *gtk_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_gtk_model = gtk_model;
+    m_root = NULL;

     m_sort_order = GTK_SORT_ASCENDING;
     m_sort_column = -1;
     m_dataview_sort_column = NULL;
     m_sort_order = GTK_SORT_ASCENDING;
     m_sort_column = -1;
     m_dataview_sort_column = NULL;

-    InitTree();
+
+    if (!m_wx_model->IsVirtualListModel())
+        InitTree();

 }
 }

-    
+

 wxDataViewCtrlInternal::~wxDataViewCtrlInternal()
 {
     g_object_unref( m_gtk_model );
 }
 wxDataViewCtrlInternal::~wxDataViewCtrlInternal()
 {
     g_object_unref( m_gtk_model );
 }

-    
+

 void wxDataViewCtrlInternal::InitTree()
 {
     wxDataViewItem item;
 void wxDataViewCtrlInternal::InitTree()
 {
     wxDataViewItem item;


@@ -2445,38 +2773,124 @@ void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node )
         for (pos = 0; pos < count; pos++)
         {
             wxDataViewItem child = children[pos];
         for (pos = 0; pos < count; pos++)
         {
             wxDataViewItem child = children[pos];

-            
+

             if (m_wx_model->IsContainer( child ))
                 node->AddNode( new wxGtkTreeModelNode( node, child, this ) );
             else
                 node->AddLeave( child.GetID() );
             if (m_wx_model->IsContainer( child ))
                 node->AddNode( new wxGtkTreeModelNode( node, child, this ) );
             else
                 node->AddLeave( child.GetID() );

-    
+

             // Don't send any events here
         }
     }
 }
 
             // Don't send any events here
         }
     }
 }
 

+// GTK+ dnd iface
+
+gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag_source),
+    GtkTreePath *path )
+{
+    GtkTreeIter iter;
+    if (!get_iter( &iter, path )) return FALSE;
+
+    wxDataViewItem item( (void*) iter.user_data );
+
+    return m_wx_model->IsDraggable( item );
+}
+
+gboolean
+wxDataViewCtrlInternal::drag_data_delete(GtkTreeDragSource *WXUNUSED(drag_source),
+                                         GtkTreePath *WXUNUSED(path))
+{
+    return FALSE;
+}
+
+gboolean wxDataViewCtrlInternal::drag_data_get( GtkTreeDragSource *WXUNUSED(drag_source),
+    GtkTreePath *path, GtkSelectionData *selection_data )
+{
+    GtkTreeIter iter;
+    if (!get_iter( &iter, path )) return FALSE;
+
+    wxDataViewItem item( (void*) iter.user_data );
+
+    wxDataFormat format( selection_data->target );
+
+    size_t size = m_wx_model->GetDragDataSize( item, format );
+    if (size == 0) return FALSE;
+
+    void *data = malloc( size );
+
+    m_wx_model->GetDragData( item, format, data, size );
+
+    gtk_selection_data_set( selection_data, selection_data->target,
+        8, (const guchar*) data, size );
+
+    free( data );
+
+    return TRUE;
+}
+
+gboolean
+wxDataViewCtrlInternal::drag_data_received(GtkTreeDragDest *WXUNUSED(drag_dest),
+                                           GtkTreePath *WXUNUSED(dest),
+                                           GtkSelectionData *WXUNUSED(selection_data))
+{
+    return FALSE;
+}
+
+gboolean
+wxDataViewCtrlInternal::row_drop_possible(GtkTreeDragDest *WXUNUSED(drag_dest),
+                                          GtkTreePath *WXUNUSED(dest_path),
+                                          GtkSelectionData *WXUNUSED(selection_data))
+{
+    return FALSE;
+}
+
+// notifications from wxDataViewModel
+
+bool wxDataViewCtrlInternal::Cleared()
+{
+    if (m_root)
+    {
+        delete m_root;
+        InitTree();
+    }
+
+    // Create new GTK model
+    g_object_unref( m_gtk_model );
+    m_gtk_model = wxgtk_tree_model_new();
+    m_gtk_model->internal = this;
+
+    return true;
+}
+

 void wxDataViewCtrlInternal::Resort()
 {
 void wxDataViewCtrlInternal::Resort()
 {

-    m_root->Resort();
+    if (!m_wx_model->IsVirtualListModel())
+        m_root->Resort();

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

-    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() );
-    
+    if (!m_wx_model->IsVirtualListModel())
+    {
+        wxGtkTreeModelNode *parent_node = FindNode( parent );
+        if (m_wx_model->IsContainer( item ))
+            parent_node->AddNode( new wxGtkTreeModelNode( parent_node, item, this ) );
+        else
+            parent_node->AddLeave( item.GetID() );
+    }
+

     return true;
 }
 
 bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
 {
     return true;
 }
 
 bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
 {

-    wxGtkTreeModelNode *parent_node = FindNode( parent );
-    parent_node->DeleteChild( item.GetID() );
-    
+    if (!m_wx_model->IsVirtualListModel())
+    {
+        wxGtkTreeModelNode *parent_node = FindNode( parent );
+        parent_node->DeleteChild( item.GetID() );
+    }
+

     return true;
 }
 
     return true;
 }
 


@@ -2486,8 +2900,8 @@ bool wxDataViewCtrlInternal::ItemChanged( const wxDataViewItem &item )
     event.SetEventObject( m_owner );
     event.SetModel( m_owner->GetModel() );
     event.SetItem( item );
     event.SetEventObject( m_owner );
     event.SetModel( m_owner->GetModel() );
     event.SetItem( item );

-    m_owner->GetEventHandler()->ProcessEvent( event );
-    
+    m_owner->HandleWindowEvent( event );
+

     return true;
 }
 
     return true;
 }
 


@@ -2499,51 +2913,74 @@ bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned
     event.SetColumn( col );
     event.SetDataViewColumn( GetOwner()->GetColumn(col) );
     event.SetItem( item );
     event.SetColumn( col );
     event.SetDataViewColumn( GetOwner()->GetColumn(col) );
     event.SetItem( item );

-    m_owner->GetEventHandler()->ProcessEvent( event );
-    
+    m_owner->HandleWindowEvent( event );
+

     return true;
 }
 
     return true;
 }
 

-bool wxDataViewCtrlInternal::Cleared()
+// GTK+ model iface
+
+GtkTreeModelFlags wxDataViewCtrlInternal::get_flags()

 {
 {

-    return true;
+    if (m_wx_model->IsVirtualListModel())
+        return GTK_TREE_MODEL_LIST_ONLY;
+    else
+        return GTK_TREE_MODEL_ITERS_PERSIST;

 }
 
 gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path )
 {
 }
 
 gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path )
 {

-    int depth = gtk_tree_path_get_depth( path );
+    if (m_wx_model->IsVirtualListModel())
+    {
+        wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
+
+        unsigned int i = (unsigned int)gtk_tree_path_get_indices (path)[0];
+
+        if (i >= wx_model->GetLastIndex() + 1)
+            return FALSE;

 
 

-    wxGtkTreeModelNode *node = m_root;
+        iter->stamp = m_gtk_model->stamp;
+        // user_data is just the index
+        iter->user_data = (gpointer) i;

 
 

-    int i;
-    for (i = 0; i < depth; i++)    
+        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 );

 
 

-        size_t count = node->GetNodes().GetCount();
-        size_t pos2;
-        for (pos2 = 0; pos2 < count; pos2++)
+        wxGtkTreeModelNode *node = m_root;
+
+        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;


@@ -2552,17 +2989,27 @@ gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path
 GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter )
 {
     GtkTreePath *retval = gtk_tree_path_new ();
 GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter )
 {
     GtkTreePath *retval = gtk_tree_path_new ();

-    void *id = iter->user_data;    
-    
-    wxGtkTreeModelNode *node = FindParentNode( iter );
-    while (node)
+
+    if (m_wx_model->IsVirtualListModel())
+    {
+        // user_data is just the index
+        int i = (wxUIntPtr) iter->user_data;
+        gtk_tree_path_append_index (retval, i);
+    }
+    else

     {
     {

-        int pos = node->GetChildren().Index( id );
+        void *id = iter->user_data;

 
 

-        gtk_tree_path_prepend_index( retval, pos );
-        
-        id = node->GetItem().GetID();
-        node = node->GetParent();
+        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;


@@ -2570,102 +3017,181 @@ GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter )
 
 gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter )
 {
 
 gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter )
 {

-    wxGtkTreeModelNode *parent = FindParentNode( iter );
-    if( parent == NULL )
-        return FALSE;
+    if (m_wx_model->IsVirtualListModel())
+    {
+        wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;

 
 

-    int pos = parent->GetChildren().Index( iter->user_data );
+        int n = (wxUIntPtr) iter->user_data;

 
 

-    if (pos == (int) parent->GetChildCount()-1)
-        return FALSE;
-        
-    iter->stamp = m_gtk_model->stamp;
-    iter->user_data = parent->GetChildren().Item( pos+1 );
+        if (n == -1)
+            return FALSE;
+
+        if (n >= (int) wx_model->GetLastIndex())
+            return FALSE;
+
+        iter->user_data = (gpointer) ++n;
+    }
+    else
+    {
+        wxGtkTreeModelNode *parent = FindParentNode( iter );
+        if( parent == NULL )
+            return FALSE;
+
+        int pos = parent->GetChildren().Index( iter->user_data );
+
+        if (pos == (int) parent->GetChildCount()-1)
+            return FALSE;
+
+        iter->stamp = m_gtk_model->stamp;
+        iter->user_data = parent->GetChildren().Item( pos+1 );
+    }

 
     return TRUE;
 }
 
 gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *parent )
 {
 
     return TRUE;
 }
 
 gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *parent )
 {

-    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
+    {
+        wxDataViewItem item( (void*) parent->user_data );
+
+        if (!m_wx_model->IsContainer( item ))
+            return FALSE;
+
+        wxGtkTreeModelNode *parent_node = FindNode( parent );
+        BuildBranch( parent_node );
+
+        if (parent_node->GetChildCount() == 0)
+            return FALSE;
+
+        iter->stamp = m_gtk_model->stamp;
+        iter->user_data = (gpointer) parent_node->GetChildren().Item( 0 );
+    }

 
     return TRUE;
 }
 
 gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter )
 {
 
     return TRUE;
 }
 
 gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter )
 {

-    wxDataViewItem item( (void*) iter->user_data );
-    
-    bool is_container = m_wx_model->IsContainer( item );
-    
-    if (!is_container)
+    if (m_wx_model->IsVirtualListModel())
+    {
+        // this is a list, nodes have no children

         return FALSE;
         return FALSE;

-        
-    wxGtkTreeModelNode *node = FindNode( iter );
-    BuildBranch( node );
-    
-    return (node->GetChildCount() > 0);
+    }
+    else
+    {
+        wxDataViewItem item( (void*) iter->user_data );
+
+        bool is_container = m_wx_model->IsContainer( item );
+
+        if (!is_container)
+            return FALSE;
+
+        wxGtkTreeModelNode *node = FindNode( iter );
+        BuildBranch( node );
+
+        return (node->GetChildCount() > 0);
+    }

 }
 
 gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter )
 {
 }
 
 gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter )
 {

-    wxDataViewItem item( (void*) iter->user_data );
-    
-    if (!m_wx_model->IsContainer( item ))
+    if (m_wx_model->IsVirtualListModel())
+    {
+        wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
+
+        if (iter == NULL)
+            return (gint) wx_model->GetLastIndex() + 1;
+

         return 0;
         return 0;

-    
-    wxGtkTreeModelNode *parent_node = FindNode( iter );
-    BuildBranch( parent_node );
+    }
+    else
+    {
+        wxDataViewItem item( (void*) iter->user_data );

 
 

-    // wxPrintf( "iter_n_children %d\n", parent_node->GetChildCount() );
-    
-    return parent_node->GetChildCount();
+        if (!m_wx_model->IsContainer( item ))
+            return 0;
+
+        wxGtkTreeModelNode *parent_node = FindNode( iter );
+        BuildBranch( parent_node );
+
+        // wxPrintf( "iter_n_children %d\n", parent_node->GetChildCount() );
+
+        return parent_node->GetChildCount();
+    }

 }
 
 gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n )
 {
 }
 
 gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n )
 {

-    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())
+    {
+        wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) 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->GetLastIndex() + 1)
+            return FALSE;
+
+        iter->stamp = m_gtk_model->stamp;
+        iter->user_data = (gpointer) n;
+
+        return TRUE;
+    }
+    else
+    {
+        void* id = NULL;
+        if (parent) id = (void*) parent->user_data;
+        wxDataViewItem item( id );
+
+        if (!m_wx_model->IsContainer( item ))
+            return FALSE;
+
+        wxGtkTreeModelNode *parent_node = FindNode( parent );
+        BuildBranch( parent_node );
+
+        // wxPrintf( "iter_nth_child %d\n", n );
+
+        iter->stamp = m_gtk_model->stamp;
+        iter->user_data = parent_node->GetChildren().Item( n );
+
+        return TRUE;
+    }

 }
 
 gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *child )
 {
 }
 
 gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *child )
 {

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

 }
 }

-    
+

 static wxGtkTreeModelNode*
 wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item )
 {
 static wxGtkTreeModelNode*
 wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item )
 {


@@ -2675,7 +3201,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 );


@@ -2697,7 +3223,7 @@ wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *tr
                 {
                     node = nodes[j];
                     break;
                 {
                     node = nodes[j];
                     break;

-                }    
+                }

             }
 
             if( j == len )
             }
 
             if( j == len )


@@ -2720,16 +3246,16 @@ 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)
     {
         wxLogDebug( "Not found %p", iter->user_data );
         char *crash = NULL;
         *crash = 0;
     }
     if (!result)
     {
         wxLogDebug( "Not found %p", iter->user_data );
         char *crash = NULL;
         *crash = 0;
     }

-    
+

     return result;
 }
 
     return result;
 }
 


@@ -2739,14 +3265,14 @@ 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)
     {
         wxLogDebug( "Not found %p", item.GetID() );
         char *crash = NULL;
         *crash = 0;
     }
     if (!result)
     {
         wxLogDebug( "Not found %p", item.GetID() );
         char *crash = NULL;
         *crash = 0;
     }

-    
+

     return result;
 }
 
     return result;
 }
 


@@ -2783,7 +3309,7 @@ wxDataViewCtrlInternal_FindParentNode( wxDataViewModel * model, wxGtkTreeModelNo
                 {
                     node = nodes[j];
                     break;
                 {
                     node = nodes[j];
                     break;

-                }    
+                }

             }
 
             if( j == len )
             }
 
             if( j == len )


@@ -2808,7 +3334,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;


@@ -2829,7 +3355,7 @@ 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))
         return;
 {
     if (!GTK_WIDGET_REALIZED(dv->m_widget))
         return;


@@ -2837,12 +3363,12 @@ wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCt
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, dv->GetId() );
     event.SetItem( dv->GetSelection() );
     event.SetModel( dv->GetModel() );
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, dv->GetId() );
     event.SetItem( dv->GetSelection() );
     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_COMMAND_DATAVIEW_ITEM_ACTIVATED, dv->GetId() );
 


@@ -2851,59 +3377,59 @@ wxdataview_row_activated_callback( GtkTreeView* treeview, GtkTreePath *path,
     wxDataViewItem item( (void*) iter.user_data );;
     event.SetItem( item );
     event.SetModel( dv->GetModel() );
     wxDataViewItem item( (void*) iter.user_data );;
     event.SetItem( item );
     event.SetModel( dv->GetModel() );

-    dv->GetEventHandler()->ProcessEvent( event );
+    dv->HandleWindowEvent( event );

 }
 
 static gboolean
 }
 
 static gboolean

-wxdataview_test_expand_row_callback( GtkTreeView* treeview, GtkTreeIter* iter,
-                                     GtkTreePath *path, wxDataViewCtrl *dv )
+wxdataview_test_expand_row_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
+                                     GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )

 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, dv->GetId() );
 
     wxDataViewItem item( (void*) iter->user_data );;
     event.SetItem( item );
     event.SetModel( dv->GetModel() );
 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, dv->GetId() );
 
     wxDataViewItem item( (void*) iter->user_data );;
     event.SetItem( item );
     event.SetModel( dv->GetModel() );

-    dv->GetEventHandler()->ProcessEvent( event );
-  
+    dv->HandleWindowEvent( event );
+

     return !event.IsAllowed();
 }
 
 static void
     return !event.IsAllowed();
 }
 
 static void

-wxdataview_row_expanded_callback( GtkTreeView* treeview, GtkTreeIter* iter,
-                                  GtkTreePath *path, wxDataViewCtrl *dv )
+wxdataview_row_expanded_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
+                                  GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )

 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, dv->GetId() );
 
     wxDataViewItem item( (void*) iter->user_data );;
     event.SetItem( item );
     event.SetModel( dv->GetModel() );
 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, dv->GetId() );
 
     wxDataViewItem item( (void*) iter->user_data );;
     event.SetItem( item );
     event.SetModel( dv->GetModel() );

-    dv->GetEventHandler()->ProcessEvent( event );
+    dv->HandleWindowEvent( event );

 }
 
 static gboolean
 }
 
 static gboolean

-wxdataview_test_collapse_row_callback( GtkTreeView* treeview, GtkTreeIter* iter,
-                                       GtkTreePath *path, wxDataViewCtrl *dv )
+wxdataview_test_collapse_row_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
+                                       GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )

 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, dv->GetId() );
 
     wxDataViewItem item( (void*) iter->user_data );;
     event.SetItem( item );
     event.SetModel( dv->GetModel() );
 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, dv->GetId() );
 
     wxDataViewItem item( (void*) iter->user_data );;
     event.SetItem( item );
     event.SetModel( dv->GetModel() );

-    dv->GetEventHandler()->ProcessEvent( event );
-    
+    dv->HandleWindowEvent( event );
+

     return !event.IsAllowed();
 }
 
 static void
     return !event.IsAllowed();
 }
 
 static void

-wxdataview_row_collapsed_callback( GtkTreeView* treeview, GtkTreeIter* iter,
-                                   GtkTreePath *path, wxDataViewCtrl *dv )
+wxdataview_row_collapsed_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
+                                   GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )

 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, dv->GetId() );
 
     wxDataViewItem item( (void*) iter->user_data );;
     event.SetItem( item );
     event.SetModel( dv->GetModel() );
 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, dv->GetId() );
 
     wxDataViewItem item( (void*) iter->user_data );;
     event.SetItem( item );
     event.SetModel( dv->GetModel() );

-    dv->GetEventHandler()->ProcessEvent( event );
+    dv->HandleWindowEvent( event );

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


@@ -2928,7 +3454,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();


@@ -2956,9 +3482,9 @@ void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget),
 //-----------------------------------------------------------------------------
 
 static gboolean
 //-----------------------------------------------------------------------------
 
 static gboolean

-gtk_dataview_motion_notify_callback( GtkWidget *widget,
-                                   GdkEventMotion *gdk_event,
-                                   wxDataViewCtrl *dv )
+gtk_dataview_motion_notify_callback( GtkWidget *WXUNUSED(widget),
+                                     GdkEventMotion *gdk_event,
+                                     wxDataViewCtrl *dv )

 {
     if (gdk_event->is_hint)
     {
 {
     if (gdk_event->is_hint)
     {


@@ -2974,7 +3500,7 @@ gtk_dataview_motion_notify_callback( GtkWidget *widget,
     GtkTreeViewColumn *column = NULL;
     gint cell_x = 0;
     gint cell_y = 0;
     GtkTreeViewColumn *column = NULL;
     gint cell_x = 0;
     gint cell_y = 0;

-    if (gtk_tree_view_get_path_at_pos( 
+    if (gtk_tree_view_get_path_at_pos(

         GTK_TREE_VIEW(dv->GtkGetTreeView()),
         (int) gdk_event->x, (int) gdk_event->y,
         &path,
         GTK_TREE_VIEW(dv->GtkGetTreeView()),
         (int) gdk_event->x, (int) gdk_event->y,
         &path,


@@ -2986,9 +3512,9 @@ gtk_dataview_motion_notify_callback( GtkWidget *widget,
         {
             GtkTreeIter iter;
             dv->GtkGetInternal()->get_iter( &iter, path );
         {
             GtkTreeIter iter;
             dv->GtkGetInternal()->get_iter( &iter, path );

-            
+

             // wxPrintf( "mouse %d %d\n", (int) gdk_event->x, (int) gdk_event->y );
             // wxPrintf( "mouse %d %d\n", (int) gdk_event->x, (int) gdk_event->y );

-        
+

             gtk_tree_path_free( path );
         }
     }
             gtk_tree_path_free( path );
         }
     }


@@ -2997,6 +3523,47 @@ gtk_dataview_motion_notify_callback( GtkWidget *widget,
     return FALSE;
 }
 
     return FALSE;
 }
 

+//-----------------------------------------------------------------------------
+// "button_press_event"
+//-----------------------------------------------------------------------------
+
+static gboolean
+gtk_dataview_button_press_callback( GtkWidget *WXUNUSED(widget),
+                                    GdkEventButton *gdk_event,
+                                    wxDataViewCtrl *dv )
+{
+    if ((gdk_event->button == 3) && (gdk_event->type == GDK_BUTTON_PRESS))
+    {
+        GtkTreePath *path = NULL;
+        GtkTreeViewColumn *column = NULL;
+        gint cell_x = 0;
+        gint cell_y = 0;
+        if (gtk_tree_view_get_path_at_pos(
+            GTK_TREE_VIEW(dv->GtkGetTreeView()),
+            (int) gdk_event->x, (int) gdk_event->y,
+            &path,
+            &column,
+            &cell_x,
+            &cell_y))
+        {
+            if (path)
+            {
+                GtkTreeIter iter;
+                dv->GtkGetInternal()->get_iter( &iter, path );
+
+                wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, dv->GetId() );
+                wxDataViewItem item( (void*) iter.user_data );;
+                event.SetItem( item );
+                event.SetModel( dv->GetModel() );
+                bool ret = dv->HandleWindowEvent( event );
+                gtk_tree_path_free( path );
+                return ret;
+             }
+        }
+    }
+
+    return FALSE;
+}

 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
 


@@ -3005,18 +3572,25 @@ wxDataViewCtrl::~wxDataViewCtrl()
     if (m_notifier)
         GetModel()->RemoveNotifier( m_notifier );
 
     if (m_notifier)
         GetModel()->RemoveNotifier( m_notifier );
 

+    m_cols.Clear();
+

     // remove the model from the GtkTreeView before it gets destroyed by the
     // wxDataViewCtrlBase's dtor
     gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), NULL );
     // remove the model from the GtkTreeView before it gets destroyed by the
     // wxDataViewCtrlBase's dtor
     gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), NULL );

-    
+

     delete m_internal;
 }
 
 void wxDataViewCtrl::Init()
 {
     m_notifier = NULL;
     delete m_internal;
 }
 
 void wxDataViewCtrl::Init()
 {
     m_notifier = NULL;

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

 }
 
 }
 

+static GtkTargetEntry gs_target;
+

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


@@ -3042,9 +3616,18 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
     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);
 

+    gs_target.target = const_cast<char *>("UTF8_STRING");
+    gs_target.flags = 0;
+    gs_target.info = static_cast<guint>(-1);
+    gtk_tree_view_enable_model_drag_source( GTK_TREE_VIEW(m_treeview),
+       GDK_BUTTON1_MASK, &gs_target, 1, (GdkDragAction) GDK_ACTION_COPY );
+

 #ifdef __WXGTK26__
     if (!gtk_check_version(2,6,0))
 #ifdef __WXGTK26__
     if (!gtk_check_version(2,6,0))

-        gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), TRUE );
+    {
+        bool fixed = (style & wxDV_VARIABLE_LINE_HEIGHT) == 0;
+        gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed );
+    }

 #endif
 
     if (style & wxDV_MULTIPLE)
 #endif
 
     if (style & wxDV_MULTIPLE)


@@ -3068,13 +3651,12 @@ 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_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
 
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget),
         GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);


@@ -3097,13 +3679,16 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
 
     g_signal_connect (m_treeview, "test-expand-row",
                             G_CALLBACK (wxdataview_test_expand_row_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_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;
 }
 


@@ -3122,9 +3707,26 @@ void wxDataViewCtrl::OnInternalIdle()
 
 bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
 {
 
 bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
 {

+    if (GetModel())
+    {
+        delete m_internal;
+        m_internal = NULL;
+
+        delete m_notifier;
+        m_notifier = NULL;
+    }
+

     if (!wxDataViewCtrlBase::AssociateModel( model ))
         return false;
 
     if (!wxDataViewCtrlBase::AssociateModel( model ))
         return false;
 

+#ifdef __WXGTK26__
+    if (!gtk_check_version(2,6,0))
+    {
+        bool fixed = (((GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) == 0) || (model->IsVirtualListModel()));
+        gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed );
+    }
+#endif
+

     GtkWxTreeModel *gtk_model = wxgtk_tree_model_new();
     m_internal = new wxDataViewCtrlInternal( this, model, gtk_model );
     gtk_model->internal = m_internal;
     GtkWxTreeModel *gtk_model = wxgtk_tree_model_new();
     m_internal = new wxDataViewCtrlInternal( this, model, gtk_model );
     gtk_model->internal = m_internal;


@@ -3134,7 +3736,7 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
     model->AddNotifier( m_notifier );
 
     gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_model) );
     model->AddNotifier( m_notifier );
 
     gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_model) );

-    
+

     // unref in wxDataViewCtrlInternal
     // g_object_unref( gtk_model );
 
     // unref in wxDataViewCtrlInternal
     // g_object_unref( gtk_model );
 


@@ -3148,7 +3750,16 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
 
     m_cols.Append( col );
 
 
     m_cols.Append( col );
 

-    gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), 
+#ifdef __WXGTK26__
+    if (!gtk_check_version(2,6,0))
+    {
+        if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
+               GTK_TREE_VIEW_COLUMN_FIXED)
+           gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
+    }
+#endif
+
+    gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview),

                                  GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) );
 
     return true;
                                  GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) );
 
     return true;


@@ -3161,12 +3772,43 @@ bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
 
     m_cols.Insert( col );
 
 
     m_cols.Insert( col );
 

-    gtk_tree_view_insert_column( GTK_TREE_VIEW(m_treeview), 
+#ifdef __WXGTK26__
+    if (!gtk_check_version(2,6,0))
+    {
+        if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
+               GTK_TREE_VIEW_COLUMN_FIXED)
+           gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
+    }
+#endif
+
+    gtk_tree_view_insert_column( GTK_TREE_VIEW(m_treeview),

                                  GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()), 0 );
 
     return true;
 }
 
                                  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 );
+
+#ifdef __WXGTK26__
+    if (!gtk_check_version(2,6,0))
+    {
+        if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
+               GTK_TREE_VIEW_COLUMN_FIXED)
+           gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
+    }
+#endif
+
+    gtk_tree_view_insert_column( GTK_TREE_VIEW(m_treeview),
+                                 GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()), pos );
+
+    return true;
+}
+

 unsigned int wxDataViewCtrl::GetColumnCount() const
 {
     return m_cols.GetCount();
 unsigned int wxDataViewCtrl::GetColumnCount() const
 {
     return m_cols.GetCount();


@@ -3177,9 +3819,9 @@ wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
     GtkTreeViewColumn *gtk_col = gtk_tree_view_get_column( GTK_TREE_VIEW(m_treeview), pos );
     if (!gtk_col)
         return NULL;
     GtkTreeViewColumn *gtk_col = gtk_tree_view_get_column( GTK_TREE_VIEW(m_treeview), pos );
     if (!gtk_col)
         return NULL;

-        
+

     wxDataViewColumnList::const_iterator iter;
     wxDataViewColumnList::const_iterator iter;

-    for (iter = m_cols.begin(); iter != m_cols.end(); iter++)
+    for (iter = m_cols.begin(); iter != m_cols.end(); ++iter)

     {
         wxDataViewColumn *col = *iter;
         if (GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) == gtk_col)
     {
         wxDataViewColumn *col = *iter;
         if (GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) == gtk_col)


@@ -3187,18 +3829,16 @@ wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
             return col;
         }
     }
             return col;
         }
     }

-    
+

     return NULL;
 }
 
 bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
 {
     return NULL;
 }
 
 bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
 {

-    gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview), 
+    gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview),

                                  GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()) );
 
                                  GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()) );
 

-    m_cols.remove( column );
-
-    delete column;
+    m_cols.DeleteObject( column );

 
     return true;
 }
 
     return true;
 }


@@ -3206,15 +3846,15 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
 bool wxDataViewCtrl::ClearColumns()
 {
     wxDataViewColumnList::iterator iter;
 bool wxDataViewCtrl::ClearColumns()
 {
     wxDataViewColumnList::iterator iter;

-    for (iter = m_cols.begin(); iter != m_cols.end(); iter++)
+    for (iter = m_cols.begin(); iter != m_cols.end(); ++iter)

     {
         wxDataViewColumn *col = *iter;
     {
         wxDataViewColumn *col = *iter;

-        gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview), 
+        gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview),

                                      GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) );
     }
                                      GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) );
     }

-    
-    m_cols.clear();
-    
+
+    m_cols.Clear();
+

     return true;
 }
 
     return true;
 }
 


@@ -3223,9 +3863,9 @@ int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
     GtkTreeViewColumn *gtk_column = GTK_TREE_VIEW_COLUMN(column->GetConstGtkHandle());
 
     GList *list = gtk_tree_view_get_columns( GTK_TREE_VIEW(m_treeview) );
     GtkTreeViewColumn *gtk_column = GTK_TREE_VIEW_COLUMN(column->GetConstGtkHandle());
 
     GList *list = gtk_tree_view_get_columns( GTK_TREE_VIEW(m_treeview) );

-    
+

     gint pos = g_list_index( list, (gconstpointer)  gtk_column );
     gint pos = g_list_index( list, (gconstpointer)  gtk_column );

-    
+

     g_list_free( list );
 
     return pos;
     g_list_free( list );
 
     return pos;


@@ -3257,23 +3897,23 @@ void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
 wxDataViewItem wxDataViewCtrl::GetSelection() const
 {
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 wxDataViewItem wxDataViewCtrl::GetSelection() const
 {
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );

-    
+

     if (m_windowStyle & wxDV_MULTIPLE)
     {
         // Report the first one
         GtkTreeModel *model;
         GList *list = gtk_tree_selection_get_selected_rows( selection, &model );
     if (m_windowStyle & wxDV_MULTIPLE)
     {
         // Report the first one
         GtkTreeModel *model;
         GList *list = gtk_tree_selection_get_selected_rows( selection, &model );

-    
+

         if (list)
         {
             GtkTreePath *path = (GtkTreePath*) list->data;
             GtkTreeIter iter;
             m_internal->get_iter( &iter, path );
         if (list)
         {
             GtkTreePath *path = (GtkTreePath*) list->data;
             GtkTreeIter iter;
             m_internal->get_iter( &iter, path );

-            
+

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

-            
+

             return wxDataViewItem( (void*) iter.user_data );
         }
     }
             return wxDataViewItem( (void*) iter.user_data );
         }
     }


@@ -3286,7 +3926,7 @@ wxDataViewItem wxDataViewCtrl::GetSelection() const
             return item;
         }
     }
             return item;
         }
     }

-    
+

     return wxDataViewItem(0);
 }
 
     return wxDataViewItem(0);
 }
 


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

-            
+

             GtkTreeIter iter;
             m_internal->get_iter( &iter, path );
 
             GtkTreeIter iter;
             m_internal->get_iter( &iter, path );
 


@@ -3338,11 +3978,11 @@ int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const
 void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
 {
     GtkDisableSelectionEvents();
 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 );
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 
     gtk_tree_selection_unselect_all( selection );

-    
+

     size_t i;
     for (i = 0; i < sel.GetCount(); i++)
     {
     size_t i;
     for (i = 0; i < sel.GetCount(); i++)
     {


@@ -3350,7 +3990,7 @@ void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
         iter.user_data = (gpointer) sel[i].GetID();
         gtk_tree_selection_select_iter( selection, &iter );
     }
         iter.user_data = (gpointer) sel[i].GetID();
         gtk_tree_selection_select_iter( selection, &iter );
     }

-    
+

     GtkEnableSelectionEvents();
 }
 
     GtkEnableSelectionEvents();
 }
 


@@ -3386,33 +4026,34 @@ bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const
 
     GtkTreeIter iter;
     iter.user_data = (gpointer) item.GetID();
 
     GtkTreeIter iter;
     iter.user_data = (gpointer) item.GetID();

-    
+

     return gtk_tree_selection_iter_is_selected( selection, &iter );
 }
 
 void wxDataViewCtrl::SelectAll()
 {
     GtkDisableSelectionEvents();
     return gtk_tree_selection_iter_is_selected( selection, &iter );
 }
 
 void wxDataViewCtrl::SelectAll()
 {
     GtkDisableSelectionEvents();

-    
+

     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );

-    
+

     gtk_tree_selection_select_all( selection );
     gtk_tree_selection_select_all( selection );

-    
+

     GtkEnableSelectionEvents();
 }
 
 void wxDataViewCtrl::UnselectAll()
 {
     GtkDisableSelectionEvents();
     GtkEnableSelectionEvents();
 }
 
 void wxDataViewCtrl::UnselectAll()
 {
     GtkDisableSelectionEvents();

-    
+

     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );

-    
+

     gtk_tree_selection_unselect_all( selection );
     gtk_tree_selection_unselect_all( selection );

-    
+

     GtkEnableSelectionEvents();
 }
 
     GtkEnableSelectionEvents();
 }
 

-void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn *column )
+void wxDataViewCtrl::EnsureVisible(const wxDataViewItem& item,
+                                   const wxDataViewColumn *WXUNUSED(column))

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


@@ -3421,22 +4062,24 @@ void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataVie
     gtk_tree_path_free( path );
 }
 
     gtk_tree_path_free( path );
 }
 

-void wxDataViewCtrl::HitTest( const wxPoint &point, 
-                              wxDataViewItem &item,  wxDataViewColumn *&column ) const
+void wxDataViewCtrl::HitTest(const wxPoint& WXUNUSED(point),
+                             wxDataViewItem& item,
+                             wxDataViewColumn *& column) const

 {
     item = wxDataViewItem(0);
     column = NULL;
 }
 
 {
     item = wxDataViewItem(0);
     column = NULL;
 }
 

-wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem &item, 
-                                    const wxDataViewColumn *column ) const
+wxRect
+wxDataViewCtrl::GetItemRect(const wxDataViewItem& WXUNUSED(item),
+                            const wxDataViewColumn *WXUNUSED(column)) const

 {
     return wxRect();
 }
 
 void wxDataViewCtrl::DoSetExpanderColumn()
 {
 {
     return wxRect();
 }
 
 void wxDataViewCtrl::DoSetExpanderColumn()
 {

-    gtk_tree_view_set_expander_column( GTK_TREE_VIEW(m_treeview), 
+    gtk_tree_view_set_expander_column( GTK_TREE_VIEW(m_treeview),

         GTK_TREE_VIEW_COLUMN( GetExpanderColumn()->GetGtkHandle() ) );
 }
 
         GTK_TREE_VIEW_COLUMN( GetExpanderColumn()->GetGtkHandle() ) );
 }