X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0c133e13b36a923c65f94499554e432bc3a0daa..853149575e6cb46031b3ed06f3d0fa4c42440962:/src/generic/datavgen.cpp

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 49120ac939..68c7d4bd09 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -48,13 +48,20 @@
 #include "wx/imaglist.h"
 #include "wx/headerctrl.h"
 #include "wx/dnd.h"
+#include "wx/stopwatch.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
+class wxDataViewColumn;
+class wxDataViewHeaderWindow;
 class wxDataViewCtrl;
 
+//-----------------------------------------------------------------------------
+// classes
+//-----------------------------------------------------------------------------
+
 static const int SCROLL_UNIT_X = 15;
 
 // the cell padding on the left/right
@@ -69,12 +76,52 @@ static const int EXPANDER_OFFSET = 4;
 static const int EXPANDER_OFFSET = 1;
 #endif
 
-//Below is the compare stuff
-//For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed
-static wxDataViewModel * g_model;
+// Below is the compare stuff.
+// For the generic implementation, both the leaf nodes and the nodes are sorted for
+// fast search when needed
+static wxDataViewModel* g_model;
 static int g_column = -2;
 static bool g_asending = true;
 
+//-----------------------------------------------------------------------------
+// wxDataViewColumn
+//-----------------------------------------------------------------------------
+
+void wxDataViewColumn::Init(int width, wxAlignment align, int flags)
+{
+    m_width = width;
+    m_minWidth = 0;
+    m_align = align;
+    m_flags = flags;
+    m_sort = false;
+    m_sortAscending = true;
+}
+
+int wxDataViewColumn::GetWidth() const
+{
+    switch ( m_width )
+    {
+        case wxCOL_WIDTH_DEFAULT:
+            return wxDVC_DEFAULT_WIDTH;
+
+        case wxCOL_WIDTH_AUTOSIZE:
+            wxCHECK_MSG( m_owner, wxDVC_DEFAULT_WIDTH, "no owner control" );
+            return m_owner->GetBestColumnWidth(m_owner->GetColumnIndex(this));
+
+        default:
+            return m_width;
+    }
+}
+
+void wxDataViewColumn::UpdateDisplay()
+{
+    if (m_owner)
+    {
+        int idx = m_owner->GetColumnIndex( this );
+        m_owner->OnColumnChange( idx );
+    }
+}
+
 //-----------------------------------------------------------------------------
 // wxDataViewHeaderWindow
 //-----------------------------------------------------------------------------
@@ -98,6 +145,7 @@ protected:
         return *(GetOwner()->GetColumn(idx));
     }
 
+    // FIXME: currently unused
     virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle)
     {
         wxDataViewCtrl * const owner = GetOwner();
@@ -176,7 +224,7 @@ private:
             event.Skip();
     }
 
-    void OnEndResize(wxHeaderCtrlEvent& event)
+    void OnResize(wxHeaderCtrlEvent& event)
     {
         wxDataViewCtrl * const owner = GetOwner();
 
@@ -189,7 +237,7 @@ private:
     {
         wxDataViewCtrl * const owner = GetOwner();
         owner->ColumnMoved(owner->GetColumn(event.GetColumn()),
-                           event.GetNewOrder());
+                        event.GetNewOrder());
     }
 
     DECLARE_EVENT_TABLE()
@@ -200,7 +248,8 @@ BEGIN_EVENT_TABLE(wxDataViewHeaderWindow, wxHeaderCtrl)
     EVT_HEADER_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnClick)
     EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnRClick)
 
-    EVT_HEADER_END_RESIZE(wxID_ANY, wxDataViewHeaderWindow::OnEndResize)
+    EVT_HEADER_RESIZING(wxID_ANY, wxDataViewHeaderWindow::OnResize)
+    EVT_HEADER_END_RESIZE(wxID_ANY, wxDataViewHeaderWindow::OnResize)
 
     EVT_HEADER_END_REORDER(wxID_ANY, wxDataViewHeaderWindow::OnEndReorder)
 END_EVENT_TABLE()
@@ -222,11 +271,13 @@ public:
 //-----------------------------------------------------------------------------
 // wxDataViewTreeNode
 //-----------------------------------------------------------------------------
+
 class wxDataViewTreeNode;
 WX_DEFINE_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes );
 WX_DEFINE_ARRAY( void* , wxDataViewTreeLeaves);
 
-int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2);
+int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1,
+                                           wxDataViewTreeNode ** node2);
 int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2);
 
 class wxDataViewTreeNode
@@ -346,7 +397,8 @@ private:
     int                  m_subTreeCount;
 };
 
-int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2)
+int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1,
+                                           wxDataViewTreeNode ** node2)
 {
     return g_model->Compare( (*node1)->GetItem(), (*node2)->GetItem(), g_column, g_asending );
 }
@@ -357,7 +409,6 @@ int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2)
 }
 
 
-
 //-----------------------------------------------------------------------------
 // wxDataViewMainWindow
 //-----------------------------------------------------------------------------
@@ -377,13 +428,14 @@ public:
                             const wxString &name = wxT("wxdataviewctrlmainwindow") );
     virtual ~wxDataViewMainWindow();
 
+    bool IsList() const { return GetOwner()->GetModel()->IsListModel(); }
     bool IsVirtualList() const { return m_root == NULL; }
 
     // notifications 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 ValueChanged( const wxDataViewItem &item, unsigned int model_column );
     bool Cleared();
     void Resort()
     {
@@ -436,6 +488,7 @@ public:
     void ScrollWindow( int dx, int dy, const wxRect *rect = NULL );
     void ScrollTo( int rows, int column );
 
+    unsigned GetCurrentRow() const { return m_currentRow; }
     bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; }
     void ChangeCurrentRow( unsigned int row );
 
@@ -445,13 +498,17 @@ public:
     int GetCountPerPage() const;
     int GetEndOfLastCol() const;
     unsigned int GetFirstVisibleRow() const;
-    //I change this method to un const because in the tree view, the displaying number of the tree are changing along with the expanding/collapsing of the tree nodes
+
+    // I change this method to un const because in the tree view,
+    // the displaying number of the tree are changing along with the
+    // expanding/collapsing of the tree nodes
     unsigned int GetLastVisibleRow();
     unsigned int GetRowCount();
 
     wxDataViewItem GetSelection() const;
     wxDataViewSelection GetSelections(){ return m_selection; }
-    void SetSelections( const wxDataViewSelection & sel ) { m_selection = sel; UpdateDisplay(); }
+    void SetSelections( const wxDataViewSelection & sel )
+        { m_selection = sel; UpdateDisplay(); }
     void Select( const wxArrayInt& aSelections );
     void SelectAllRows( bool on );
     void SelectRow( unsigned int row, bool on );
@@ -476,19 +533,20 @@ public:
     int GetLineHeight( unsigned int row ) const; // m_lineHeight in fixed mode
     int GetLineAt( unsigned int y ) const;       // y / m_lineHeight in fixed mode
 
-    //Some useful functions for row and item mapping
+    // Some useful functions for row and item mapping
     wxDataViewItem GetItemByRow( unsigned int row ) const;
     int GetRowByItem( const wxDataViewItem & item ) const;
 
-    //Methods for building the mapping tree
+    // Methods for building the mapping tree
     void BuildTree( wxDataViewModel  * model );
     void DestroyTree();
     void HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column );
     wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column );
 
-    void Expand( unsigned int row ) { OnExpanding( row ); }
-    void Collapse( unsigned int row ) { OnCollapsing( row ); }
+    void Expand( unsigned int row );
+    void Collapse( unsigned int row );
     bool IsExpanded( unsigned int row ) const;
+    bool HasChildren( unsigned int row ) const;
 
 #if wxUSE_DRAG_AND_DROP
     bool EnableDragSource( const wxDataFormat &format );
@@ -503,14 +561,12 @@ public:
 
 private:
     wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const;
-    //We did not need this temporarily
-    //wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item );
+    // We did not need this temporarily
+    // wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item );
 
     int RecalculateCount();
 
     wxDataViewEvent SendExpanderEvent( wxEventType type, const wxDataViewItem & item );
-    void OnExpanding( unsigned int row );
-    void OnCollapsing( unsigned int row );
 
     wxDataViewTreeNode * FindNode( const wxDataViewItem & item );
 
@@ -543,8 +599,8 @@ private:
 
     // for double click logic
     unsigned int m_lineLastClicked,
-           m_lineBeforeLastClicked,
-           m_lineSelectSingleOnUp;
+        m_lineBeforeLastClicked,
+        m_lineSelectSingleOnUp;
 
     // the pen used to draw horiz/vertical rules
     wxPen m_penRule;
@@ -552,11 +608,13 @@ private:
     // the pen used to draw the expander and the lines
     wxPen m_penExpander;
 
-    //This is the tree structure of the model
+    // This is the tree structure of the model
     wxDataViewTreeNode * m_root;
     int m_count;
-    //This is the tree node under the cursor
+
+    // This is the tree node under the cursor
     wxDataViewTreeNode * m_underMouse;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow)
     DECLARE_EVENT_TABLE()
@@ -583,7 +641,7 @@ public:
     virtual bool Cleared()
         { return m_mainWindow->Cleared(); }
     virtual void Resort()
-         { m_mainWindow->Resort(); }
+        { m_mainWindow->Resort(); }
 
     wxDataViewMainWindow    *m_mainWindow;
 };
@@ -597,19 +655,17 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase)
 wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype,
                                         wxDataViewCellMode mode,
                                         int align) :
-    wxDataViewRendererBase( varianttype, mode, align )
+    wxDataViewCustomRendererBase( varianttype, mode, align )
 {
-    m_dc = NULL;
     m_align = align;
     m_mode = mode;
-    m_wantsAttr = false;
-    m_hasAttr = false;
+    m_ellipsizeMode = wxELLIPSIZE_MIDDLE;
+    m_dc = NULL;
 }
 
 wxDataViewRenderer::~wxDataViewRenderer()
 {
-    if (m_dc)
-        delete m_dc;
+    delete m_dc;
 }
 
 wxDC *wxDataViewRenderer::GetDC()
@@ -636,19 +692,6 @@ int wxDataViewRenderer::GetAlignment() const
     return m_align;
 }
 
-int wxDataViewRenderer::CalculateAlignment() const
-{
-    if (m_align == wxDVR_DEFAULT_ALIGNMENT)
-    {
-        if (GetOwner() == NULL)
-           return wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL;
-
-        return GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL;
-    }
-
-    return m_align;
-}
-
 // ---------------------------------------------------------
 // wxDataViewCustomRenderer
 // ---------------------------------------------------------
@@ -656,30 +699,20 @@ int wxDataViewRenderer::CalculateAlignment() const
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
 
 wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
-                          wxDataViewCellMode mode, int align ) :
+                        wxDataViewCellMode mode, int align ) :
     wxDataViewRenderer( varianttype, mode, align )
 {
 }
 
-void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, wxRect cell, wxDC *dc, int state )
-{
-    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));
-}
-
 // ---------------------------------------------------------
 // wxDataViewTextRenderer
 // ---------------------------------------------------------
 
-IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewCustomRenderer)
+IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer)
 
 wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype,
                                                 wxDataViewCellMode mode, int align ) :
-    wxDataViewCustomRenderer( varianttype, mode, align )
+    wxDataViewRenderer( varianttype, mode, align )
 {
 }
 
@@ -695,7 +728,7 @@ bool wxDataViewTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const
     return false;
 }
 
-bool wxDataViewTextRenderer::HasEditorCtrl()
+bool wxDataViewTextRenderer::HasEditorCtrl() const
 {
     return true;
 }
@@ -703,9 +736,15 @@ bool wxDataViewTextRenderer::HasEditorCtrl()
 wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,
         wxRect labelRect, const wxVariant &value )
 {
-    return new wxTextCtrl( parent, wxID_ANY, value,
-                           wxPoint(labelRect.x,labelRect.y),
-                           wxSize(labelRect.width,labelRect.height) );
+    wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, value,
+                                       wxPoint(labelRect.x,labelRect.y),
+                                       wxSize(labelRect.width,labelRect.height) );
+
+    // select the text in the control an place the cursor at the end
+    ctrl->SetInsertionPointEnd();
+    ctrl->SelectAll();
+
+    return ctrl;
 }
 
 bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant &value )
@@ -715,87 +754,29 @@ bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVarian
     return true;
 }
 
