]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/dataview.cpp
remove wxAppConsoleBase::OInitGui and leave it only in wxApp[Base] class
[wxWidgets.git] / src / gtk / dataview.cpp
index c8ea7178d3800c9a585ed2a490fac14be7436710..6119d492348463bb72302cf18dbed125f2d179f6 100644 (file)
@@ -20,8 +20,6 @@
     #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/crt.h"
 #endif
     #include "wx/settings.h"
     #include "wx/crt.h"
 #endif
@@ -38,9 +36,7 @@
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-class wxDataViewCtrlInternal;
-
-wxDataViewCtrlInternal *g_internal = NULL;
+static wxDataViewCtrlInternal *gs_internal = NULL;
 
 class wxGtkTreeModelNode;
 
 
 class wxGtkTreeModelNode;
 
@@ -55,12 +51,13 @@ typedef struct _GtkWxTreeModel       GtkWxTreeModel;
 WX_DECLARE_LIST(wxDataViewItem, ItemList);
 WX_DEFINE_LIST(ItemList)
 
 WX_DECLARE_LIST(wxDataViewItem, ItemList);
 WX_DEFINE_LIST(ItemList)
 
-class wxDataViewCtrlInternal
+class WXDLLIMPEXP_ADV wxDataViewCtrlInternal
 {
 public:
 {
 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);
     GtkTreeModelFlags get_flags();
     gboolean get_iter( GtkTreeIter *iter, GtkTreePath *path );
     GtkTreePath *get_path( GtkTreeIter *iter);
@@ -71,10 +68,21 @@ public:
     gboolean iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n );
     gboolean iter_parent( GtkTreeIter *iter, GtkTreeIter *child );
 
     gboolean iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n );
     gboolean iter_parent( GtkTreeIter *iter, GtkTreeIter *child );
 
-    wxDataViewModel* GetDataViewModel() { return m_wx_model; }
-    wxDataViewCtrl* GetOwner()          { return m_owner; }
-    GtkWxTreeModel* GetGtkModel()       { return m_gtk_model; }
+    // dnd iface
 
 
+    bool EnableDragSource( const wxDataFormat &format );
+    bool EnableDropTarget( const wxDataFormat &format );
+
+    gboolean row_draggable( GtkTreeDragSource *drag_source, GtkTreePath *path );
+    gboolean drag_data_delete( GtkTreeDragSource *drag_source, GtkTreePath* path );
+    gboolean drag_data_get( GtkTreeDragSource *drag_source, GtkTreePath *path,
+        GtkSelectionData *selection_data );
+    gboolean drag_data_received( GtkTreeDragDest *drag_dest, GtkTreePath *dest,
+        GtkSelectionData *selection_data );
+    gboolean row_drop_possible( GtkTreeDragDest *drag_dest, GtkTreePath *dest_path,
+        GtkSelectionData *selection_data );
+
+    // notifactions from wxDataViewModel
     bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
     bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
     bool ItemChanged( const wxDataViewItem &item );
     bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
     bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
     bool ItemChanged( const wxDataViewItem &item );
@@ -82,6 +90,7 @@ public:
     bool Cleared();
     void Resort();
 
     bool Cleared();
     void Resort();
 
+    // sorting interface
     void SetSortOrder( GtkSortType sort_order ) { m_sort_order = sort_order; }
     GtkSortType GetSortOrder()                  { return m_sort_order; }
 
     void SetSortOrder( GtkSortType sort_order ) { m_sort_order = sort_order; }
     GtkSortType GetSortOrder()                  { return m_sort_order; }
 
@@ -93,6 +102,10 @@ public:
 
     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();
 
 protected:
     void InitTree();
@@ -110,6 +123,14 @@ private:
     GtkSortType           m_sort_order;
     wxDataViewColumn     *m_dataview_sort_column;
     int                   m_sort_column;
     GtkSortType           m_sort_order;
     wxDataViewColumn     *m_dataview_sort_column;
     int                   m_sort_column;
+
+    GtkTargetEntry        m_dragSourceTargetEntry;
+    wxCharBuffer          m_dragSourceTargetEntryTarget;
+    wxDataObject         *m_dragDataObject;
+
+    GtkTargetEntry        m_dropTargetTargetEntry;
+    wxCharBuffer          m_dropTargetTargetEntryTarget;
+    wxDataObject         *m_dropDataObject;
 };
 
 
 };
 
 
@@ -117,10 +138,11 @@ private:
 // wxGtkTreeModelNode
 //-----------------------------------------------------------------------------
 
 // wxGtkTreeModelNode
 //-----------------------------------------------------------------------------
 
+static
 int LINKAGEMODE wxGtkTreeModelChildCmp( void** id1, void** id2 )
 {
 int LINKAGEMODE wxGtkTreeModelChildCmp( void** id1, void** id2 )
 {
-    int ret = g_internal->GetDataViewModel()->Compare( *id1, *id2,
-        g_internal->GetSortColumn(), (g_internal->GetSortOrder() == GTK_SORT_ASCENDING) );
+    int ret = gs_internal->GetDataViewModel()->Compare( *id1, *id2,
+        gs_internal->GetSortColumn(), (gs_internal->GetSortOrder() == GTK_SORT_ASCENDING) );
 
     return ret;
 }
 
     return ret;
 }
@@ -141,7 +163,7 @@ public:
 
     ~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++)
         {
@@ -160,7 +182,7 @@ public:
 
             if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare())
             {
 
             if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare())
             {
-                g_internal = m_internal;
+                gs_internal = m_internal;
                 m_children.Sort( &wxGtkTreeModelChildCmp );
                 return m_children.Index( id );
             }
                 m_children.Sort( &wxGtkTreeModelChildCmp );
                 return m_children.Index( id );
             }
@@ -174,7 +196,7 @@ public:
 
             if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare())
             {
 
             if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare())
             {
-                g_internal = m_internal;
+                gs_internal = m_internal;
                 m_children.Sort( &wxGtkTreeModelChildCmp );
                 return m_children.Index( id );
             }
                 m_children.Sort( &wxGtkTreeModelChildCmp );
                 return m_children.Index( id );
             }
@@ -265,8 +287,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);
@@ -300,22 +326,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;
@@ -354,6 +394,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 );
 
@@ -363,6 +417,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;
@@ -410,6 +470,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)
 {
@@ -460,6 +535,8 @@ wxgtk_tree_model_get_column_type (GtkTreeModel *tree_model,
 
     wxString wxtype = wxtree_model->internal->GetDataViewModel()->GetColumnType( (unsigned int) index );
 
 
     wxString wxtype = wxtree_model->internal->GetDataViewModel()->GetColumnType( (unsigned int) index );
 
+    wxPrintf( "get_column_type %s\n", wxtype );
+
     if (wxtype == wxT("string"))
         gtype = G_TYPE_STRING;
     else
     if (wxtype == wxT("string"))
         gtype = G_TYPE_STRING;
     else
@@ -525,13 +602,13 @@ 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);
     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);
-    
+
     return wxtree_model->internal->iter_next( iter );
 }
 
     return wxtree_model->internal->iter_next( iter );
 }
 
@@ -564,8 +641,10 @@ wxgtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
-    g_return_val_if_fail (wxtree_model->stamp == iter->stamp, 0);
-
+    
+    if (iter != NULL)
+        g_return_val_if_fail (wxtree_model->stamp == iter->stamp, 0);
+        
     return wxtree_model->internal->iter_n_children( iter );
 }
 
     return wxtree_model->internal->iter_n_children( iter );
 }
 
@@ -593,16 +672,86 @@ wxgtk_tree_model_iter_parent (GtkTreeModel *tree_model,
     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;
@@ -612,19 +761,20 @@ gboolean wxgtk_tree_model_get_sort_column_id    (GtkTreeSortable        *sortabl
 
 
     if (sort_column_id)
 
 
     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) );
 {
     GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable;
     g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
@@ -654,11 +804,12 @@ void     wxgtk_tree_model_set_sort_column_id  (GtkTreeSortable        *sortable,
     gs_lastLeftClickHeader = NULL;
 }
 
     gs_lastLeftClickHeader = NULL;
 }
 
-void     wxgtk_tree_model_set_sort_func         (GtkTreeSortable          *sortable,
-                                                gint                      WXUNUSED(sort_column_id),
-                                                GtkTreeIterCompareFunc    func,
-                                                gpointer                  WXUNUSED(data),
-                                                GtkDestroyNotify          WXUNUSED(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);
@@ -678,7 +829,7 @@ void     wxgtk_tree_model_set_default_sort_func (GtkTreeSortable          *sorta
 gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable        *sortable)
 {
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE );
 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;
 }
 
@@ -836,9 +987,15 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
     wxDataViewCustomRenderer *cell = wxrenderer->cell;
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
     wxDataViewCustomRenderer *cell = wxrenderer->cell;
+
+    // Renderer doesn't support in-place editing
     if (!cell->HasEditorCtrl())
         return NULL;
 
     if (!cell->HasEditorCtrl())
         return NULL;
 
+    // An in-place editing control is still around
+    if (cell->GetEditorCtrl())
+        return NULL;
+
     GdkRectangle rect;
     gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
                                    &rect.x,
     GdkRectangle rect;
     gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
                                    &rect.x,
@@ -948,11 +1105,10 @@ gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
         wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
         wxWindowDC* dc = (wxWindowDC*) cell->GetDC();
         wxWindowDCImpl *impl = (wxWindowDCImpl *) dc->GetImpl();
         wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
         wxWindowDC* dc = (wxWindowDC*) cell->GetDC();
         wxWindowDCImpl *impl = (wxWindowDCImpl *) dc->GetImpl();
-        if (impl->m_gdkwindow == NULL)
-        {
-            impl->m_gdkwindow = window;
-            impl->SetUpDC();
-        }
+        // Reinitilise GDK window everytime as drawing can also
+        // be done into DnD drop window.
+        impl->m_gdkwindow = window;
+        impl->SetUpDC();
 
         int state = 0;
         if (flags & GTK_CELL_RENDERER_SELECTED)
 
         int state = 0;
         if (flags & GTK_CELL_RENDERER_SELECTED)
@@ -1033,12 +1189,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;
@@ -1192,14 +1342,14 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig
 bool wxGtkDataViewModelNotifier::Cleared()
 {
     gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->m_treeview), NULL );
 bool wxGtkDataViewModelNotifier::Cleared()
 {
     gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->m_treeview), NULL );
-    
+
     // this will create a new GTK model
     m_owner->GtkGetInternal()->Cleared();
     // this will create a new GTK model
     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) );
     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;
 }
 
@@ -1279,15 +1429,21 @@ 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
@@ -1307,15 +1463,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 );
@@ -1323,8 +1485,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;
@@ -1354,40 +1529,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
@@ -1401,7 +1552,7 @@ static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
 static void wxGtkTextRendererEditedCallback( GtkCellRendererText *WXUNUSED(renderer),
     gchar *arg1, gchar *arg2, gpointer user_data )
 {
 static void wxGtkTextRendererEditedCallback( GtkCellRendererText *WXUNUSED(renderer),
     gchar *arg1, gchar *arg2, gpointer user_data )
 {
-    wxDataViewTextRenderer *cell = (wxDataViewTextRenderer*) user_data;
+    wxDataViewRenderer *cell = (wxDataViewRenderer*) user_data;
 
     wxString tmp = wxGTK_CONV_BACK_FONT(arg2, cell->GetOwner()->GetOwner()->GetFont());
     wxVariant value = tmp;
 
     wxString tmp = wxGTK_CONV_BACK_FONT(arg2, cell->GetOwner()->GetOwner()->GetFont());
     wxVariant value = tmp;
@@ -1453,7 +1604,7 @@ bool wxDataViewTextRenderer::SetValue( const wxVariant &value )
 
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_STRING );
 
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_STRING );
-    g_value_set_string( &gvalue, wxGTK_CONV( tmp ) );
+    g_value_set_string( &gvalue, wxGTK_CONV_FONT( tmp, GetOwner()->GetOwner()->GetFont() ) );
     g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
     g_value_unset( &gvalue );
 
     g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
     g_value_unset( &gvalue );
 