-bool wxDataViewTextRenderer::Render( wxRect cell, wxDC *dc, int state )
+bool wxDataViewTextRenderer::Render(wxRect rect, wxDC *dc, int state)
 {
-    RenderText( m_text, 0, cell, dc, state );
+    RenderText(m_text, 0, rect, dc, state);
     return true;
 }
 
 wxSize wxDataViewTextRenderer::GetSize() const
 {
-    const wxDataViewCtrl *view = GetView();
     if (!m_text.empty())
-    {
-        int x,y;
-        view->GetTextExtent( m_text, &x, &y );
-        return wxSize( x, y );
-    }
-    return wxSize(80,20);
-}
-
-// ---------------------------------------------------------
-// wxDataViewTextRendererAttr
-// ---------------------------------------------------------
-
-IMPLEMENT_CLASS(wxDataViewTextRendererAttr, wxDataViewTextRenderer)
-
-wxDataViewTextRendererAttr::wxDataViewTextRendererAttr( const wxString &varianttype,
-                            wxDataViewCellMode mode, int align ) :
-    wxDataViewTextRenderer( varianttype, mode, align )
-{
-    m_wantsAttr = true;
-}
-
-bool wxDataViewTextRendererAttr::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
-{
-    wxFont font;
-    wxColour colour;
-
-    if (m_hasAttr)
-    {
-        if (m_attr.HasColour())
-        {
-            colour = dc->GetTextForeground();
-            dc->SetTextForeground( m_attr.GetColour() );
-        }
-
-        if (m_attr.GetBold() || m_attr.GetItalic())
-        {
-             font = dc->GetFont();
-             wxFont myfont = font;
-             if (m_attr.GetBold())
-                 myfont.SetWeight( wxFONTWEIGHT_BOLD );
-             if (m_attr.GetItalic())
-                 myfont.SetStyle( wxFONTSTYLE_ITALIC );
-             dc->SetFont( myfont );
-        }
-    }
-
-    dc->DrawText( m_text, cell.x, cell.y + ((cell.height - dc->GetCharHeight()) / 2));
-
-    // restore dc
-    if (m_hasAttr)
-    {
-        if (m_attr.HasColour())
-            dc->SetTextForeground( colour );
-
-        if (m_attr.GetBold() || m_attr.GetItalic())
-            dc->SetFont( font );
-    }
-
-    return true;
+        return GetTextExtent(m_text);
+    else
+        return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE);
 }
 
-
 // ---------------------------------------------------------
 // wxDataViewBitmapRenderer
 // ---------------------------------------------------------
 
-IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewCustomRenderer)
+IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer)
 
 wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype,
                                                     wxDataViewCellMode mode, int align ) :
-    wxDataViewCustomRenderer( varianttype, mode, align )
+    wxDataViewRenderer( varianttype, mode, align )
 {
 }
 
@@ -831,18 +812,18 @@ wxSize wxDataViewBitmapRenderer::GetSize() const
     else if (m_icon.Ok())
         return wxSize( m_icon.GetWidth(), m_icon.GetHeight() );
 
-    return wxSize(16,16);
+    return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE);
 }
 
 // ---------------------------------------------------------
 // wxDataViewToggleRenderer
 // ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer, wxDataViewCustomRenderer)
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer)
 
 wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype,
                         wxDataViewCellMode mode, int align ) :
-    wxDataViewCustomRenderer( varianttype, mode, align )
+    wxDataViewRenderer( varianttype, mode, align )
 {
     m_toggle = false;
 }
@@ -861,63 +842,60 @@ bool wxDataViewToggleRenderer::GetValue( wxVariant &WXUNUSED(value) ) const
 
 bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
 {
-    // User wxRenderer here
-
-    wxRect rect;
-    rect.x = cell.x + cell.width/2 - 10;
-    rect.width = 20;
-    rect.y = cell.y + cell.height/2 - 10;
-    rect.height = 20;
-
     int flags = 0;
     if (m_toggle)
         flags |= wxCONTROL_CHECKED;
-    if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE)
+    if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE ||
+        GetEnabled() == false)
         flags |= wxCONTROL_DISABLED;
 
+    // check boxes we draw must always have the same, standard size (if it's
+    // bigger than the cell size the checkbox will be truncated because the
+    // caller had set the clipping rectangle to prevent us from drawing outside
+    // the cell)
+    cell.SetSize(GetSize());
+
     wxRendererNative::Get().DrawCheckBox(
             GetOwner()->GetOwner(),
             *dc,
-            rect,
+            cell,
             flags );
 
     return true;
 }
 
-bool wxDataViewToggleRenderer::Activate( wxRect WXUNUSED(cell),
-                                         wxDataViewModel *model,
-                                         const wxDataViewItem & item, unsigned int col)
+void wxDataViewToggleRenderer::WXOnActivate(wxDataViewModel *model,
+                                            const wxVariant& valueOld,
+                                            const wxDataViewItem & item,
+                                            unsigned int col)
 {
-    bool value = !m_toggle;
-    wxVariant variant = value;
-    model->SetValue( variant, item, col);
-    model->ValueChanged( item, col );
-    return true;
+    if (model->IsEnabled(item, col))
+    {
+        model->ChangeValue(!valueOld.GetBool(), item, col);
+    }
 }
 
 wxSize wxDataViewToggleRenderer::GetSize() const
 {
-    return wxSize(20,20);
+    // the window parameter is not used by GetCheckBoxSize() so it's
+    // safe to pass NULL
+    return wxRendererNative::Get().GetCheckBoxSize(NULL);
 }
 
 // ---------------------------------------------------------
 // wxDataViewProgressRenderer
 // ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer, wxDataViewCustomRenderer)
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer, wxDataViewRenderer)
 
 wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label,
     const wxString &varianttype, wxDataViewCellMode mode, int align ) :
-    wxDataViewCustomRenderer( varianttype, mode, align )
+    wxDataViewRenderer( varianttype, mode, align )
 {
     m_label = label;
     m_value = 0;
 }
 
-wxDataViewProgressRenderer::~wxDataViewProgressRenderer()
-{
-}
-
 bool wxDataViewProgressRenderer::SetValue( const wxVariant &value )
 {
     m_value = (long) value;
@@ -934,18 +912,23 @@ bool wxDataViewProgressRenderer::GetValue( wxVariant &value ) const
     return true;
 }
 
-bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
+bool
+wxDataViewProgressRenderer::Render(wxRect rect, wxDC *dc, int WXUNUSED(state))
 {
-    double pct = (double)m_value / 100.0;
-    wxRect bar = cell;
-    bar.width = (int)(cell.width * pct);
-    dc->SetPen( *wxTRANSPARENT_PEN );
-    dc->SetBrush( *wxBLUE_BRUSH );
-    dc->DrawRectangle( bar );
+    // deflate the rect to leave a small border between bars in adjacent rows
+    wxRect bar = rect.Deflate(0, 1);
 
     dc->SetBrush( *wxTRANSPARENT_BRUSH );
     dc->SetPen( *wxBLACK_PEN );
-    dc->DrawRectangle( cell );
+    dc->DrawRectangle( bar );
+
+    bar.width = (int)(bar.width * m_value / 100.);
+    dc->SetPen( *wxTRANSPARENT_PEN );
+
+    const wxDataViewItemAttr& attr = GetAttr();
+    dc->SetBrush( attr.HasColour() ? wxBrush(attr.GetColour())
+                                  : *wxBLUE_BRUSH );
+    dc->DrawRectangle( bar );
 
     return true;
 }
@@ -1002,20 +985,17 @@ END_EVENT_TABLE()
 
 void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event )
 {
-    wxDateTime date = event.GetDate();
-    wxVariant value = date;
-    m_model->SetValue( value, m_item, m_col );
-    m_model->ValueChanged( m_item, m_col );
+    m_model->ChangeValue( event.GetDate(), m_item, m_col );
     DismissAndNotify();
 }
 
 #endif // wxUSE_DATE_RENDERER_POPUP
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer, wxDataViewCustomRenderer)
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer, wxDataViewRenderer)
 
 wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype,
                         wxDataViewCellMode mode, int align ) :
-    wxDataViewCustomRenderer( varianttype, mode, align )
+    wxDataViewRenderer( varianttype, mode, align )
 {
 }
 
@@ -1041,51 +1021,42 @@ bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state )
 
 wxSize wxDataViewDateRenderer::GetSize() const
 {
-    const wxDataViewCtrl* view = GetView();
-    wxString tmp = m_date.FormatDate();
-    wxCoord x,y,d;
-    view->GetTextExtent( tmp, &x, &y, &d );
-    return wxSize(x,y+d);
+    return GetTextExtent(m_date.FormatDate());
 }
 
-bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *model,
-                                       const wxDataViewItem & item, unsigned int col )
+void wxDataViewDateRenderer::WXOnActivate(wxDataViewModel *model,
+                                          const wxVariant& valueOld,
+                                          const wxDataViewItem & item,
+                                          unsigned int col )
 {
-    wxVariant variant;
-    model->GetValue( variant, item, col );
-    wxDateTime value = variant.GetDateTime();
+    wxDateTime dtOld = valueOld.GetDateTime();
 
 #if wxUSE_DATE_RENDERER_POPUP
     wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient(
-        GetOwner()->GetOwner()->GetParent(), &value, model, item, col);
+        GetOwner()->GetOwner()->GetParent(), &dtOld, model, item, col);
     wxPoint pos = wxGetMousePosition();
     popup->Move( pos );
     popup->Layout();
     popup->Popup( popup->m_cal );
 #else // !wxUSE_DATE_RENDERER_POPUP
-    wxMessageBox(value.Format());
+    wxMessageBox(dtOld.Format());
 #endif // wxUSE_DATE_RENDERER_POPUP/!wxUSE_DATE_RENDERER_POPUP
-    return true;
 }
 
 // ---------------------------------------------------------
 // wxDataViewIconTextRenderer
 // ---------------------------------------------------------
 
-IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer)
+IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewRenderer)
 
 wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(
-  const wxString &varianttype, wxDataViewCellMode mode, int align ) :
-    wxDataViewCustomRenderer( varianttype, mode, align )
+const wxString &varianttype, wxDataViewCellMode mode, int align ) :
+    wxDataViewRenderer( varianttype, mode, align )
 {
     SetMode(mode);
     SetAlignment(align);
 }
 
-wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer()
-{
-}
-
 bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )
 {
     m_value << value;
@@ -1097,49 +1068,68 @@ bool wxDataViewIconTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const
     return false;
 }
 
-bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state )
+bool wxDataViewIconTextRenderer::Render(wxRect rect, wxDC *dc, int state)
 {
     int xoffset = 0;
-    const wxIcon &icon = m_value.GetIcon();
-    if (icon.IsOk())
+
+    const wxIcon& icon = m_value.GetIcon();
+    if ( icon.IsOk() )
     {
-        dc->DrawIcon( icon, cell.x, cell.y + ((cell.height - icon.GetHeight()) / 2));
-        xoffset =  icon.GetWidth()+4;
+        dc->DrawIcon(icon, rect.x, rect.y + (rect.height - icon.GetHeight())/2);
+        xoffset = icon.GetWidth()+4;
     }
 
-    RenderText( m_value.GetText(), xoffset, cell, dc, state );
+    RenderText(m_value.GetText(), xoffset, rect, dc, state);
 
     return true;
 }
 
 wxSize wxDataViewIconTextRenderer::GetSize() const
 {
-    const wxDataViewCtrl *view = GetView();
     if (!m_value.GetText().empty())
     {
-        int x,y;
-        view->GetTextExtent( m_value.GetText(), &x, &y );
+        wxSize size = GetTextExtent(m_value.GetText());
 
         if (m_value.GetIcon().IsOk())
-            x += m_value.GetIcon().GetWidth() + 4;
-        return wxSize( x, y );
+            size.x += m_value.GetIcon().GetWidth() + 4;
+        return size;
     }
     return wxSize(80,20);
 }
 
-wxControl *
-wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow * WXUNUSED(parent),
-                                             wxRect WXUNUSED(labelRect),
-                                             const wxVariant& WXUNUSED(value))
+wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant& value)
 {
-    return NULL;
+    wxDataViewIconText iconText;
+    iconText << value;
+
+    wxString text = iconText.GetText();
+
+    // adjust the label rect to take the width of the icon into account
+    if (iconText.GetIcon().IsOk())
+    {
+        int w = iconText.GetIcon().GetWidth() + 4;
+        labelRect.x += w;
+        labelRect.width -= w;
+    }
+
+    wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, text,
+                                       wxPoint(labelRect.x,labelRect.y),
+                                       wxSize(labelRect.width,labelRect.height) );
+
+    // select the text in the control an place the cursor at the end
+    ctrl->SetInsertionPointEnd();
+    ctrl->SelectAll();
+
+    return ctrl;
 }
 