@@ -1465,7 +1616,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( g_value_get_string( &gvalue ) );
+    wxString tmp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ), const_cast<wxDataViewTextRenderer*>(this)->GetOwner()->GetOwner()->GetFont() );
     g_value_unset( &gvalue );
 
     value = tmp;
     g_value_unset( &gvalue );
 
     value = tmp;
@@ -1674,10 +1825,10 @@ public:
         GtkWidget *widget = window->m_treeview;
         // Set later
         m_gdkwindow = NULL;
         GtkWidget *widget = window->m_treeview;
         // Set later
         m_gdkwindow = NULL;
-        
+
         m_window = window;
 
         m_window = window;
 
-        m_context = window->GtkGetPangoDefaultContext();
+        m_context = window->GTKGetPangoDefaultContext();
         m_layout = pango_layout_new( m_context );
         m_fontdesc = pango_font_description_copy( widget->style->font_desc );
 
         m_layout = pango_layout_new( m_context );
         m_fontdesc = pango_font_description_copy( widget->style->font_desc );
 
@@ -1693,9 +1844,9 @@ class wxDataViewCtrlDC: public wxWindowDC
 public:
     wxDataViewCtrlDC( wxDataViewCtrl *window ) :
         wxWindowDC( new wxDataViewCtrlDCImpl( this, window ) )
 public:
     wxDataViewCtrlDC( wxDataViewCtrl *window ) :
         wxWindowDC( new wxDataViewCtrlDCImpl( this, window ) )
-        { } 
+        { }
 };
 };
-    
+
 
 // ---------------------------------------------------------
 // wxDataViewCustomRenderer
 
 // ---------------------------------------------------------
 // wxDataViewCustomRenderer
@@ -1717,7 +1868,8 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
         Init(mode, align);
 }
 
         Init(mode, align);
 }
 
-void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, wxRect cell, wxDC *dc, int state )
+void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset,
+                                           wxRect WXUNUSED(cell), wxDC *WXUNUSED(dc), int WXUNUSED(state) )
 {
 #if 0
     wxDataViewCtrl *view = GetOwner()->GetOwner();
 {
 #if 0
     wxDataViewCtrl *view = GetOwner()->GetOwner();
@@ -1732,7 +1884,7 @@ void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, wx
 
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_STRING );
 
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_STRING );
-    g_value_set_string( &gvalue, wxGTK_CONV( text ) );
+    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 );
 
     g_object_set_property( G_OBJECT(m_text_renderer), "text", &gvalue );
     g_value_unset( &gvalue );
 
@@ -1811,7 +1963,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 );
 
-        g_value_set_string( &gvalue, wxGTK_CONV(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 );
 
@@ -1854,12 +2006,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;
@@ -1880,6 +2032,120 @@ wxSize wxDataViewProgressRenderer::GetSize() const
     return wxSize(40,12);
 }
 
     return wxSize(40,12);
 }
 
+// -------------------------------------
+// wxDataViewChoiceRenderer
+// -------------------------------------
+
+wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString &choices,
+                            wxDataViewCellMode mode, int alignment  ) :
+    wxDataViewCustomRenderer( "string", mode, alignment, true )
+{
+   m_choices = choices;
+
+#ifdef __WXGTK26__
+    if (!gtk_check_version(2,6,0))
+    {
+        m_renderer = (GtkCellRenderer*) gtk_cell_renderer_combo_new();
+
+        GtkListStore *store = gtk_list_store_new( 1, G_TYPE_STRING );
+        size_t n;
+        for (n = 0; n < m_choices.GetCount(); n++)
+            gtk_list_store_insert_with_values( store, NULL, n, 0, m_choices[n].utf8_str(), -1 );
+
+        g_object_set (m_renderer,
+                "model", store,
+                "text-column", 0,
+                "has-entry", FALSE,
+                NULL);
+
+        bool editable = (mode & wxDATAVIEW_CELL_EDITABLE);
+        g_object_set (m_renderer, "editable", editable, NULL);
+
+        SetAlignment(alignment);
+
+        g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this );
+
+        GtkInitHandlers();
+    }
+    else
+#endif
+    {
+        // Use custom cell code
+        wxDataViewCustomRenderer::Init(mode, alignment);
+    }
+}
+
+bool wxDataViewChoiceRenderer::Render( wxRect rect, wxDC *dc, int state )
+{
+    RenderText( m_data, 0, rect, dc, state );
+    return true;
+}
+
+wxSize wxDataViewChoiceRenderer::GetSize() const
+{
+    return wxSize(70,20);
+}
+
+bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value )
+{
+
+#ifdef __WXGTK26__
+    if (!gtk_check_version(2,6,0))
+    {
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, G_TYPE_STRING );
+        g_value_set_string( &gvalue, wxGTK_CONV_FONT( value.GetString(), GetOwner()->GetOwner()->GetFont() ) );
+        g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
+        g_value_unset( &gvalue );
+    }
+    else
+#endif
+        m_data = value.GetString();
+
+    return true;
+}
+
+bool wxDataViewChoiceRenderer::GetValue( wxVariant &value ) const
+{
+#ifdef __WXGTK26__
+    if (!gtk_check_version(2,6,0))
+    {
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, G_TYPE_STRING );
+        g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );
+        wxString temp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ), const_cast<wxDataViewTextRenderer*>(this)->GetOwner()->GetOwner()->GetFont() );
+        g_value_unset( &gvalue );
+        value = temp;
+        wxPrintf( "temp %s\n", temp );
+    }
+    else
+#endif
+        value = m_data;
+
+    return true;
+}
+
+void wxDataViewChoiceRenderer::SetAlignment( int align )
+{
+    wxDataViewCustomRenderer::SetAlignment(align);
+
+    if (gtk_check_version(2,10,0))
+        return;
+
+    // horizontal alignment:
+    PangoAlignment pangoAlign = PANGO_ALIGN_LEFT;
+    if (align & wxALIGN_RIGHT)
+        pangoAlign = PANGO_ALIGN_RIGHT;
+    else if (align & wxALIGN_CENTER_HORIZONTAL)
+        pangoAlign = PANGO_ALIGN_CENTER;
+
+    GValue gvalue = { 0, };
+    g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() );
+    g_value_set_enum( &gvalue, pangoAlign );
+    g_object_set_property( G_OBJECT(m_renderer), "alignment", &gvalue );
+    g_value_unset( &gvalue );
+}
+
 // ---------------------------------------------------------
 // wxDataViewDateRenderer
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxDataViewDateRenderer
 // ---------------------------------------------------------