-bool
-wxDataViewIconTextRenderer::GetValueFromEditorCtrl(wxControl* WXUNUSED(editor),
-                                                   wxVariant& WXUNUSED(value))
+bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant& value )
 {
-    return false;
+    wxTextCtrl *text = (wxTextCtrl*) editor;
+
+    wxDataViewIconText iconText(text->GetValue(), m_value.GetIcon());
+    value << iconText;
+    return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -1152,7 +1142,7 @@ class wxBitmapCanvas: public wxWindow
 {
 public:
     wxBitmapCanvas( wxWindow *parent, const wxBitmap &bitmap, const wxSize &size ) :
-       wxWindow( parent, wxID_ANY, wxPoint(0,0), size )
+    wxWindow( parent, wxID_ANY, wxPoint(0,0), size )
     {
         m_bitmap = bitmap;
         Connect( wxEVT_PAINT, wxPaintEventHandler(wxBitmapCanvas::OnPaint) );
@@ -1171,7 +1161,7 @@ class wxDataViewDropSource: public wxDropSource
 {
 public:
     wxDataViewDropSource( wxDataViewMainWindow *win, unsigned int row ) :
-         wxDropSource( win )
+        wxDropSource( win )
     {
         m_win = win;
         m_row = row;
@@ -1200,12 +1190,12 @@ public:
             wxBitmap ib = m_win->CreateItemBitmap( m_row, indent );
             m_dist_x -= indent;
             m_hint = new wxFrame( m_win->GetParent(), wxID_ANY, wxEmptyString,
-                                         wxPoint(pos.x - m_dist_x, pos.y + 5 ),
-                                         ib.GetSize(),
-                                         wxFRAME_TOOL_WINDOW |
-                                         wxFRAME_FLOAT_ON_PARENT |
-                                         wxFRAME_NO_TASKBAR |
-                                         wxNO_BORDER );
+                                        wxPoint(pos.x - m_dist_x, pos.y + 5 ),
+                                        ib.GetSize(),
+                                        wxFRAME_TOOL_WINDOW |
+                                        wxFRAME_FLOAT_ON_PARENT |
+                                        wxFRAME_NO_TASKBAR |
+                                        wxNO_BORDER );
             new wxBitmapCanvas( m_hint, ib, ib.GetSize() );
             m_hint->Show();
         }
@@ -1235,30 +1225,30 @@ public:
     }
 
     virtual wxDragResult OnDragOver( wxCoord x, wxCoord y, wxDragResult def )
-        {
-           wxDataFormat format = GetMatchingPair();
-           if (format == wxDF_INVALID)
-              return wxDragNone;
-           return m_win->OnDragOver( format, x, y, def);
-        }
+    {
+        wxDataFormat format = GetMatchingPair();
+        if (format == wxDF_INVALID)
+            return wxDragNone;
+        return m_win->OnDragOver( format, x, y, def);
+    }
 
     virtual bool OnDrop( wxCoord x, wxCoord y )
-        {
-           wxDataFormat format = GetMatchingPair();
-           if (format == wxDF_INVALID)
-              return false;
-           return m_win->OnDrop( format, x, y );
-        }
+    {
+        wxDataFormat format = GetMatchingPair();
+        if (format == wxDF_INVALID)
+            return false;
+        return m_win->OnDrop( format, x, y );
+    }
 
     virtual wxDragResult OnData( wxCoord x, wxCoord y, wxDragResult def )
-        {
-           wxDataFormat format = GetMatchingPair();
-           if (format == wxDF_INVALID)
-              return wxDragNone;
-           if (!GetData())
-              return wxDragNone;
-           return m_win->OnData( format, x, y, def );
-        }
+    {
+        wxDataFormat format = GetMatchingPair();
+        if (format == wxDF_INVALID)
+            return wxDragNone;
+        if (!GetData())
+            return wxDragNone;
+        return m_win->OnData( format, x, y, def );
+    }
 
     virtual void OnLeave()
         { m_win->OnLeave(); }
@@ -1286,8 +1276,9 @@ void wxDataViewRenameTimer::Notify()
 // wxDataViewMainWindow
 //-----------------------------------------------------------------------------
 
-//The tree building helper, declared firstly
-static void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataViewTreeNode * node);
+// The tree building helper, declared firstly
+static void BuildTreeHelper( const wxDataViewModel * model,  const wxDataViewItem & item,
+                             wxDataViewTreeNode * node);
 
 int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )
 {
@@ -1296,7 +1287,6 @@ int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )
     return -1;
 }
 
-
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow)
 
 BEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow)
@@ -1346,13 +1336,14 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
 
     m_penRule = wxPen(GetRuleColour());
 
-    //Here I compose a pen can draw black lines, maybe there are something system colour to use
+    // compose a pen whichcan draw black lines
+    // TODO: maybe there is something system colour to use
     m_penExpander = wxPen(wxColour(0,0,0));
-    //Some new added code to deal with the tree structure
+
     m_root = new wxDataViewTreeNode( NULL );
     m_root->SetHasChildren(true);
 
-    //Make m_count = -1 will cause the class recaculate the real displaying number of rows.
+    // Make m_count = -1 will cause the class recaculate the real displaying number of rows.
     m_count = -1;
     m_underMouse = NULL;
     UpdateDisplay();
@@ -1395,14 +1386,15 @@ void wxDataViewMainWindow::RemoveDropHint()
     }
 }
 
-wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def )
+wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x,
+                                               wxCoord y, wxDragResult def )
 {
     int xx = x;
     int yy = y;
     m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy );
     unsigned int row = GetLineAt( yy );
 
-    if ((row >= GetRowCount()) || (yy > GetEndOfLastCol()))
+    if ((row >= GetRowCount()) || (xx > GetEndOfLastCol()))
     {
         RemoveDropHint();
         return wxDragNone;
@@ -1448,7 +1440,7 @@ bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y )
     m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy );
     unsigned int row = GetLineAt( yy );
 
-    if ((row >= GetRowCount()) || (yy > GetEndOfLastCol()))
+    if ((row >= GetRowCount()) || (xx > GetEndOfLastCol()))
         return false;
 
     wxDataViewItem item = GetItemByRow( row );
@@ -1469,14 +1461,15 @@ bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y )
     return true;
 }
 
-wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def )
+wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoord y,
+                                           wxDragResult def )
 {
     int xx = x;
     int yy = y;
     m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy );
     unsigned int row = GetLineAt( yy );
 
-    if ((row >= GetRowCount()) || (yy > GetEndOfLastCol()))
+    if ((row >= GetRowCount()) || (xx > GetEndOfLastCol()))
         return wxDragNone;
 
     wxDataViewItem item = GetItemByRow( row );
@@ -1521,11 +1514,15 @@ wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent )
     }
 
     indent = 0;
-    if (!IsVirtualList())
+    if (!IsList())
     {
         wxDataViewTreeNode *node = GetTreeNodeByRow(row);
         indent = GetOwner()->GetIndent() * node->GetIndentLevel();
-        indent = indent + m_lineHeight;  //try to use the m_lineHeight as the expander space
+        indent = indent + m_lineHeight;
+            // try to use the m_lineHeight as the expander space
+
+        if(!node->HasChildren())
+            delete node;
     }
     width -= indent;
 
@@ -1561,49 +1558,15 @@ wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent )
         if (column == expander)
             width -= indent;
 
-        wxVariant value;
         wxDataViewItem item = GetItemByRow( row );
-        model->GetValue( value, item, column->GetModelColumn());
-        cell->SetValue( value );
+        cell->PrepareForItem(model, item, column->GetModelColumn());
 
-        if (cell->GetWantsAttr())
-        {
-                wxDataViewItemAttr attr;
-                bool ret = model->GetAttr( item, column->GetModelColumn(), attr );
-                if (ret)
-                    cell->SetAttr( attr );
-                cell->SetHasAttr( ret );
-        }
+        wxRect item_rect(x, 0, width, height);
+        item_rect.Deflate(PADDING_RIGHTLEFT, 0);
 
-        wxSize size = cell->GetSize();
-        size.x = wxMin( 2*PADDING_RIGHTLEFT + size.x, width );
-        size.y = height;
-        wxRect item_rect(x, 0, size.x, size.y);
-
-        int align = cell->CalculateAlignment();
-        // horizontal alignment:
-        item_rect.x = x;
-        if (align & wxALIGN_CENTER_HORIZONTAL)
-            item_rect.x = x + (width / 2) - (size.x / 2);
-        else if (align & wxALIGN_RIGHT)
-            item_rect.x = x + width - size.x;
-        //else: wxALIGN_LEFT is the default
-
-        // vertical alignment:
-        item_rect.y = 0;
-        if (align & wxALIGN_CENTER_VERTICAL)
-            item_rect.y = (height / 2) - (size.y / 2);
-        else if (align & wxALIGN_BOTTOM)
-            item_rect.y = height - size.y;
-        //else: wxALIGN_TOP is the default
-
-        // add padding
-        item_rect.x += PADDING_RIGHTLEFT;
-        item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;
-
-        //dc.SetClippingRegion( item_rect );
-        cell->Render( item_rect, &dc, 0 );
-        //dc.DestroyClippingRegion();
+        // dc.SetClippingRegion( item_rect );
+        cell->WXCallRender(item_rect, &dc, 0);
+        // dc.DestroyClippingRegion();
 
         x += width;
     }
@@ -1620,11 +1583,9 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     wxAutoBufferedPaintDC dc( this );
 
 #ifdef __WXMSW__
+    dc.SetBrush(GetOwner()->GetBackgroundColour());
     dc.SetPen( *wxTRANSPARENT_PEN );
-    dc.SetBrush( wxBrush( GetBackgroundColour()) );
-    dc.SetBrush( *wxWHITE_BRUSH );
-    wxSize size( GetClientSize() );
-    dc.DrawRectangle( 0,0,size.x,size.y );
+    dc.DrawRectangle(GetClientSize());
 #endif
 
     // prepare the DC
@@ -1638,11 +1599,24 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     unsigned int item_start = GetLineAt( wxMax(0,update.y) );
     unsigned int item_count =
         wxMin( (int)(  GetLineAt( wxMax(0,update.y+update.height) ) - item_start + 1),
-               (int)(GetRowCount( ) - item_start));
+            (int)(GetRowCount( ) - item_start));
     unsigned int item_last = item_start + item_count;
+    // Get the parent of DataViewCtrl
+    wxWindow *parent = GetParent()->GetParent();
+    wxDataViewEvent cache_event(wxEVT_COMMAND_DATAVIEW_CACHE_HINT, parent->GetId());
+    cache_event.SetEventObject(GetParent());
+    cache_event.SetCache(item_start, item_last - 1);
+    parent->ProcessWindowEvent(cache_event);
 
     // compute which columns needs to be redrawn
     unsigned int cols = GetOwner()->GetColumnCount();
+    if ( !cols )
+    {
+        // we assume that we have at least one column below and painting an
+        // empty control is unnecessary anyhow
+        return;
+    }
+
     unsigned int col_start = 0;
     unsigned int x_start;
     for (x_start = 0; col_start < cols; col_start++)
@@ -1678,7 +1652,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         dc.SetPen(m_penRule);
         dc.SetBrush(*wxTRANSPARENT_BRUSH);
 
-        for (unsigned int i = item_start; i <= item_last+1; i++)
+        for (unsigned int i = item_start; i <= item_last; i++)
         {
             int y = GetLineStart( i );
             dc.DrawLine(x_start, y, x_last, y);
@@ -1721,7 +1695,8 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             if (m_hasFocus)
                 flags |= wxCONTROL_FOCUSED;
 
-            wxRect rect( x_start, GetLineStart( item ), x_last, GetLineHeight( item ) );
+            wxRect rect( x_start, GetLineStart( item ),
+                         x_last - x_start, GetLineHeight( item ) );
             wxRendererNative::Get().DrawItemSelectionRect
                                 (
                                     this,
@@ -1736,7 +1711,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     if (m_dropHint)
     {
         wxRect rect( x_start, GetLineStart( m_dropHintLine ),
-                     x_last, GetLineHeight( m_dropHintLine ) );
+                     x_last - x_start, GetLineHeight( m_dropHintLine ) );
         dc.SetPen( *wxBLACK_PEN );
         dc.SetBrush( *wxTRANSPARENT_BRUSH );
         dc.DrawRectangle( rect );
@@ -1756,18 +1731,16 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     cell_rect.x = x_start;
     for (unsigned int i = col_start; i < col_last; i++)
     {
-
         wxDataViewColumn *col = GetOwner()->GetColumnAt( i );
         wxDataViewRenderer *cell = col->GetRenderer();
         cell_rect.width = col->GetWidth();
 
-        if (col->IsHidden())
+        if ( col->IsHidden() || cell_rect.width <= 0 )
             continue;       // skip it!
 
         for (unsigned int item = item_start; item < item_last; item++)
         {
             // get the cell value and set it into the renderer
-            wxVariant value;
             wxDataViewTreeNode *node = NULL;
             wxDataViewItem dataitem;
 
@@ -1779,61 +1752,61 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
                 dataitem = node->GetItem();
 
-                if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem))
+                if ((i > 0) && model->IsContainer(dataitem) &&
+                    !model->HasContainerColumns(dataitem))
                     continue;
             }
             else
             {
-                dataitem = wxDataViewItem( wxUIntToPtr(item) );
+                dataitem = wxDataViewItem( wxUIntToPtr(item+1) );
             }
 
-            model->GetValue( value, dataitem, col->GetModelColumn());
-            cell->SetValue( value );
-
-            if (cell->GetWantsAttr())
-            {
-                wxDataViewItemAttr attr;
-                bool ret = model->GetAttr( dataitem, col->GetModelColumn(), attr );
-                if (ret)
-                    cell->SetAttr( attr );
-                cell->SetHasAttr( ret );
-            }
+            cell->PrepareForItem(model, dataitem, col->GetModelColumn());
 
             // update cell_rect
             cell_rect.y = GetLineStart( item );
-            cell_rect.height = GetLineHeight( item );     // -1 is for the horizontal rules (?)
+            cell_rect.height = GetLineHeight( item );
 
-            //Draw the expander here.
+            // deal with the expander
             int indent = 0;
-            if ((!IsVirtualList()) && (col == expander))
+            if ((!IsList()) && (col == expander))
             {
-                indent = node->GetIndentLevel();
-
-                //Calculate the indent first
-                indent = cell_rect.x + GetOwner()->GetIndent() * indent;
-
-                int expander_width = m_lineHeight - 2*EXPANDER_MARGIN;
-                // change the cell_rect.x to the appropriate pos
-                int  expander_x = indent + EXPANDER_MARGIN;
-                int expander_y = cell_rect.y + EXPANDER_MARGIN + (GetLineHeight(item) / 2) - (expander_width/2) - EXPANDER_OFFSET;
-                indent = indent + m_lineHeight;  //try to use the m_lineHeight as the expander space
-                dc.SetPen( m_penExpander );
-                dc.SetBrush( wxNullBrush );
-                if( node->HasChildren() )
+                // Calculate the indent first
+                indent = GetOwner()->GetIndent() * node->GetIndentLevel();
+
+                // we reserve m_lineHeight of horizontal space for the expander
+                // but leave EXPANDER_MARGIN around the expander itself
+                int exp_x = cell_rect.x + indent + EXPANDER_MARGIN;
+
+                indent += m_lineHeight;
+
+                // draw expander if needed and visible
+                if ( node->HasChildren() && exp_x < cell_rect.GetRight() )
                 {
-                    wxRect rect( expander_x , expander_y, expander_width, expander_width);
+                    dc.SetPen( m_penExpander );
+                    dc.SetBrush( wxNullBrush );
+
+                    int exp_size = m_lineHeight - 2*EXPANDER_MARGIN;
+                    int exp_y = cell_rect.y + (cell_rect.height - exp_size)/2
+                                   + EXPANDER_MARGIN - EXPANDER_OFFSET;
+
+                    const wxRect rect(exp_x, exp_y, exp_size, exp_size);
+
                     int flag = 0;
-                    if (m_underMouse == node)
-                    {
+                    if ( m_underMouse == node )
                         flag |= wxCONTROL_CURRENT;
-                    }
-                    if( node->IsOpen() )
-                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag|wxCONTROL_EXPANDED );
-                    else
-                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
+                    if ( node->IsOpen() )
+                        flag |= wxCONTROL_EXPANDED;
+
+                    // ensure that we don't overflow the cell (which might
+                    // happen if the column is very narrow)
+                    wxDCClipper clip(dc, cell_rect);
+
+                    wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
                 }
-                 //force the expander column to left-center align
-                 cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
+
+                // force the expander column to left-center align
+                cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
             }
             if (node && !node->HasChildren())
             {
@@ -1842,38 +1815,15 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                 wxDELETE(node);
             }
 
-            // cannot be bigger than allocated space
-            wxSize size = cell->GetSize();
-            // Because of the tree structure indent, here we should minus the width of the cell for drawing
-            size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent );
-            // size.y = wxMin( size.y, cell_rect.height );
-            size.y = cell_rect.height;
-
-            wxRect item_rect(cell_rect.GetTopLeft(), size);
-            int align = cell->CalculateAlignment();
-
-            // horizontal alignment:
-            item_rect.x = cell_rect.x;
-            if (align & wxALIGN_CENTER_HORIZONTAL)
-                item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2);
-            else if (align & wxALIGN_RIGHT)
-                item_rect.x = cell_rect.x + cell_rect.width - size.x;
-            //else: wxALIGN_LEFT is the default
-
-            // vertical alignment:
-            item_rect.y = cell_rect.y;
-            if (align & wxALIGN_CENTER_VERTICAL)
-                item_rect.y = cell_rect.y + (cell_rect.height / 2) - (size.y / 2);
-            else if (align & wxALIGN_BOTTOM)
-                item_rect.y = cell_rect.y + cell_rect.height - size.y;
-            //else: wxALIGN_TOP is the default
-
-            // add padding
-            item_rect.x += PADDING_RIGHTLEFT;
-            item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;
-
-            //Here we add the tree indent
+            wxRect item_rect = cell_rect;
+            item_rect.Deflate(PADDING_RIGHTLEFT, 0);
+
+            // account for the tree indent (harmless if we're not indented)
             item_rect.x += indent;
+            item_rect.width -= indent;
+
+            if ( item_rect.width <= 0 )
+                continue;
 
             int state = 0;
             if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND))
@@ -1886,9 +1836,9 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             //       respect the given wxRect's top & bottom coords, eventually
             //       violating only the left & right coords - however the user can
             //       make its own renderer and thus we cannot be sure of that.
-            dc.SetClippingRegion( item_rect );
-            cell->Render( item_rect, &dc, state );
-            dc.DestroyClippingRegion();
+            wxDCClipper clip(dc, item_rect);
+
+            cell->WXCallRender(item_rect, &dc, state);
         }
 
         cell_rect.x += cell_rect.width;
@@ -1900,44 +1850,29 @@ void wxDataViewMainWindow::OnRenameTimer()
     // We have to call this here because changes may just have
     // been made and no screen update taken place.
     if ( m_dirty )
-        wxSafeYield();
-
-    int xpos = 0;
-    unsigned int cols = GetOwner()->GetColumnCount();
-    unsigned int i;
-    for (i = 0; i < cols; i++)
     {
-        wxDataViewColumn *c = GetOwner()->GetColumnAt( i );
-        if (c->IsHidden())
-            continue;      // skip it!
-
-        if (c == m_currentCol)
-            break;
-        xpos += c->GetWidth();
+        // TODO: use wxTheApp->SafeYieldFor(NULL, wxEVT_CATEGORY_UI) instead
+        //       (needs to be tested!)
+        wxSafeYield();
     }
-    wxRect labelRect( xpos,
-                      GetLineStart( m_currentRow ),
-                      m_currentCol->GetWidth(),
-                      GetLineHeight( m_currentRow ) );
-
-    GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y,
-                                     &labelRect.x, &labelRect.y);
 
     wxDataViewItem item = GetItemByRow( m_currentRow );
-    m_currentCol->GetRenderer()->StartEditing( item, labelRect );
 
+    wxRect labelRect = GetItemRect(item, m_currentCol);
+
+    m_currentCol->GetRenderer()->StartEditing( item, labelRect );
 }
 
-//------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Helper class for do operation on the tree node
-//------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 class DoJob
 {
 public:
     DoJob() { }
     virtual ~DoJob() { }
 
-    //The return value control how the tree-walker tranverse the tree
+    // The return value control how the tree-walker tranverse the tree
     // 0: Job done, stop tranverse and return
     // 1: Ignore the current node's subtree and continue
     // 2: Job not done, continue
@@ -1962,8 +1897,8 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func )
             ;
     }
 
-    wxDataViewTreeNodes nodes = node->GetNodes();
-    wxDataViewTreeLeaves leaves = node->GetChildren();
+    const wxDataViewTreeNodes& nodes = node->GetNodes();
+    const wxDataViewTreeLeaves& leaves = node->GetChildren();
 
     int len_nodes = nodes.GetCount();
     int len = leaves.GetCount();
@@ -1990,7 +1925,7 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func )
                     continue;
                 case DoJob::CONT:
                 default:
-                   ;
+                ;
             }
     }
     return false;