@@ -1946,7 +2212,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;
 }
@@ -1967,7 +2233,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;
@@ -2009,7 +2275,7 @@ bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )
     return true;
 }
 
     return true;
 }
 
-bool wxDataViewIconTextRenderer::GetValue( wxVariant &value ) const
+bool wxDataViewIconTextRenderer::GetValue( wxVariant &WXUNUSED(value) ) const
 {
     return false;
 }
 {
     return false;
 }
@@ -2042,12 +2308,14 @@ wxSize wxDataViewIconTextRenderer::GetSize() const
     return size;
 }
 
     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;
 }
@@ -2058,7 +2326,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 )
 {
@@ -2068,7 +2336,7 @@ 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 );
         wxDataViewCtrl *dv = column->GetOwner();
         wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() );
         event.SetDataViewColumn( column );
@@ -2099,7 +2367,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,
@@ -2114,7 +2382,7 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
 
     wxDataViewModel *wx_model = tree_model->internal->GetDataViewModel();
 
 
     wxDataViewModel *wx_model = tree_model->internal->GetDataViewModel();
 
-    if (!wx_model->IsIndexListModel())
+    if (!wx_model->IsVirtualListModel())
     {
 
     if (wx_model->IsContainer( item ))
     {
 
     if (wx_model->IsContainer( item ))
@@ -2258,26 +2526,23 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
 
 }
 
 
 }
 
-IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
-
 #include <wx/listimpl.cpp>
 WX_DEFINE_LIST(wxDataViewColumnList)
 
 wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell,
                                     unsigned int model_column, int width,
 #include <wx/listimpl.cpp>
 WX_DEFINE_LIST(wxDataViewColumnList)
 
 wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell,
                                     unsigned int model_column, int width,
-                                    wxAlignment align, int flags ) :
-    wxDataViewColumnBase( title, cell, model_column, width, align, flags )
+                                    wxAlignment align, int flags )
+    : wxDataViewColumnBase( cell, model_column )
 {
     Init( align, flags, width );
 
 {
     Init( align, flags, width );
 
-    gtk_tree_view_column_set_clickable( GTK_TREE_VIEW_COLUMN(m_column), TRUE );
     SetTitle( title );
 }
 
 wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell,
                                     unsigned int model_column, int width,
     SetTitle( title );
 }
 
 wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell,
                                     unsigned int model_column, int width,
-                                    wxAlignment align, int flags ) :
-    wxDataViewColumnBase( bitmap, cell, model_column, width, align, flags )
+                                    wxAlignment align, int flags )
+    : wxDataViewColumnBase( bitmap, cell, model_column )
 {
     Init( align, flags, width );
 
 {
     Init( align, flags, width );
 
@@ -2295,14 +2560,17 @@ 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
+    SetWidth( width );
 
 
-    // the GTK_TREE_VIEW_COLUMN_FIXED is required by the "fixed height" mode
-    // that we use for the wxDataViewCtrl
-    gtk_tree_view_column_set_fixed_width( column, width < 0 ? wxDVC_DEFAULT_WIDTH : width );
-    gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED );
+    // Create container for icon and label
+    GtkWidget *box = gtk_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_pack_end( column, renderer, TRUE );
 
@@ -2310,10 +2578,6 @@ void wxDataViewColumn::Init(wxAlignment align, int flags, int width)
         wxGtkTreeCellDataFunc, (gpointer) GetRenderer(), NULL );
 }
 
         wxGtkTreeCellDataFunc, (gpointer) GetRenderer(), NULL );
 }
 
-wxDataViewColumn::~wxDataViewColumn()
-{
-}
-
 void wxDataViewColumn::OnInternalIdle()
 {
     if (m_isConnected)
 void wxDataViewColumn::OnInternalIdle()
 {
     if (m_isConnected)
@@ -2343,41 +2607,32 @@ void wxDataViewColumn::SetOwner( wxDataViewCtrl *owner )
 
 void wxDataViewColumn::SetTitle( const wxString &title )
 {
 
 void wxDataViewColumn::SetTitle( const wxString &title )
 {
-    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
-
-    if (m_isConnected)
-    {
-        // disconnect before column->button gets recreated
-        g_signal_handlers_disconnect_by_func( column->button,
-                      (GtkWidget*) gtk_dataview_header_button_press_callback, this);
-
-        m_isConnected = false;
-    }
-
-    // FIXME: can it really happen that we don't have the owner here??
     wxDataViewCtrl *ctrl = GetOwner();
     wxDataViewCtrl *ctrl = GetOwner();
-    gtk_tree_view_column_set_title( column, ctrl ? wxGTK_CONV_FONT(title, ctrl->GetFont())
+    gtk_label_set_text( GTK_LABEL(m_label), ctrl ? wxGTK_CONV_FONT(title, ctrl->GetFont())
                                                  : wxGTK_CONV_SYS(title) );
                                                  : wxGTK_CONV_SYS(title) );
-
-    gtk_tree_view_column_set_widget( column, NULL );
+    if (title.empty())
+        gtk_widget_hide( m_label );
+    else
+        gtk_widget_show( m_label );
 }
 
 wxString wxDataViewColumn::GetTitle() const
 {
 }
 
 wxString wxDataViewColumn::GetTitle() const
 {
-    const gchar *str = gtk_tree_view_column_get_title( GTK_TREE_VIEW_COLUMN(m_column) );
-    return wxConvFileName->cMB2WX(str);
+    return wxGTK_CONV_BACK_FONT(
+            gtk_label_get_text( GTK_LABEL(m_label) ),
+            GetOwner()->GetFont()
+           );
 }
 
 void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap )
 {
     wxDataViewColumnBase::SetBitmap( bitmap );
 
 }
 
 void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap )
 {
     wxDataViewColumnBase::SetBitmap( bitmap );
 
-    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
     if (bitmap.Ok())
     {
     if (bitmap.Ok())
     {
-        GtkImage *gtk_image = GTK_IMAGE( gtk_image_new() );
+        GtkImage *gtk_image = GTK_IMAGE(m_image);
 
 
-        GdkBitmap *mask = (GdkBitmap *) NULL;
+        GdkBitmap *mask = NULL;
         if (bitmap.GetMask())
             mask = bitmap.GetMask()->GetBitmap();
 
         if (bitmap.GetMask())
             mask = bitmap.GetMask()->GetBitmap();
 
@@ -2391,13 +2646,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 );
     }
 }
 
     }
 }
 