@@ -1998,9 +1933,13 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func )
 
 bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item)
 {
-    if (!m_root)
+    GetOwner()->InvalidateColBestWidths();
+
+    if (IsVirtualList())
     {
-        m_count++;
+        wxDataViewVirtualListModel *list_model =
+            (wxDataViewVirtualListModel*) GetOwner()->GetModel();
+        m_count = list_model->GetCount();
         UpdateDisplay();
         return true;
     }
@@ -2038,12 +1977,18 @@ static void DestroyTreeHelper( wxDataViewTreeNode * node);
 bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
                                        const wxDataViewItem& item)
 {
-    if (!m_root)
+    GetOwner()->InvalidateColBestWidths();
+
+    if (IsVirtualList())
     {
-        m_count--;
+        wxDataViewVirtualListModel *list_model =
+            (wxDataViewVirtualListModel*) GetOwner()->GetModel();
+        m_count = list_model->GetCount();
+
         if( m_currentRow > GetRowCount() )
             m_currentRow = m_count - 1;
 
+        // TODO: why empty the entire selection?
         m_selection.Empty();
 
         UpdateDisplay();
@@ -2053,12 +1998,16 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
 
     wxDataViewTreeNode * node = FindNode(parent);
 
-    wxCHECK_MSG( node != NULL, false, "item not found" );
-    wxCHECK_MSG( node->GetChildren().Index( item.GetID() ) != wxNOT_FOUND, false, "item not found" );
+    // Notice that it is possible that the item being deleted is not in the
+    // tree at all, for example we could be deleting a never shown (because
+    // collapsed) item in a tree model. So it's not an error if we don't know
+    // about this item, just return without doing anything then.
+    if ( !node || node->GetChildren().Index(item.GetID()) == wxNOT_FOUND )
+        return false;
 
     int sub = -1;
     node->GetChildren().Remove( item.GetID() );
-    //Manuplate selection
+    // Manipolate selection
     if( m_selection.GetCount() > 1 )
     {
         m_selection.Empty();
@@ -2093,11 +2042,11 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
         sub -= n->GetSubTreeCount();
         ::DestroyTreeHelper(n);
     }
-    //Make the row number invalid and get a new valid one when user call GetRowCount
+    // Make the row number invalid and get a new valid one when user call GetRowCount
     m_count = -1;
     node->ChangeSubTreeCount(sub);
 
-    //Change the current row to the last row if the current exceed the max row number
+    // Change the current row to the last row if the current exceed the max row number
     if( m_currentRow > GetRowCount() )
         m_currentRow = m_count - 1;
 
@@ -2108,10 +2057,12 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
 
 bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
 {
+    GetOwner()->InvalidateColBestWidths();
+
     SortPrepare();
     g_model->Resort();
 
-    //Send event
+    // Send event
     wxWindow *parent = GetParent();
     wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
     le.SetEventObject(parent);
@@ -2122,8 +2073,24 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
     return true;
 }
 
-bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int col )
+bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int model_column )
 {
+    int view_column = -1;
+    unsigned int n_col = m_owner->GetColumnCount();
+    for (unsigned i = 0; i < n_col; i++)
+    {
+        wxDataViewColumn *column = m_owner->GetColumn( i );
+        if (column->GetModelColumn() == model_column)
+        {
+            view_column = (int) i;
+            break;
+        }
+    }
+    if (view_column == -1)
+        return false;
+
+    GetOwner()->InvalidateColBestWidth(view_column);
+
     // NOTE: to be valid, we cannot use e.g. INT_MAX - 1
 /*#define MAX_VIRTUAL_WIDTH       100000
 
@@ -2136,14 +2103,14 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
     SortPrepare();
     g_model->Resort();
 
-    //Send event
+    // Send event
     wxWindow *parent = GetParent();
     wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
     le.SetEventObject(parent);
     le.SetModel(GetOwner()->GetModel());
     le.SetItem(item);
-    le.SetColumn(col);
-    le.SetDataViewColumn(GetOwner()->GetColumn(col));
+    le.SetColumn(view_column);
+    le.SetDataViewColumn(GetOwner()->GetColumn(view_column));
     parent->GetEventHandler()->ProcessEvent(le);
 
     return true;
@@ -2151,7 +2118,10 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
 
 bool wxDataViewMainWindow::Cleared()
 {
+    GetOwner()->InvalidateColBestWidths();
+
     DestroyTree();
+    m_selection.Clear();
 
     SortPrepare();
     BuildTree( GetOwner()->GetModel() );
@@ -2164,6 +2134,7 @@ bool wxDataViewMainWindow::Cleared()
 void wxDataViewMainWindow::UpdateDisplay()
 {
     m_dirty = true;
+    m_underMouse = NULL;
 }
 
 void wxDataViewMainWindow::OnInternalIdle()
@@ -2197,6 +2168,8 @@ void wxDataViewMainWindow::RecalculateDisplay()
 
 void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
 {
+    m_underMouse = NULL;
+
     wxWindow::ScrollWindow( dx, dy, rect );
 
     if (GetOwner()->m_headerArea)
@@ -2205,6 +2178,8 @@ void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
 
 void wxDataViewMainWindow::ScrollTo( int rows, int column )
 {
+    m_underMouse = NULL;
+
     int x, y;
     m_owner->GetScrollPixelsPerUnit( &x, &y );
     int sy = GetLineStart( rows )/y;
@@ -2274,9 +2249,9 @@ unsigned int wxDataViewMainWindow::GetLastVisibleRow()
 {
     wxSize client_size = GetClientSize();
     m_owner->CalcUnscrolledPosition( client_size.x, client_size.y,
-                                     &client_size.x, &client_size.y );
+                                    &client_size.x, &client_size.y );
 
-    //we should deal with the pixel here
+    // we should deal with the pixel here
     unsigned int row = GetLineAt(client_size.y) - 1;
 
     return wxMin( GetRowCount()-1, row );
@@ -2455,7 +2430,7 @@ void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow )
 void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event)
 {
     wxCHECK_RET( newCurrent < GetRowCount(),
-                 _T("invalid item index in OnArrowChar()") );
+                wxT("invalid item index in OnArrowChar()") );
 
     // if there is no selection, we cannot move it anywhere
     if (!HasCurrentRow())
@@ -2549,18 +2524,18 @@ int wxDataViewMainWindow::GetLineStart( unsigned int row ) const
                 if (column->IsHidden())
                     continue;      // skip it!
 
-                if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item))
+                if ((col != 0) &&
+                    model->IsContainer(item) &&
+                    !model->HasContainerColumns(item))
                     continue;      // skip it!
 
-                const wxDataViewRenderer *renderer = column->GetRenderer();
-                wxVariant value;
-                model->GetValue( value, item, column->GetModelColumn() );
-                wxDataViewRenderer *renderer2 = const_cast<wxDataViewRenderer*>(renderer);
-                renderer2->SetValue( value );
+                wxDataViewRenderer *renderer =
+                    const_cast<wxDataViewRenderer*>(column->GetRenderer());
+                renderer->PrepareForItem(model, item, column->GetModelColumn());
+
                 height = wxMax( height, renderer->GetSize().y );
             }
 
-
             start += height;
         }
 
@@ -2585,14 +2560,14 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const
     unsigned int yy = 0;
     for (;;)
     {
-       const wxDataViewTreeNode* node = GetTreeNodeByRow(row);
-       if (!node)
-       {
-           // not really correct...
-           return row + ((y-yy) / m_lineHeight);
-       }
+        const wxDataViewTreeNode* node = GetTreeNodeByRow(row);
+        if (!node)
+        {
+            // not really correct...
+            return row + ((y-yy) / m_lineHeight);
+        }
 
-       wxDataViewItem item = node->GetItem();
+        wxDataViewItem item = node->GetItem();
 
         if (node && !node->HasChildren())
         {
@@ -2601,31 +2576,32 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const
             wxDELETE(node);
         }
 
-       unsigned int cols = GetOwner()->GetColumnCount();
-       unsigned int col;
-       int height = m_lineHeight;
-       for (col = 0; col < cols; col++)
-       {
+        unsigned int cols = GetOwner()->GetColumnCount();
+        unsigned int col;
+        int height = m_lineHeight;
+        for (col = 0; col < cols; col++)
+        {
             const wxDataViewColumn *column = GetOwner()->GetColumn(col);
             if (column->IsHidden())
                 continue;      // skip it!
 
-            if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item))
+            if ((col != 0) &&
+                model->IsContainer(item) &&
+                !model->HasContainerColumns(item))
                 continue;      // skip it!
 
-            const wxDataViewRenderer *renderer = column->GetRenderer();
-            wxVariant value;
-            model->GetValue( value, item, column->GetModelColumn() );
-            wxDataViewRenderer *renderer2 = const_cast<wxDataViewRenderer*>(renderer);
-            renderer2->SetValue( value );
+            wxDataViewRenderer *renderer =
+                const_cast<wxDataViewRenderer*>(column->GetRenderer());
+            renderer->PrepareForItem(model, item, column->GetModelColumn());
+
             height = wxMax( height, renderer->GetSize().y );
-       }
+        }
 
-       yy += height;
-       if (y < yy)
-           return row;
+        yy += height;
+        if (y < yy)
+            return row;
 
-       row++;
+        row++;
     }
 }
 
@@ -2647,7 +2623,7 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
         {
                 // Yes, if the node does not have any child, it must be a leaf which
                 // mean that it is a temporarily created by GetTreeNodeByRow
-             wxDELETE(node);
+            wxDELETE(node);
         }
 
         int height = m_lineHeight;
@@ -2660,14 +2636,15 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
             if (column->IsHidden())
                 continue;      // skip it!
 
-            if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item))
+            if ((col != 0) &&
+                model->IsContainer(item) &&
+                !model->HasContainerColumns(item))
                 continue;      // skip it!
 
-            const wxDataViewRenderer *renderer = column->GetRenderer();
-            wxVariant value;
-            model->GetValue( value, item, column->GetModelColumn() );
-            wxDataViewRenderer *renderer2 = const_cast<wxDataViewRenderer*>(renderer);
-            renderer2->SetValue( value );
+            wxDataViewRenderer *renderer =
+                const_cast<wxDataViewRenderer*>(column->GetRenderer());
+            renderer->PrepareForItem(model, item, column->GetModelColumn());
+
             height = wxMax( height, renderer->GetSize().y );
         }
 
@@ -2682,14 +2659,15 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
 class RowToItemJob: public DoJob
 {
 public:
-    RowToItemJob( unsigned int row , int current ) { this->row = row; this->current = current;}
-    virtual ~RowToItemJob() { }
+    RowToItemJob( unsigned int row , int current )
+        { this->row = row; this->current = current; }
+    virtual ~RowToItemJob() {}
 
     virtual int operator() ( wxDataViewTreeNode * node )
     {
         current ++;
         if( current == static_cast<int>(row))
-         {
+        {
             ret = node->GetItem();
             return DoJob::OK;
         }
@@ -2701,8 +2679,10 @@ public:
         }
         else
         {
-            //If the current has no child node, we can find the desired item of the row number directly.
-            //This if can speed up finding in some case, and will has a very good effect when it comes to list view
+            // If the current has no child node, we can find the desired item of the row
+            // number directly.
+            // This if can speed up finding in some case, and will has a very good effect
+            // when it comes to list view
             if( node->GetNodes().GetCount() == 0)
             {
                 int index = static_cast<int>(row) - current - 1;
@@ -2717,13 +2697,16 @@ public:
     {
         current ++;
         if( current == static_cast<int>(row))
-         {
+        {
             ret = wxDataViewItem( n );
             return DoJob::OK;
         }
         return DoJob::CONT;
     }
-    wxDataViewItem GetResult(){ return ret; }
+
+    wxDataViewItem GetResult() const
+        { return ret; }
+
 private:
     unsigned int row;
     int current;
@@ -2732,9 +2715,9 @@ private:
 
 wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const
 {
-    if (!m_root)
+    if (IsVirtualList())
     {
-        return wxDataViewItem( wxUIntToPtr(row) );
+        return wxDataViewItem( wxUIntToPtr(row+1) );
     }
     else
     {
@@ -2760,7 +2743,7 @@ public:
     {
         current ++;
         if( current == static_cast<int>(row))
-         {
+        {
             ret = node;
             return DoJob::OK;
         }
@@ -2773,8 +2756,11 @@ public:
         else
         {
             parent = node;
-            //If the current has no child node, we can find the desired item of the row number directly.
-            //This if can speed up finding in some case, and will has a very good effect when it comes to list view
+
+            // If the current node has no children, we can find the desired item of the
+            // row number directly.
+            // This if can speed up finding in some case, and will have a very good
+            // effect for list views.
             if( node->GetNodes().GetCount() == 0)
             {
                 int index = static_cast<int>(row) - current - 1;
@@ -2786,15 +2772,13 @@ public:
             }
             return DoJob::CONT;
         }
-
-
     }
 
     virtual int operator() ( void * n )
     {
         current ++;
         if( current == static_cast<int>(row))
-         {
+        {
             ret = new wxDataViewTreeNode( parent );
             ret->SetItem( wxDataViewItem( n ));
             ret->SetHasChildren(false);
@@ -2803,7 +2787,10 @@ public:
 
         return DoJob::CONT;
     }
-    wxDataViewTreeNode * GetResult(){ return ret; }
+
+    wxDataViewTreeNode * GetResult() const
+        { return ret; }
+
 private:
     unsigned int row;
     int current;
@@ -2811,7 +2798,6 @@ private:
     wxDataViewTreeNode * parent;
 };
 
-
 wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) const
 {
     wxASSERT( !IsVirtualList() );
@@ -2821,7 +2807,8 @@ wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) co
     return job.GetResult();
 }
 
-wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const wxDataViewItem & item )
+wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type,
+                                                         const wxDataViewItem & item )
 {
     wxWindow *parent = GetParent();
     wxDataViewEvent le(type, parent->GetId());
@@ -2834,132 +2821,196 @@ wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const
     return le;
 }
 
-
 bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const
 {
-    if (IsVirtualList())
-       return false;
+    if (IsList())
+        return false;
 
     wxDataViewTreeNode * node = GetTreeNodeByRow(row);
     if (!node)
-       return false;
+        return false;
 
     if (!node->HasChildren())
     {
-       delete node;
-       return false;
+        delete node;
+        return false;
     }
 
     return node->IsOpen();
 }
 
-
-void wxDataViewMainWindow::OnExpanding( unsigned int row )
+bool wxDataViewMainWindow::HasChildren( unsigned int row ) const
 {
-    if (IsVirtualList())
-       return;
+    if (IsList())
+        return false;
 
     wxDataViewTreeNode * node = GetTreeNodeByRow(row);
-    if( node != NULL )
+    if (!node)
+        return false;
+
+    if (!node->HasChildren())
     {
-        if( node->HasChildren())
-        {
-            if( !node->IsOpen())
-            {
-               wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,node->GetItem());
-               //Check if the user prevent expanding
-               if( e.GetSkipped() )
-                    return;
+        delete node;
+        return false;
+    }
 
-               node->ToggleOpen();
-               //Here I build the children of current node
-               if( node->GetChildrenNumber() == 0 )
-               {
-                   SortPrepare();
-                   ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);
-               }
-               m_count = -1;
-               UpdateDisplay();
-               //Send the expanded event
-               SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem());
-            }
-            else
-            {
-                SelectRow( row, false );
-                SelectRow( row + 1, true );
-                ChangeCurrentRow( row + 1 );
-                SendSelectionChangedEvent( GetItemByRow(row+1));
-            }
-        }
-        else
-            delete node;
-    }
+    return true;
 }
 
-void wxDataViewMainWindow::OnCollapsing(unsigned int row)
+void wxDataViewMainWindow::Expand( unsigned int row )
 {
-    if (IsVirtualList())
-       return;
+    if (IsList())
+        return;
 
     wxDataViewTreeNode * node = GetTreeNodeByRow(row);
-    if( node != NULL )
+    if (!node)
+        return;
+
+    if (!node->HasChildren())
+    {
+        delete node;
+        return;
+    }
+
+            if (!node->IsOpen())
+            {
+                wxDataViewEvent e =
+                    SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, node->GetItem());
+
+                // Check if the user prevent expanding
+                if( e.GetSkipped() )
+                    return;
+
+                node->ToggleOpen();
+
+                // build the children of current node
+                if( node->GetChildrenNumber() == 0 )
+                {
+                    SortPrepare();
+                    ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);
+                }
+
+                // By expanding the node all row indices that are currently in the selection list
+                // and are greater than our node have become invalid. So we have to correct that now.
+                const unsigned rowAdjustment = node->GetSubTreeCount();
+                for(unsigned i=0; i<m_selection.size(); ++i)
+                {
+                    const unsigned testRow = m_selection[i];
+                    // all rows above us are not affected, so skip them
+                    if(testRow <= row)
+                        continue;
+
+                    m_selection[i] += rowAdjustment;
+                }
+
+                if(m_currentRow > row)
+                    ChangeCurrentRow(m_currentRow + rowAdjustment);
+
+                m_count = -1;
+                UpdateDisplay();
+                // Send the expanded event
+                SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem());
+            }
+}
+
+void wxDataViewMainWindow::Collapse(unsigned int row)
+{
+    if (IsList())
+        return;
+
+    wxDataViewTreeNode *node = GetTreeNodeByRow(row);
+    if (!node)
+        return;
+
+    if (!node->HasChildren())
     {
-        wxDataViewTreeNode * nd = node;
+        delete node;
+        return;
+    }
 
-        if( node->HasChildren() && node->IsOpen() )
+        if (node->IsOpen())
         {
-            wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem());
+            wxDataViewEvent e =
+                SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem());
             if( e.GetSkipped() )
                 return;
+
+            // Find out if there are selected items below the current node.
+            bool selectCollapsingRow = false;
+            const unsigned rowAdjustment = node->GetSubTreeCount();
+            unsigned maxRowToBeTested = row + rowAdjustment;
+            for(unsigned i=0; i<m_selection.size(); ++i)
+            {
+                const unsigned testRow = m_selection[i];
+                if(testRow > row && testRow <= maxRowToBeTested)
+                {
+                    selectCollapsingRow = true;
+                    // get out as soon as we have found a node that is selected
+                    break;
+                }
+            }
+
             node->ToggleOpen();
-            m_count = -1;
-            UpdateDisplay();
-            SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,nd->GetItem());
-        }
-        else
-        {
-            node = node->GetParent();
-            if( node != NULL )
+
+            // If the node to be closed has selected items the user won't see those any longer.
+            // We select the collapsing node in this case.
+            if(selectCollapsingRow)
             {
-                int  parent = GetRowByItem( node->GetItem() );
-                if( parent >= 0 )
+                SelectAllRows(false);
+                ChangeCurrentRow(row);
+                SelectRow(row, true);
+                SendSelectionChangedEvent(GetItemByRow(row));
+            }
+            else
+            {
+                // if there were no selected items below our node we still need to "fix" the
+                // selection list to adjust for the changing of the row indices.
+                // We actually do the opposite of what we are doing in Expand().
+                for(unsigned i=0; i<m_selection.size(); ++i)
                 {
-                    SelectRow( row, false);
-                    SelectRow(parent , true );
-                    ChangeCurrentRow( parent );
-                    SendSelectionChangedEvent( node->GetItem() );
+                    const unsigned testRow = m_selection[i];
+                    // all rows above us are not affected, so skip them
+                    if(testRow <= row)
+                        continue;
+
+                    m_selection[i] -= rowAdjustment;
                 }
+
+                // if the "current row" is being collapsed away we change it to the current row ;-)
+                if(m_currentRow > row && m_currentRow <= maxRowToBeTested)
+                    ChangeCurrentRow(row);
+                else if(m_currentRow > row)
+                    ChangeCurrentRow(m_currentRow - rowAdjustment);
             }
+
+            m_count = -1;
+            UpdateDisplay();
+            SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,node->GetItem());
         }
-        if( !nd->HasChildren())
-            delete nd;
-    }
 }
 
 wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item )
 {
-    wxDataViewModel * model = GetOwner()->GetModel();
+    const wxDataViewModel * model = GetOwner()->GetModel();
     if( model == NULL )
         return NULL;
 
     if (!item.IsOk())
         return m_root;
 
-    //Compose the a parent-chain of the finding item
-    ItemList list;
-    list.DeleteContents( true );
+    // Compose the parent-chain for the item we are looking for
+    wxVector<wxDataViewItem> parentChain;
     wxDataViewItem it( item );
     while( it.IsOk() )
     {
-        wxDataViewItem * pItem = new wxDataViewItem( it );
-        list.Insert( pItem );
-        it = model->GetParent( it );
+        parentChain.push_back(it);
+        it = model->GetParent(it);
     }
 
-    //Find the item along the parent-chain.
-    //This algorithm is designed to speed up the node-finding method
-    wxDataViewTreeNode * node = m_root;
-    for( ItemList::const_iterator iter = list.begin(); iter !=list.end(); iter++ )
+    // Find the item along the parent-chain.
+    // This algorithm is designed to speed up the node-finding method
+    wxDataViewTreeNode* node = m_root;
+    for( unsigned iter = parentChain.size()-1; iter>=0; --iter )
     {
         if( node->HasChildren() )
         {
@@ -2969,18 +3020,18 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
                 ::BuildTreeHelper(model, node->GetItem(), node);
             }
 
-            wxDataViewTreeNodes nodes = node->GetNodes();
-            unsigned int i;
+            const wxDataViewTreeNodes& nodes = node->GetNodes();
             bool found = false;
 
-            for (i = 0; i < nodes.GetCount(); i ++)
+            for (unsigned i = 0; i < nodes.GetCount(); ++i)
             {
-                if (nodes[i]->GetItem() == (**iter))
+                wxDataViewTreeNode* currentNode = nodes[i];
+                if (currentNode->GetItem() == parentChain[iter])
                 {
-                    if (nodes[i]->GetItem() == item)
-                       return nodes[i];
+                    if (currentNode->GetItem() == item)
+                        return currentNode;
 
-                    node = nodes[i];
+                    node = currentNode;
                     found = true;
                     break;
                 }
@@ -2994,7 +3045,8 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
     return NULL;
 }
 
-void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column )
+void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item,
+                                    wxDataViewColumn* &column )
 {
     wxDataViewColumn *col = NULL;
     unsigned int cols = GetOwner()->GetColumnCount();
@@ -3018,35 +3070,77 @@ void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item
     item = GetItemByRow( GetLineAt( y ) );
 }
 
-wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column )
+wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item,
+                                          const wxDataViewColumn* column )
 {
+    int xpos = 0;
+    int width = 0;
+
+    unsigned int cols = GetOwner()->GetColumnCount();
+    // If column is null the loop will compute the combined width of all columns.
+    // Otherwise, it will compute the x position of the column we are looking for.
+    for (unsigned int i = 0; i < cols; i++)
+    {
+        wxDataViewColumn* col = GetOwner()->GetColumnAt( i );
+
+        if (col == column)
+            break;
+
+        if (col->IsHidden())
+            continue;      // skip it!
+
+        xpos += col->GetWidth();
+        width += col->GetWidth();
+    }
+
+    if(column != 0)
+    {
+        // If we have a column, we need can get its width directly.
+        if(column->IsHidden())
+            width = 0;
+        else
+            width = column->GetWidth();
+
+    }
+    else
+    {
+        // If we have no column, we reset the x position back to zero.
+        xpos = 0;
+    }
+
+    // we have to take an expander column into account and compute its indentation
+    // to get the correct x position where the actual text is
+    int indent = 0;
     int row = GetRowByItem(item);
-    int y = GetLineStart( row );
-    int h = GetLineHeight( m_lineHeight );
-    int x = 0;
-    wxDataViewColumn *col = NULL;
-    for( int i = 0, cols = GetOwner()->GetColumnCount(); i < cols; i ++ )
+    if (!IsList() && (column == 0 || GetOwner()->GetExpanderColumn() == column) )
     {
-       col = GetOwner()->GetColumnAt( i );
-       x += col->GetWidth();
-       if( GetOwner()->GetColumnAt(i+1) == column )
-           break;
+        wxDataViewTreeNode* node = GetTreeNodeByRow(row);
+        indent = GetOwner()->GetIndent() * node->GetIndentLevel();
+        indent = indent + m_lineHeight; // use m_lineHeight as the width of the expander
+
+        if(!node->HasChildren())
+            delete node;
     }
-    int w = col->GetWidth();
-    m_owner->CalcScrolledPosition( x, y, &x, &y );
-    return wxRect(x, y, w, h);
+
+    wxRect itemRect( xpos + indent,
+                     GetLineStart( row ),
+                     width - indent,
+                     GetLineHeight( row ) );
+
+    GetOwner()->CalcScrolledPosition(  itemRect.x,  itemRect.y,
+                                      &itemRect.x, &itemRect.y );
+
+    return itemRect;
 }
 
 int wxDataViewMainWindow::RecalculateCount()
 {
-    if (!m_root)
+    if (IsVirtualList())
     {
-        wxDataViewIndexListModel *list_model = (wxDataViewIndexListModel*) GetOwner()->GetModel();
-#ifndef __WXMAC__
-        return list_model->GetLastIndex() + 1;
-#else
-        return list_model->GetLastIndex() - 1;
-#endif
+        wxDataViewVirtualListModel *list_model =
+            (wxDataViewVirtualListModel*) GetOwner()->GetModel();
+
+        return list_model->GetCount();
     }
     else
     {
@@ -3057,32 +3151,32 @@ int wxDataViewMainWindow::RecalculateCount()
 class ItemToRowJob : public DoJob
 {
 public:
-    ItemToRowJob(const wxDataViewItem& item_, ItemList::const_iterator iter)
+    ItemToRowJob(const wxDataViewItem& item_, wxVector<wxDataViewItem>::reverse_iterator iter)
         : m_iter(iter),
-          item(item_)
+        item(item_)
     {
         ret = -1;
     }
 
-    //Maybe binary search will help to speed up this process
+    // Maybe binary search will help to speed up this process
     virtual int operator() ( wxDataViewTreeNode * node)
     {
-         ret ++;
-         if( node->GetItem() == item )
-         {
-             return DoJob::OK;
-         }
+        ret ++;
+        if( node->GetItem() == item )
+        {
+            return DoJob::OK;
+        }
 
-         if( node->GetItem() == **m_iter )
-         {
-             m_iter++;
-             return DoJob::CONT;
-         }
-         else
-         {
-             ret += node->GetSubTreeCount();
-             return DoJob::IGR;
-         }
+        if( node->GetItem() == *m_iter )
+        {
+            m_iter++;
+            return DoJob::CONT;
+        }
+        else
+        {
+            ret += node->GetSubTreeCount();
+            return DoJob::IGR;
+        }
 
     }
 
@@ -3093,11 +3187,13 @@ public:
             return DoJob::OK;
         return DoJob::CONT;
     }
-    //the row number is begin from zero
-    int GetResult() { return ret -1; }
+
+    // the row number is begin from zero
+    int GetResult() const
+        { return ret -1; }
 
 private:
-    ItemList::const_iterator  m_iter;
+    wxVector<wxDataViewItem>::reverse_iterator m_iter;
     wxDataViewItem item;
     int ret;
 
@@ -3109,36 +3205,37 @@ int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) const
     if( model == NULL )
         return -1;
 
-    if (!m_root)
+    if (IsVirtualList())
     {
-        return wxPtrToUInt( item.GetID() );
+        return wxPtrToUInt( item.GetID() ) -1;
     }
     else
     {
         if( !item.IsOk() )
             return -1;
 
-        //Compose the a parent-chain of the finding item
-        ItemList list;
-        wxDataViewItem * pItem;
-        list.DeleteContents( true );
+        // Compose the parent-chain of the item we are looking for
+        wxVector<wxDataViewItem> parentChain;
         wxDataViewItem it( item );
         while( it.IsOk() )
         {
-            pItem = new wxDataViewItem( it );
-            list.Insert( pItem );
-            it = model->GetParent( it );
+            parentChain.push_back(it);
+            it = model->GetParent(it);
         }
-        pItem = new wxDataViewItem( );
-        list.Insert( pItem );
 
-        ItemToRowJob job( item, list.begin() );
-        Walker(m_root , job );
+        // add an 'invalid' item to represent our 'invisible' root node
+        parentChain.push_back(wxDataViewItem());
+
+        // the parent chain was created by adding the deepest parent first.
+        // so if we want to start at the root node, we have to iterate backwards through the vector
+        ItemToRowJob job( item, parentChain.rbegin() );
+        Walker( m_root, job );
         return job.GetResult();
     }
 }
 
-static void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataViewTreeNode * node)
+static void BuildTreeHelper( const wxDataViewModel * model,  const wxDataViewItem & item,
+                             wxDataViewTreeNode * node)
 {
     if( !model->IsContainer( item ) )
         return;
@@ -3182,7 +3279,7 @@ void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
     m_root = new wxDataViewTreeNode( NULL );
     m_root->SetHasChildren(true);
 
-    //First we define a invalid item to fetch the top-level elements
+    // First we define a invalid item to fetch the top-level elements
     wxDataViewItem item;
     SortPrepare();
     BuildTreeHelper( model, item, m_root);
@@ -3194,12 +3291,9 @@ static void DestroyTreeHelper( wxDataViewTreeNode * node )
     if( node->GetNodeNumber() != 0 )
     {
         int len = node->GetNodeNumber();
-        int i = 0;
         wxDataViewTreeNodes& nodes = node->GetNodes();
-        for(; i < len; i ++ )
-        {
+        for (int i = 0; i < len; i++)
             DestroyTreeHelper(nodes[i]);
-        }
     }
     delete node;
 }
@@ -3208,15 +3302,23 @@ void wxDataViewMainWindow::DestroyTree()
 {
     if (!IsVirtualList())
     {
-       ::DestroyTreeHelper(m_root);
-        m_count = 0;
-        m_root = NULL;
+        ::DestroyTreeHelper(m_root);
+            m_count = 0;
+            m_root = NULL;
     }
 }
 
 void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
 {
-    if ( GetParent()->HandleAsNavigationKey(event) )
+    wxWindow * const parent = GetParent();
+
+    // propagate the char event upwards
+    wxKeyEvent eventForParent(event);
+    eventForParent.SetEventObject(parent);
+    if ( parent->ProcessWindowEvent(eventForParent) )
+        return;
+
+    if ( parent->HandleAsNavigationKey(event) )
         return;
 
     // no item -> nothing to do
@@ -3228,16 +3330,14 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
 
     // don't use m_linesPerPage directly as it might not be computed yet
     const int pageSize = GetCountPerPage();
-    wxCHECK_RET( pageSize, _T("should have non zero page size") );
+    wxCHECK_RET( pageSize, wxT("should have non zero page size") );
 
     switch ( event.GetKeyCode() )
     {
         case WXK_RETURN:
-        {
-            if (m_currentRow >= 0)
             {
-                wxWindow *parent = GetParent();
-                wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId());
+                wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED,
+                                   parent->GetId());
                 le.SetItem( GetItemByRow(m_currentRow) );
                 le.SetEventObject(parent);
                 le.SetModel(GetOwner()->GetModel());
@@ -3245,7 +3345,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
                 parent->GetEventHandler()->ProcessEvent(le);
             }
             break;
-        }
+
         case WXK_UP:
             if ( m_currentRow > 0 )
                 OnArrowChar( m_currentRow - 1, event );
@@ -3255,18 +3355,64 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
             if ( m_currentRow < GetRowCount() - 1 )
                 OnArrowChar( m_currentRow + 1, event );
             break;
-        //Add the process for tree expanding/collapsing
+        // Add the process for tree expanding/collapsing
         case WXK_LEFT:
-         OnCollapsing(m_currentRow);
-         break;
-     case WXK_RIGHT:
-         OnExpanding( m_currentRow);
-         break;
+        {
+            if (IsList())
+               break;
+
+            wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
+            if (!node)
+                break;
+
+            if (node->HasChildren() && node->IsOpen())
+            {
+                Collapse(m_currentRow);
+            }
+            else    // if the node is already closed we move the selection to its parent
+            {
+                wxDataViewTreeNode *parent_node = node->GetParent();
+
+                if(!node->HasChildren())
+                    delete node;
+
+                if (parent_node)
+                {
+                    int parent = GetRowByItem( parent_node->GetItem() );
+                    if ( parent >= 0 )
+                    {
+                        unsigned int row = m_currentRow;
+                        SelectRow( row, false);
+                        SelectRow( parent, true );
+                        ChangeCurrentRow( parent );
+                        GetOwner()->EnsureVisible( parent, -1 );
+                        SendSelectionChangedEvent( parent_node->GetItem() );
+                    }
+                }
+            }
+            break;
+        }
+        case WXK_RIGHT:
+        {
+            if (!IsExpanded( m_currentRow ))
+                Expand( m_currentRow );
+            else
+            {
+                unsigned int row = m_currentRow;
+                SelectRow( row, false );
+                SelectRow( row + 1, true );
+                ChangeCurrentRow( row + 1 );
+                GetOwner()->EnsureVisible( row + 1, -1 );
+                SendSelectionChangedEvent( GetItemByRow(row+1) );
+            }
+            break;
+        }
         case WXK_END:
+        {
             if (!IsEmpty())
                 OnArrowChar( GetRowCount() - 1, event );
             break;
-
+        }
         case WXK_HOME:
             if (!IsEmpty())
                 OnArrowChar( 0, event );
@@ -3295,6 +3441,16 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
             }
             break;
 
+        case WXK_F2:
+            {
+                if(m_selection.size() == 1)
+                {
+                    // TODO: we need to revise that when we have a concept for a 'current column'
+                    GetOwner()->StartEditor(GetItemByRow(m_selection[0]), 0);
+                }
+            }
+            break;
+
         default:
             event.Skip();
     }
@@ -3309,6 +3465,10 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         return;
     }
 
+    // set the focus to ourself if any of the mouse buttons are pressed
+    if(event.ButtonDown() && !HasFocus())
+        SetFocus();
+
     int x = event.GetX();
     int y = event.GetY();
     m_owner->CalcUnscrolledPosition( x, y, &x, &y );
@@ -3331,41 +3491,47 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         xpos += c->GetWidth();
     }
     if (!col)
+    {
+        event.Skip();
         return;
+    }
 
     wxDataViewRenderer *cell = col->GetRenderer();
     unsigned int current = GetLineAt( y );
     if ((current >= GetRowCount()) || (x > GetEndOfLastCol()))
     {
         // Unselect all if below the last row ?
+        event.Skip();
         return;
     }
 
-    //Test whether the mouse is hovered on the tree item button
-    bool hover = false;
-    if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col))
+    // Test whether the mouse is hovered on the tree item button
+    bool hoverOverExpander = false;
+    if ((!IsList()) && (GetOwner()->GetExpanderColumn() == col))
     {
         wxDataViewTreeNode * node = GetTreeNodeByRow(current);
         if( node!=NULL && node->HasChildren() )
         {
             int indent = node->GetIndentLevel();
             indent = GetOwner()->GetIndent()*indent;
-            wxRect rect( xpos + indent + EXPANDER_MARGIN,
-                         GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET,
-                         m_lineHeight-2*EXPANDER_MARGIN,
-                         m_lineHeight-2*EXPANDER_MARGIN + EXPANDER_OFFSET);
-            if( rect.Contains( x, y) )
+
+            // we make the rectangle we are looking in a bit bigger than the actual
+            // visual expander so the user can hit that little thing reliably
+            wxRect rect( xpos + indent,
+                        GetLineStart( current ) + (GetLineHeight(current) - m_lineHeight)/2,
+                        m_lineHeight, m_lineHeight);
+            if( rect.Contains(x, y) )
             {
-                //So the mouse is over the expander
-                hover = true;
+                // So the mouse is over the expander
+                hoverOverExpander = true;
                 if (m_underMouse && m_underMouse != node)
                 {
-                    //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
+                    // wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
                     RefreshRow(GetRowByItem(m_underMouse->GetItem()));
                 }
                 if (m_underMouse != node)
                 {
-                    //wxLogMessage("Do the row: %d", current);
+                    // wxLogMessage("Do the row: %d", current);
                     RefreshRow(current);
                 }
                 m_underMouse = node;
@@ -3374,11 +3540,11 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         if (node!=NULL && !node->HasChildren())
             delete node;
     }
-    if (!hover)
+    if (!hoverOverExpander)
     {
         if (m_underMouse != NULL)
         {
-            //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
+            // wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
             RefreshRow(GetRowByItem(m_underMouse->GetItem()));
             m_underMouse = NULL;
         }
@@ -3404,7 +3570,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
         if (event.LeftIsDown())
         {
-            m_owner->CalcUnscrolledPosition( m_dragStart.x, m_dragStart.y, &m_dragStart.x, &m_dragStart.y );
+            m_owner->CalcUnscrolledPosition( m_dragStart.x, m_dragStart.y,
+                                             &m_dragStart.x, &m_dragStart.y );
             unsigned int drag_item_row = GetLineAt( m_dragStart.y );
             wxDataViewItem item = GetItemByRow( drag_item_row );
 
@@ -3436,7 +3603,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     }
 #endif // wxUSE_DRAG_AND_DROP
 
-    bool forceClick = false;
+    bool simulateClick = false;
 
     if (event.ButtonDClick())
     {
@@ -3447,28 +3614,43 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     wxDataViewItem item = GetItemByRow(current);
     bool ignore_other_columns =
         ((GetOwner()->GetExpanderColumn() != col) &&
-         (model->IsContainer(item)) &&
-         (!model->HasContainerColumns(item)));
+        (model->IsContainer(item)) &&
+        (!model->HasContainerColumns(item)));
 
     if (event.LeftDClick())
     {
-        if ( current == m_lineLastClicked )
+        if(hoverOverExpander)
+        {
+            // a double click on the expander will be converted into a "simulated" normal click
+            simulateClick = true;
+        }
+        else if ( current == m_lineLastClicked )
         {
             if ((!ignore_other_columns) && (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE))
             {
+                const unsigned colIdx = col->GetModelColumn();
+
                 wxVariant value;
-                model->GetValue( value, item, col->GetModelColumn() );
-                cell->SetValue( value );
-                wxRect cell_rect( xpos, GetLineStart( current ),
-                                  col->GetWidth(), GetLineHeight( current ) );
-                cell->Activate( cell_rect, model, item, col->GetModelColumn() );
+                model->GetValue( value, item, colIdx );
+
+                cell->WXOnActivate(model, value, item, colIdx);
 
+                if ( wxDataViewCustomRenderer *custom = cell->WXGetAsCustom() )
+                {
+                    cell->SetValue( value );
+
+                    wxRect cell_rect( xpos, GetLineStart( current ),
+                                    col->GetWidth(), GetLineHeight( current ) );
+                    custom->Activate( cell_rect, model, item, colIdx );
+                }
             }
             else
             {
                 wxWindow *parent = GetParent();
                 wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId());
                 le.SetItem( item );
+                le.SetColumn( col->GetModelColumn() );
+                le.SetDataViewColumn( col );
                 le.SetEventObject(parent);
                 le.SetModel(GetOwner()->GetModel());
 
@@ -3480,11 +3662,11 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         {
             // The first click was on another item, so don't interpret this as
             // a double click, but as a simple click instead
-            forceClick = true;
+            simulateClick = true;
         }
     }
 
-    if (event.LeftUp())
+    if (event.LeftUp() && !hoverOverExpander)
     {
         if (m_lineSelectSingleOnUp != (unsigned int)-1)
         {
@@ -3494,34 +3676,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             SendSelectionChangedEvent( GetItemByRow(m_lineSelectSingleOnUp) );
         }
 
-        //Process the event of user clicking the expander
-        bool expander = false;
-        if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col))
-        {
-            wxDataViewTreeNode * node = GetTreeNodeByRow(current);
-            if( node!=NULL && node->HasChildren() )
-            {
-                int indent = node->GetIndentLevel();
-                indent = GetOwner()->GetIndent()*indent;
-                wxRect rect( xpos + indent + EXPANDER_MARGIN,
-                         GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET,
-                         m_lineHeight-2*EXPANDER_MARGIN,
-                         m_lineHeight-2*EXPANDER_MARGIN + EXPANDER_OFFSET);
-
-                if( rect.Contains( x, y) )
-                {
-                    expander = true;
-                    if( node->IsOpen() )
-                        OnCollapsing(current);
-                    else
-                        OnExpanding( current );
-                }
-            }
-            if (node && !node->HasChildren())
-               delete node;
-        }
-        //If the user click the expander, we do not do editing even if the column with expander are editable
-        if (m_lastOnSame && !expander && !ignore_other_columns)
+        // If the user click the expander, we do not do editing even if the column
+        // with expander are editable
+        if (m_lastOnSame && !ignore_other_columns)
         {
             if ((col == m_currentCol) && (current == m_currentRow) &&
                 (cell->GetMode() & wxDATAVIEW_CELL_EDITABLE) )
@@ -3533,7 +3690,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         m_lastOnSame = false;
         m_lineSelectSingleOnUp = (unsigned int)-1;
     }
-    else
+    else if(!event.LeftUp())
     {
         // This is necessary, because after a DnD operation in
         // from and to ourself, the up event is swallowed by the
@@ -3556,12 +3713,16 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             SelectRow(m_currentRow,true);
             SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );
         }
-
+    }
+    else if (event.RightUp())
+    {
         wxVariant value;
         model->GetValue( value, item, col->GetModelColumn() );
         wxWindow *parent = GetParent();
         wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId());
         le.SetItem( item );
+        le.SetColumn( col->GetModelColumn() );
+        le.SetDataViewColumn( col );
         le.SetEventObject(parent);
         le.SetModel(GetOwner()->GetModel());
         le.SetValue(value);
@@ -3570,10 +3731,21 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     else if (event.MiddleDown())
     {
     }
-    if (event.LeftDown() || forceClick)
+
+    if((event.LeftDown() || simulateClick) && hoverOverExpander)
     {
-        SetFocus();
+        wxDataViewTreeNode* node = GetTreeNodeByRow(current);
 
+        // hoverOverExpander being true tells us that our node must be
+        // valid and have children.
+        // So we don't need any extra checks.
+        if( node->IsOpen() )
+            Collapse(current);
+        else
+            Expand(current);
+    }
+    else if ((event.LeftDown() || simulateClick) && !hoverOverExpander)
+    {
         m_lineBeforeLastClicked = m_lineLastClicked;
         m_lineLastClicked = current;
 
@@ -3602,14 +3774,14 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             {
                 ChangeCurrentRow(current);
                 ReverseRowSelection(m_currentRow);
-                SendSelectionChangedEvent(GetItemByRow(m_selection[0]) );
+                SendSelectionChangedEvent(GetItemByRow(m_currentRow));
             }
             else if (event.ShiftDown())
             {
                 ChangeCurrentRow(current);
 
                 unsigned int lineFrom = oldCurrentRow,
-                       lineTo = current;
+                    lineTo = current;
 
                 if ( lineTo < lineFrom )
                 {
@@ -3623,7 +3795,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             else // !ctrl, !shift
             {
                 // test in the enclosing if should make it impossible
-                wxFAIL_MSG( _T("how did we get here?") );
+                wxFAIL_MSG( wxT("how did we get here?") );
             }
         }
 
@@ -3635,19 +3807,59 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         // Update selection here...
         m_currentCol = col;
 
-        m_lastOnSame = !forceClick && ((col == oldCurrentCol) &&
+        m_lastOnSame = !simulateClick && ((col == oldCurrentCol) &&
                         (current == oldCurrentRow)) && oldWasSelected;
 
         // Call LeftClick after everything else as under GTK+
         if (cell->GetMode() & wxDATAVIEW_CELL_ACTIVATABLE)
         {
-            // notify cell about right click
-            wxVariant value;
-            model->GetValue( value, item, col->GetModelColumn() );
-            cell->SetValue( value );
-            wxRect cell_rect( xpos, GetLineStart( current ),
-                          col->GetWidth(), GetLineHeight( current ) );
-            /* ignore ret */ cell->LeftClick( event.GetPosition(), cell_rect, model, item, col->GetModelColumn());
+            if ( wxDataViewCustomRenderer *custom = cell->WXGetAsCustom() )
+            {
+                // notify cell about click
+                custom->PrepareForItem(model, item, col->GetModelColumn());
+
+                wxRect cell_rect( xpos, GetLineStart( current ),
+                                  col->GetWidth(), GetLineHeight( current ) );
+
+                // Report position relative to the cell's custom area, i.e.
+                // no the entire space as given by the control but the one
+                // used by the renderer after calculation of alignment etc.
+
+                // adjust the rectangle ourselves to account for the alignment
+                wxRect rectItem = cell_rect;
+                const int align = custom->GetAlignment();
+                if ( align != wxDVR_DEFAULT_ALIGNMENT )
+                {
+                    const wxSize size = custom->GetSize();
+
+                    if ( size.x >= 0 && size.x < cell_rect.width )
+                    {
+                        if ( align & wxALIGN_CENTER_HORIZONTAL )
+                            rectItem.x += (cell_rect.width - size.x)/2;
+                        else if ( align & wxALIGN_RIGHT )
+                            rectItem.x += cell_rect.width - size.x;
+                        // else: wxALIGN_LEFT is the default
+                    }
+
+                    if ( size.y >= 0 && size.y < cell_rect.height )
+                    {
+                        if ( align & wxALIGN_CENTER_VERTICAL )
+                            rectItem.y += (cell_rect.height - size.y)/2;
+                        else if ( align & wxALIGN_BOTTOM )
+                            rectItem.y += cell_rect.height - size.y;
+                        // else: wxALIGN_TOP is the default
+                    }
+                }
+
+                wxPoint pos( event.GetPosition() );
+                pos.x -= rectItem.x;
+                pos.y -= rectItem.y;
+
+                m_owner->CalcUnscrolledPosition( pos.x, pos.y, &pos.x, &pos.y );
+
+                 /* ignore ret */ custom->LeftClick( pos, cell_rect,
+                                  model, item, col->GetModelColumn());
+            }
         }
     }
 }
@@ -3683,10 +3895,10 @@ wxDataViewItem wxDataViewMainWindow::GetSelection() const
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------
+
 WX_DEFINE_LIST(wxDataViewColumnList)
 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
-
 BEGIN_EVENT_TABLE(wxDataViewCtrl, wxDataViewCtrlBase)
     EVT_SIZE(wxDataViewCtrl::OnSize)
 END_EVENT_TABLE()
@@ -3697,6 +3909,7 @@ wxDataViewCtrl::~wxDataViewCtrl()
         GetModel()->RemoveNotifier( m_notifier );
 
     m_cols.Clear();
+    m_colsBestWidths.clear();
 }
 
 void wxDataViewCtrl::Init()
@@ -3710,9 +3923,13 @@ void wxDataViewCtrl::Init()
     m_headerArea = NULL;
 }
 
-bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos, const wxSize& size,
-           long style, const wxValidator& validator )
+bool wxDataViewCtrl::Create(wxWindow *parent,
+                            wxWindowID id,
+                            const wxPoint& pos,
+                            const wxSize& size,
+                            long style,
+                            const wxValidator& validator,
+                            const wxString& name)
 {
 //    if ( (style & wxBORDER_MASK) == 0)
 //        style |= wxBORDER_SUNKEN;
@@ -3720,7 +3937,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
     Init();
 
     if (!wxControl::Create( parent, id, pos, size,
-                            style | wxScrolledWindowStyle, validator))
+                            style | wxScrolledWindowStyle, validator, name))
         return false;
 
     SetInitialSize(size);