@@ -2423,6 +2676,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
@@ -2441,7 +2697,7 @@ void wxDataViewColumn::SetSortable( bool sortable )
 {
     GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
 
 {
     GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
 
-    if (sortable)
+    if ( sortable )
     {
         gtk_tree_view_column_set_sort_column_id( column, GetModelColumn() );
     }
     {
         gtk_tree_view_column_set_sort_column_id( column, GetModelColumn() );
     }
@@ -2449,13 +2705,28 @@ void wxDataViewColumn::SetSortable( bool sortable )
     {
         gtk_tree_view_column_set_sort_column_id( column, -1 );
         gtk_tree_view_column_set_sort_indicator( column, FALSE );
     {
         gtk_tree_view_column_set_sort_column_id( column, -1 );
         gtk_tree_view_column_set_sort_indicator( column, FALSE );
+        gtk_tree_view_column_set_clickable( column, FALSE );
     }
 }
 
 bool wxDataViewColumn::IsSortable() const
 {
     GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
     }
 }
 
 bool wxDataViewColumn::IsSortable() const
 {
     GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
-    return (gtk_tree_view_column_get_sort_column_id( column ) != -1);
+    return gtk_tree_view_column_get_clickable( column );
+}
+
+void wxDataViewColumn::SetAsSortKey( bool WXUNUSED(sort) )
+{
+    // it might not make sense to have this function in wxHeaderColumn at
+    // all in fact, changing of the sort order should only be done using the
+    // associated control API
+    wxFAIL_MSG( "not implemented" );
+}
+
+bool wxDataViewColumn::IsSortKey() const
+{
+    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+    return gtk_tree_view_column_get_sort_indicator( column );
 }
 
 bool wxDataViewColumn::IsResizeable() const
 }
 
 bool wxDataViewColumn::IsResizeable() const
@@ -2506,9 +2777,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
@@ -2535,7 +2833,7 @@ void wxGtkTreeModelNode::Resort()
     wxGtkTreeModelChildren temp;
     WX_APPEND_ARRAY( temp, m_children );
 
     wxGtkTreeModelChildren temp;
     WX_APPEND_ARRAY( temp, m_children );
 
-    g_internal = m_internal;
+    gs_internal = m_internal;
     m_children.Sort( &wxGtkTreeModelChildCmp );
 
     gint *new_order = new gint[child_count];
     m_children.Sort( &wxGtkTreeModelChildCmp );
 
     gint *new_order = new gint[child_count];
@@ -2584,13 +2882,19 @@ wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner,
     m_sort_column = -1;
     m_dataview_sort_column = NULL;
 
     m_sort_column = -1;
     m_dataview_sort_column = NULL;
 
-    if (!m_wx_model->IsIndexListModel())
+    m_dragDataObject = NULL;
+    m_dropDataObject = NULL;
+
+    if (!m_wx_model->IsVirtualListModel())
         InitTree();
 }
 
 wxDataViewCtrlInternal::~wxDataViewCtrlInternal()
 {
     g_object_unref( m_gtk_model );
         InitTree();
 }
 
 wxDataViewCtrlInternal::~wxDataViewCtrlInternal()
 {
     g_object_unref( m_gtk_model );
+
+    delete m_dragDataObject;
+    delete m_dropDataObject;
 }
 
 void wxDataViewCtrlInternal::InitTree()
 }
 
 void wxDataViewCtrlInternal::InitTree()
@@ -2622,31 +2926,178 @@ void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node )
     }
 }
 
     }
 }
 