@@ -3731,6 +3948,11 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
 
     m_clientArea = new wxDataViewMainWindow( this, wxID_ANY );
 
+    // We use the cursor keys for moving the selection, not scrolling, so call
+    // this method to ensure wxScrollHelperEvtHandler doesn't catch all
+    // keyboard events forwarded to us from wxListMainWindow.
+    DisableKeyboardScrolling();
+
     if (HasFlag(wxDV_NO_HEADER))
         m_headerArea = NULL;
     else
@@ -3754,8 +3976,8 @@ wxBorder wxDataViewCtrl::GetDefaultBorder() const
 
 #ifdef __WXMSW__
 WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg,
-                                       WXWPARAM wParam,
-                                       WXLPARAM lParam)
+                                        WXWPARAM wParam,
+                                        WXLPARAM lParam)
 {
     WXLRESULT rc = wxDataViewCtrlBase::MSWWindowProc(nMsg, wParam, lParam);
 
@@ -3775,7 +3997,7 @@ wxSize wxDataViewCtrl::GetSizeAvailableForScrollTarget(const wxSize& size)
 {
     wxSize newsize = size;
     if (!HasFlag(wxDV_NO_HEADER) && (m_headerArea))
-       newsize.y -= m_headerArea->GetSize().y;
+    newsize.y -= m_headerArea->GetSize().y;
 
     return newsize;
 }
@@ -3838,6 +4060,7 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
         return false;
 
     m_cols.Append( col );
+    m_colsBestWidths.push_back(0);
     OnColumnsCountChanged();
     return true;
 }
@@ -3848,6 +4071,7 @@ bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
         return false;
 
     m_cols.Insert( col );
+    m_colsBestWidths.insert(m_colsBestWidths.begin(), 0);
     OnColumnsCountChanged();
     return true;
 }
@@ -3858,6 +4082,7 @@ bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col )
         return false;
 
     m_cols.Insert( pos, col );
+    m_colsBestWidths.insert(m_colsBestWidths.begin() + pos, 0);
     OnColumnsCountChanged();
     return true;
 }
@@ -3903,7 +4128,7 @@ wxDataViewColumn *wxDataViewCtrl::GetColumnAt(unsigned int pos) const
     // columns can't be reordered if there is no header window which allows
     // to do this
     const unsigned idx = m_headerArea ? m_headerArea->GetColumnsOrder()[pos]
-                                      : pos;
+                                    : pos;
 
     return GetColumn(idx);
 }
@@ -3920,8 +4145,145 @@ int wxDataViewCtrl::GetColumnIndex(const wxDataViewColumn *column) const
     return wxNOT_FOUND;
 }
 
+unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
+{
+    if ( m_colsBestWidths[idx] != 0 )
+        return m_colsBestWidths[idx];
+
+    const int count = m_clientArea->GetRowCount();
+    wxDataViewColumn *column = GetColumn(idx);
+    wxDataViewRenderer *renderer =
+        const_cast<wxDataViewRenderer*>(column->GetRenderer());
+
+    class MaxWidthCalculator
+    {
+    public:
+        MaxWidthCalculator(wxDataViewMainWindow *clientArea,
+                           wxDataViewRenderer *renderer,
+                           const wxDataViewModel *model,
+                           unsigned column)
+            : m_width(0),
+              m_clientArea(clientArea),
+              m_renderer(renderer),
+              m_model(model),
+              m_column(column)
+        {
+        }
+
+        void UpdateWithWidth(int width)
+        {
+            m_width = wxMax(m_width, width);
+        }
+
+        void UpdateWithRow(int row)
+        {
+            wxDataViewItem item = m_clientArea->GetItemByRow(row);
+            m_renderer->PrepareForItem(m_model, item, m_column);
+            m_width = wxMax(m_width, m_renderer->GetSize().x);
+        }
+
+        int GetMaxWidth() const { return m_width; }
+
+    private:
+        int m_width;
+        wxDataViewMainWindow *m_clientArea;
+        wxDataViewRenderer *m_renderer;
+        const wxDataViewModel *m_model;
+        unsigned m_column;
+    };
+
+    MaxWidthCalculator calculator(m_clientArea, renderer,
+                                  GetModel(), column->GetModelColumn());
+
+    if ( m_headerArea )
+    {
+        int header_width = m_headerArea->GetTextExtent(column->GetTitle()).x;
+        // Labels on native MSW header are indented on both sides
+        header_width +=
+            wxRendererNative::Get().GetHeaderButtonMargin(m_headerArea);
+        calculator.UpdateWithWidth(header_width);
+    }
+
+    // The code below deserves some explanation. For very large controls, we
+    // simply can't afford to calculate sizes for all items, it takes too
+    // long. So the best we can do is to check the first and the last N/2
+    // items in the control for some sufficiently large N and calculate best
+    // sizes from that. That can result in the calculated best width being too
+    // small for some outliers, but it's better to get slightly imperfect
+    // result than to wait several seconds after every update. To avoid highly
+    // visible miscalculations, we also include all currently visible items
+    // no matter what.  Finally, the value of N is determined dynamically by
+    // measuring how much time we spent on the determining item widths so far.
+
+#if wxUSE_STOPWATCH
+    int top_part_end = count;
+    static const long CALC_TIMEOUT = 20/*ms*/;
+    // don't call wxStopWatch::Time() too often
+    static const unsigned CALC_CHECK_FREQ = 100;
+    wxStopWatch timer;
+#else
+    // use some hard-coded limit, that's the best we can do without timer
+    int top_part_end = wxMin(500, count);
+#endif // wxUSE_STOPWATCH/!wxUSE_STOPWATCH
+
+    int row = 0;
+
+    for ( row = 0; row < top_part_end; row++ )
+    {
+#if wxUSE_STOPWATCH
+        if ( row % CALC_CHECK_FREQ == CALC_CHECK_FREQ-1 &&
+             timer.Time() > CALC_TIMEOUT )
+            break;
+#endif // wxUSE_STOPWATCH
+        calculator.UpdateWithRow(row);
+    }
+
+    // row is the first unmeasured item now; that's out value of N/2
+
+    if ( row < count )
+    {
+        top_part_end = row;
+
+        // add bottom N/2 items now:
+        const int bottom_part_start = wxMax(row, count - row);
+        for ( row = bottom_part_start; row < count; row++ )
+        {
+            calculator.UpdateWithRow(row);
+        }
+
+        // finally, include currently visible items in the calculation:
+        const wxPoint origin = CalcUnscrolledPosition(wxPoint(0, 0));
+        int first_visible = m_clientArea->GetLineAt(origin.y);
+        int last_visible = m_clientArea->GetLineAt(origin.y + GetClientSize().y);
+
+        first_visible = wxMax(first_visible, top_part_end);
+        last_visible = wxMin(bottom_part_start, last_visible);
+
+        for ( row = first_visible; row < last_visible; row++ )
+        {
+            calculator.UpdateWithRow(row);
+        }
+
+        wxLogTrace("dataview",
+                   "determined best size from %d top, %d bottom plus %d more visible items out of %d total",
+                   top_part_end,
+                   count - bottom_part_start,
+                   wxMax(0, last_visible - first_visible),
+                   count);
+    }
+
+    int max_width = calculator.GetMaxWidth();
+    if ( max_width > 0 )
+        max_width += 2 * PADDING_RIGHTLEFT;
+
+    const_cast<wxDataViewCtrl*>(this)->m_colsBestWidths[idx] = max_width;
+    return max_width;
+
+    #undef MEASURE_ITEM
+}
+
 void wxDataViewCtrl::ColumnMoved(wxDataViewColumn * WXUNUSED(col),
-                                 unsigned int WXUNUSED(new_pos))
+                                unsigned int WXUNUSED(new_pos))
 {
     // do _not_ reorder m_cols elements here, they should always be in the
     // order in which columns were added, we only display the columns in
@@ -3935,6 +4297,7 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
     if (!ret)
         return false;
 
+    m_colsBestWidths.erase(m_colsBestWidths.begin() + GetColumnIndex(column));
     m_cols.Erase(ret);
     OnColumnsCountChanged();
 
@@ -3944,12 +4307,45 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
 bool wxDataViewCtrl::ClearColumns()
 {
     m_cols.Clear();
+    m_colsBestWidths.clear();
     OnColumnsCountChanged();
     return true;
 }
 
+void wxDataViewCtrl::InvalidateColBestWidth(int idx)
+{
+    m_colsBestWidths[idx] = 0;
+
+    if ( m_headerArea )
+        m_headerArea->UpdateColumn(idx);
+}
+
+void wxDataViewCtrl::InvalidateColBestWidths()
+{
+    m_colsBestWidths.clear();
+    m_colsBestWidths.resize(m_cols.size());
+
+    if ( m_headerArea )
+    {
+        // this updates visual appearance of columns 0 and up, not just 0
+        m_headerArea->UpdateColumn(0);
+    }
+}
+
 int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
 {
+#if 1
+    unsigned int len = GetColumnCount();
+    for ( unsigned int i = 0; i < len; i++ )
+    {
+        wxDataViewColumn * col = GetColumnAt(i);
+        if (column==col)
+            return i;
+    }
+
+    return wxNOT_FOUND;
+#else
+    // This returns the position in pixels which is not what we want.
     int ret = 0,
         dummy = 0;
     unsigned int len = GetColumnCount();
@@ -3966,15 +4362,34 @@ int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
         }
     }
     return ret;
+#endif
 }
 
 wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
 {
     return m_sortingColumnIdx == wxNOT_FOUND ? NULL
-                                             : GetColumn(m_sortingColumnIdx);
+                                            : GetColumn(m_sortingColumnIdx);
+}
+
+wxDataViewItem wxDataViewCtrl::DoGetCurrentItem() const
+{
+    return GetItemByRow(m_clientArea->GetCurrentRow());
 }
 
-//Selection code with wxDataViewItem as parameters
+void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item)
+{
+    const int row = m_clientArea->GetRowByItem(item);
+
+    const unsigned oldCurrent = m_clientArea->GetCurrentRow();
+    if ( static_cast<unsigned>(row) != oldCurrent )
+    {
+        m_clientArea->ChangeCurrentRow(row);
+        m_clientArea->RefreshRow(oldCurrent);
+        m_clientArea->RefreshRow(row);
+    }
+}
+
+// Selection code with wxDataViewItem as parameters
 wxDataViewItem wxDataViewCtrl::GetSelection() const
 {
     return m_clientArea->GetSelection();
@@ -4026,10 +4441,14 @@ void wxDataViewCtrl::Select( const wxDataViewItem & item )
     int row = m_clientArea->GetRowByItem( item );
     if( row >= 0 )
     {
-        //Unselect all rows before select another in the single select mode
+        // Unselect all rows before select another in the single select mode
         if (m_clientArea->IsSingleSel())
             m_clientArea->SelectAllRows(false);
+
         m_clientArea->SelectRow(row, true);
+
+        // Also set focus to the selected item
+        m_clientArea->ChangeCurrentRow( row );
     }
 }
 
@@ -4050,7 +4469,7 @@ bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const
     return false;
 }
 
-//Selection code with row number as parameter
+// Selection code with row number as parameter
 int wxDataViewCtrl::GetSelections( wxArrayInt & sel ) const
 {
     sel.Empty();
@@ -4161,12 +4580,14 @@ void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataVie
 
 }
 
-void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ) const
+void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item,
+                              wxDataViewColumn* &column ) const
 {
     m_clientArea->HitTest(point, item, column);
 }
 
-wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column ) const
+wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem & item,
+                                    const wxDataViewColumn* column ) const
 {
     return m_clientArea->GetItemRect(item, column);
 }
@@ -4183,6 +4604,8 @@ int wxDataViewCtrl::GetRowByItem( const wxDataViewItem & item ) const
 
 void wxDataViewCtrl::Expand( const wxDataViewItem & item )
 {
+    ExpandAncestors( item );
+
     int row = m_clientArea->GetRowByItem( item );
     if (row != -1)
         m_clientArea->Expand(row);
@@ -4203,9 +4626,18 @@ bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
     return false;
 }
 
+void wxDataViewCtrl::StartEditor( const wxDataViewItem & item, unsigned int column )
+{
+    wxDataViewColumn* col = GetColumn( column );
+    if (!col)
+        return;
+
+    wxRect itemRect = GetItemRect(item, col);
+    wxDataViewRenderer* renderer = col->GetRenderer();
+    if (renderer->GetMode() == wxDATAVIEW_CELL_EDITABLE)
+        renderer->StartEditing(item, itemRect);
+}
 
- #endif
-    // !wxUSE_GENERICDATAVIEWCTRL
+#endif // !wxUSE_GENERICDATAVIEWCTRL
 
-#endif
-    // wxUSE_DATAVIEWCTRL
+#endif // wxUSE_DATAVIEWCTRL