+// GTK+ dnd iface
+
+bool wxDataViewCtrlInternal::EnableDragSource( const wxDataFormat &format )
+{
+    wxGtkString atom_str( gdk_atom_name( format  ) );
+    m_dragSourceTargetEntryTarget = wxCharBuffer( atom_str );
+
+    m_dragSourceTargetEntry.target =  m_dragSourceTargetEntryTarget.data();
+    m_dragSourceTargetEntry.flags = 0;
+    m_dragSourceTargetEntry.info = static_cast<guint>(-1);
+
+    gtk_tree_view_enable_model_drag_source( GTK_TREE_VIEW(m_owner->GtkGetTreeView() ),
+       GDK_BUTTON1_MASK, &m_dragSourceTargetEntry, 1, (GdkDragAction) GDK_ACTION_COPY );
+
+    return true;
+}
+
+bool wxDataViewCtrlInternal::EnableDropTarget( const wxDataFormat &format )
+{
+    wxGtkString atom_str( gdk_atom_name( format  ) );
+    m_dropTargetTargetEntryTarget = wxCharBuffer( atom_str );
+
+    m_dropTargetTargetEntry.target =  m_dropTargetTargetEntryTarget.data();
+    m_dropTargetTargetEntry.flags = 0;
+    m_dropTargetTargetEntry.info = static_cast<guint>(-1);
+
+    gtk_tree_view_enable_model_drag_dest( GTK_TREE_VIEW(m_owner->GtkGetTreeView() ),
+       &m_dropTargetTargetEntry, 1, (GdkDragAction) GDK_ACTION_COPY );
+
+    return true;
+}
+
+gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag_source),
+    GtkTreePath *path )
+{
+    delete m_dragDataObject;
+
+    GtkTreeIter iter;
+    if (!get_iter( &iter, path )) return FALSE;
+    wxDataViewItem item( (void*) iter.user_data );
+
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() );
+    event.SetEventObject( m_owner );
+    event.SetItem( item );
+    event.SetModel( m_wx_model );
+    if (!m_owner->HandleWindowEvent( event ))
+        return FALSE;
+
+    if (!event.IsAllowed())
+        return FALSE;
+
+    wxDataObject *obj = event.GetDataObject();
+    if (!obj)
+        return FALSE;
+
+    m_dragDataObject = obj;
+
+    return TRUE;
+}
+
+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 );
+
+    if (!m_dragDataObject->IsSupported( selection_data->target ))
+        return FALSE;
+
+    size_t size = m_dragDataObject->GetDataSize( selection_data->target );
+    if (size == 0)
+        return FALSE;
+
+    void *buf = malloc( size );
+
+    gboolean res = FALSE;
+    if (m_dragDataObject->GetDataHere( selection_data->target, buf ))
+    {
+        res = TRUE;
+
+        gtk_selection_data_set( selection_data, selection_data->target,
+            8, (const guchar*) buf, size );
+    }
+
+    free( buf );
+
+    return res;
+}
+
+gboolean
+wxDataViewCtrlInternal::drag_data_received(GtkTreeDragDest *WXUNUSED(drag_dest),
+                                           GtkTreePath *path,
+                                           GtkSelectionData *selection_data)
+{
+    GtkTreeIter iter;
+    if (!get_iter( &iter, path )) return FALSE;
+    wxDataViewItem item( (void*) iter.user_data );
+
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, m_owner->GetId() );
+    event.SetEventObject( m_owner );
+    event.SetItem( item );
+    event.SetModel( m_wx_model );
+    event.SetDataFormat( selection_data->target );
+    event.SetDataSize( selection_data->length );
+    event.SetDataBuffer( selection_data->data );
+    if (!m_owner->HandleWindowEvent( event ))
+        return FALSE;
+
+    if (!event.IsAllowed())
+        return FALSE;
+
+    return TRUE;
+}
+
+gboolean
+wxDataViewCtrlInternal::row_drop_possible(GtkTreeDragDest *WXUNUSED(drag_dest),
+                                          GtkTreePath *path,
+                                          GtkSelectionData *selection_data)
+{
+    GtkTreeIter iter;
+    if (!get_iter( &iter, path )) return FALSE;
+    wxDataViewItem item( (void*) iter.user_data );
+
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
+    event.SetEventObject( m_owner );
+    event.SetItem( item );
+    event.SetModel( m_wx_model );
+    event.SetDataFormat( selection_data->target );
+    if (!m_owner->HandleWindowEvent( event ))
+        return FALSE;
+
+    if (!event.IsAllowed())
+        return FALSE;
+
+    return TRUE;
+}
+
+// notifications from wxDataViewModel
+
 bool wxDataViewCtrlInternal::Cleared()
 {
     if (m_root)
     {
         delete m_root;
         InitTree();
 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;
     // 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()
 {
     return true;
 }
 
 void wxDataViewCtrlInternal::Resort()
 {
-    if (!m_wx_model->IsIndexListModel())
+    if (!m_wx_model->IsVirtualListModel())
         m_root->Resort();
 }
 
 bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
 {
         m_root->Resort();
 }
 
 bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
 {
-    if (!m_wx_model->IsIndexListModel())
+    if (!m_wx_model->IsVirtualListModel())
     {
         wxGtkTreeModelNode *parent_node = FindNode( parent );
         if (m_wx_model->IsContainer( item ))
     {
         wxGtkTreeModelNode *parent_node = FindNode( parent );
         if (m_wx_model->IsContainer( item ))
@@ -2660,7 +3111,7 @@ bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDa
 
 bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
 {
 
 bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
 {
-    if (!m_wx_model->IsIndexListModel())
+    if (!m_wx_model->IsVirtualListModel())
     {
         wxGtkTreeModelNode *parent_node = FindNode( parent );
         parent_node->DeleteChild( item.GetID() );
     {
         wxGtkTreeModelNode *parent_node = FindNode( parent );
         parent_node->DeleteChild( item.GetID() );
@@ -2693,9 +3144,11 @@ bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned
     return true;
 }
 
     return true;
 }
 
+// GTK+ model iface
+
 GtkTreeModelFlags wxDataViewCtrlInternal::get_flags()
 {
 GtkTreeModelFlags wxDataViewCtrlInternal::get_flags()
 {
-    if (m_wx_model->IsIndexListModel())
+    if (m_wx_model->IsVirtualListModel())
         return GTK_TREE_MODEL_LIST_ONLY;
     else
         return GTK_TREE_MODEL_ITERS_PERSIST;
         return GTK_TREE_MODEL_LIST_ONLY;
     else
         return GTK_TREE_MODEL_ITERS_PERSIST;
@@ -2703,7 +3156,7 @@ GtkTreeModelFlags wxDataViewCtrlInternal::get_flags()
 
 gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path )
 {
 
 gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path )
 {
-    if (m_wx_model->IsIndexListModel())
+    if (m_wx_model->IsVirtualListModel())
     {
         wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
 
     {
         wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
 
@@ -2763,7 +3216,7 @@ GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter )
 {
     GtkTreePath *retval = gtk_tree_path_new ();
 
 {
     GtkTreePath *retval = gtk_tree_path_new ();
 
-    if (m_wx_model->IsIndexListModel())
+    if (m_wx_model->IsVirtualListModel())
     {
         // user_data is just the index
         int i = (wxUIntPtr) iter->user_data;
     {
         // user_data is just the index
         int i = (wxUIntPtr) iter->user_data;
@@ -2790,7 +3243,7 @@ GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter )
 
 gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter )
 {
 
 gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter )
 {
-    if (m_wx_model->IsIndexListModel())
+    if (m_wx_model->IsVirtualListModel())
     {
         wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
 
     {
         wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
 
@@ -2824,7 +3277,7 @@ gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter )
 
 gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *parent )
 {
 
 gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *parent )
 {
-    if (m_wx_model->IsIndexListModel())
+    if (m_wx_model->IsVirtualListModel())
     {
         // this is a list, nodes have no children
         if (parent)
     {
         // this is a list, nodes have no children
         if (parent)
@@ -2857,7 +3310,7 @@ gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *
 
 gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter )
 {
 
 gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter )
 {
-    if (m_wx_model->IsIndexListModel())
+    if (m_wx_model->IsVirtualListModel())
     {
         // this is a list, nodes have no children
         return FALSE;
     {
         // this is a list, nodes have no children
         return FALSE;
@@ -2880,7 +3333,7 @@ gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter )
 
 gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter )
 {
 
 gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter )
 {
-    if (m_wx_model->IsIndexListModel())
+    if (m_wx_model->IsVirtualListModel())
     {
         wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
 
     {
         wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
 
@@ -2891,6 +3344,9 @@ gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter )
     }
     else
     {
     }
     else
     {
+        if (iter == NULL)
+            return m_root->GetChildCount();
+            
         wxDataViewItem item( (void*) iter->user_data );
 
         if (!m_wx_model->IsContainer( item ))
         wxDataViewItem item( (void*) iter->user_data );
 
         if (!m_wx_model->IsContainer( item ))
@@ -2907,7 +3363,7 @@ gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter )
 
 gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n )
 {
 
 gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n )
 {
-    if (m_wx_model->IsIndexListModel())
+    if (m_wx_model->IsVirtualListModel())
     {
         wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
 
     {
         wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
 
@@ -2948,7 +3404,7 @@ gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter
 
 gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *child )
 {
 
 gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *child )
 {
-    if (m_wx_model->IsIndexListModel())
+    if (m_wx_model->IsVirtualListModel())
     {
         return FALSE;
     }
     {
         return FALSE;
     }
@@ -3128,7 +3584,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;
@@ -3140,8 +3596,8 @@ wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCt
 }
 
 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() );
 
@@ -3154,8 +3610,8 @@ wxdataview_row_activated_callback( GtkTreeView* treeview, GtkTreePath *path,
 }
 
 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() );
 
 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, dv->GetId() );
 
@@ -3168,8 +3624,8 @@ wxdataview_test_expand_row_callback( GtkTreeView* treeview, GtkTreeIter* iter,
 }
 
 static void
 }
 
 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() );
 
 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, dv->GetId() );
 
@@ -3180,8 +3636,8 @@ wxdataview_row_expanded_callback( GtkTreeView* treeview, GtkTreeIter* iter,
 }
 
 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() );
 
 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, dv->GetId() );
 
@@ -3194,8 +3650,8 @@ wxdataview_test_collapse_row_callback( GtkTreeView* treeview, GtkTreeIter* iter,
 }
 
 static void
 }
 
 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() );
 
 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, dv->GetId() );
 
@@ -3209,14 +3665,9 @@ wxdataview_row_collapsed_callback( GtkTreeView* treeview, GtkTreeIter* iter,
     // wxDataViewCtrl
 //-----------------------------------------------------------------------------
 
     // wxDataViewCtrl
 //-----------------------------------------------------------------------------
 
-//-----------------------------------------------------------------------------
-// InsertChild for wxDataViewCtrl
-//-----------------------------------------------------------------------------
-
-static void wxInsertChildInDataViewCtrl( wxWindowGTK* parent, wxWindowGTK* child )
+void wxDataViewCtrl::AddChildGTK(wxWindowGTK* child)
 {
 {
-    wxDataViewCtrl * dvc = (wxDataViewCtrl*) parent;
-    GtkWidget *treeview = dvc->GtkGetTreeView();
+    GtkWidget* treeview = GtkGetTreeView();
 
     // Insert widget in GtkTreeView
     if (GTK_WIDGET_REALIZED(treeview))
 
     // Insert widget in GtkTreeView
     if (GTK_WIDGET_REALIZED(treeview))
@@ -3227,7 +3678,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();
@@ -3255,7 +3706,7 @@ void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget),
 //-----------------------------------------------------------------------------
 
 static gboolean
 //-----------------------------------------------------------------------------
 
 static gboolean
-gtk_dataview_motion_notify_callback( GtkWidget *widget,
+gtk_dataview_motion_notify_callback( GtkWidget *WXUNUSED(widget),
                                      GdkEventMotion *gdk_event,
                                      wxDataViewCtrl *dv )
 {
                                      GdkEventMotion *gdk_event,
                                      wxDataViewCtrl *dv )
 {
@@ -3345,6 +3796,8 @@ 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 );
@@ -3356,6 +3809,8 @@ void wxDataViewCtrl::Init()
 {
     m_notifier = NULL;
     m_internal = NULL;
 {
     m_notifier = NULL;
     m_internal = NULL;
+
+    m_cols.DeleteContents( true );
 }
 
 bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
@@ -3371,11 +3826,10 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
         return false;
     }
 
         return false;
     }
 
-    m_insertCallback = wxInsertChildInDataViewCtrl;
-
     m_widget = gtk_scrolled_window_new (NULL, NULL);
     m_widget = gtk_scrolled_window_new (NULL, NULL);
+    g_object_ref(m_widget);
 
 
-    GtkScrolledWindowSetBorder(m_widget, style);
+    GTKScrolledWindowSetBorder(m_widget, style);
 
     m_treeview = gtk_tree_view_new();
     gtk_container_add (GTK_CONTAINER (m_widget), m_treeview);
 
     m_treeview = gtk_tree_view_new();
     gtk_container_add (GTK_CONTAINER (m_widget), m_treeview);
@@ -3385,7 +3839,10 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
 
 #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)
@@ -3417,7 +3874,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
     gtk_tree_view_set_rules_hint( GTK_TREE_VIEW(m_treeview), (style & wxDV_ROW_LINES) != 0 );
 
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget),
     gtk_tree_view_set_rules_hint( GTK_TREE_VIEW(m_treeview), (style & wxDV_ROW_LINES) != 0 );
 
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget),
-        GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
     gtk_widget_show (m_treeview);
 
     m_parent->DoAddChild( this );
     gtk_widget_show (m_treeview);
 
     m_parent->DoAddChild( this );
@@ -3446,7 +3903,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
 
     g_signal_connect (m_treeview, "button_press_event",
                       G_CALLBACK (gtk_dataview_button_press_callback), this);
 
     g_signal_connect (m_treeview, "button_press_event",
                       G_CALLBACK (gtk_dataview_button_press_callback), this);
-                      
+
     return true;
 }
 
     return true;
 }
 
@@ -3469,14 +3926,22 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
     {
         delete m_internal;
         m_internal = NULL;
     {
         delete m_internal;
         m_internal = NULL;
-        
+
         delete m_notifier;
         m_notifier = 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;
@@ -3493,6 +3958,16 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
     return true;
 }
 
     return true;
 }
 
+bool wxDataViewCtrl::EnableDragSource( const wxDataFormat &format )
+{
+    return m_internal->EnableDragSource( format );
+}
+
+bool wxDataViewCtrl::EnableDropTarget( const wxDataFormat &format )
+{
+    return m_internal->EnableDropTarget( format );
+}
+
 bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
 {
     if (!wxDataViewCtrlBase::AppendColumn(col))
 bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
 {
     if (!wxDataViewCtrlBase::AppendColumn(col))
@@ -3500,6 +3975,15 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
 
     m_cols.Append( col );
 
 
     m_cols.Append( col );
 
+#ifdef __WXGTK26__
+    if (!gtk_check_version(2,6,0))
+    {
+        if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
+               GTK_TREE_VIEW_COLUMN_FIXED)
+           gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
+    }
+#endif
+
     gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview),
                                  GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) );
 
     gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview),
                                  GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) );
 
@@ -3513,12 +3997,43 @@ bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
 
     m_cols.Insert( col );
 
 
     m_cols.Insert( 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()), 0 );
 
     return true;
 }
 
     gtk_tree_view_insert_column( GTK_TREE_VIEW(m_treeview),
                                  GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()), 0 );
 
     return true;
 }
 
+bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col )
+{
+    if (!wxDataViewCtrlBase::InsertColumn(pos,col))
+        return false;
+
+    m_cols.Insert( pos, col );
+
+#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();
@@ -3531,7 +4046,7 @@ wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
         return NULL;
 
     wxDataViewColumnList::const_iterator iter;
         return NULL;
 
     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)
@@ -3548,9 +4063,7 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
     gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview),
                                  GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()) );
 
     gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview),
                                  GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()) );
 
-    m_cols.remove( column );
-
-    delete column;
+    m_cols.DeleteObject( column );
 
     return true;
 }
 
     return true;
 }
@@ -3558,14 +4071,14 @@ 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;
         gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview),
                                      GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) );
     }
 
     {
         wxDataViewColumn *col = *iter;
         gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview),
                                      GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) );
     }
 
-    m_cols.clear();
+    m_cols.Clear();
 
     return true;
 }
 
     return true;
 }
@@ -3606,6 +4119,17 @@ void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
     gtk_tree_path_free( path );
 }
 
     gtk_tree_path_free( path );
 }
 
+bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
+{
+    GtkTreeIter iter;
+    iter.user_data = item.GetID();
+    GtkTreePath *path = m_internal->get_path( &iter );
+    bool res = gtk_tree_view_row_expanded( GTK_TREE_VIEW(m_treeview), path );
+    gtk_tree_path_free( path );
+
+    return res;
+}
+
 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) );
@@ -3695,11 +4219,23 @@ void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
 
     gtk_tree_selection_unselect_all( selection );
 
 
     gtk_tree_selection_unselect_all( selection );
 
+    wxDataViewItem last_parent;
+
     size_t i;
     for (i = 0; i < sel.GetCount(); i++)
     {
     size_t i;
     for (i = 0; i < sel.GetCount(); i++)
     {
+        wxDataViewItem item = sel[i];
+        wxDataViewItem parent = GetModel()->GetParent( item );
+        if (parent)
+        {
+            if (parent != last_parent)
+                ExpandAncestors(item);
+        }
+        last_parent = parent;
+
         GtkTreeIter iter;
         GtkTreeIter iter;
-        iter.user_data = (gpointer) sel[i].GetID();
+        iter.stamp = m_internal->GetGtkModel()->stamp;
+        iter.user_data = (gpointer) item.GetID();
         gtk_tree_selection_select_iter( selection, &iter );
     }
 
         gtk_tree_selection_select_iter( selection, &iter );
     }
 
@@ -3708,11 +4244,14 @@ void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
 
 void wxDataViewCtrl::Select( const wxDataViewItem & item )
 {
 
 void wxDataViewCtrl::Select( const wxDataViewItem & item )
 {
+    ExpandAncestors(item);
+
     GtkDisableSelectionEvents();
 
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 
     GtkTreeIter iter;
     GtkDisableSelectionEvents();
 
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 
     GtkTreeIter iter;
+    iter.stamp = m_internal->GetGtkModel()->stamp;
     iter.user_data = (gpointer) item.GetID();
     gtk_tree_selection_select_iter( selection, &iter );
 
     iter.user_data = (gpointer) item.GetID();
     gtk_tree_selection_select_iter( selection, &iter );
 
@@ -3726,6 +4265,7 @@ void wxDataViewCtrl::Unselect( const wxDataViewItem & item )
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 
     GtkTreeIter iter;
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 
     GtkTreeIter iter;
+    iter.stamp = m_internal->GetGtkModel()->stamp;
     iter.user_data = (gpointer) item.GetID();
     gtk_tree_selection_unselect_iter( selection, &iter );
 
     iter.user_data = (gpointer) item.GetID();
     gtk_tree_selection_unselect_iter( selection, &iter );
 
@@ -3737,6 +4277,7 @@ bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 
     GtkTreeIter iter;
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 
     GtkTreeIter iter;
+    iter.stamp = m_internal->GetGtkModel()->stamp;
     iter.user_data = (gpointer) item.GetID();
 
     return gtk_tree_selection_iter_is_selected( selection, &iter );
     iter.user_data = (gpointer) item.GetID();
 
     return gtk_tree_selection_iter_is_selected( selection, &iter );
@@ -3764,8 +4305,11 @@ void wxDataViewCtrl::UnselectAll()
     GtkEnableSelectionEvents();
 }
 
     GtkEnableSelectionEvents();
 }
 
-void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn *column )
+void wxDataViewCtrl::EnsureVisible(const wxDataViewItem& item,
+                                   const wxDataViewColumn *WXUNUSED(column))
 {
 {
+    ExpandAncestors(item);
+
     GtkTreeIter iter;
     iter.user_data = (gpointer) item.GetID();
     GtkTreePath *path = m_internal->get_path( &iter );
     GtkTreeIter iter;
     iter.user_data = (gpointer) item.GetID();
     GtkTreePath *path = m_internal->get_path( &iter );
@@ -3773,15 +4317,17 @@ 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();
 }
 {
     return wxRect();
 }