Further refine of #15226: wxRichTextCtrl: Implement setting properties with undo...

[wxWidgets.git] / src / generic / datavgen.cpp

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index aed94af241bee9e165453da8ad87011b04f495bd..d36e86116ba9a59807babcc060547fed46631176 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxDataViewCtrl generic implementation
 // Author:      Robert Roebling
 // Modified by: Francesco Montorsi, Guru Kathiresan, Bo Yang
 // Purpose:     wxDataViewCtrl generic implementation
 // Author:      Robert Roebling
 // Modified by: Francesco Montorsi, Guru Kathiresan, Bo Yang

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -38,7 +37,6 @@
 #endif
 
 #include "wx/stockitem.h"
 #endif
 
 #include "wx/stockitem.h"

-#include "wx/calctrl.h"

 #include "wx/popupwin.h"
 #include "wx/renderer.h"
 #include "wx/dcbuffer.h"
 #include "wx/popupwin.h"
 #include "wx/renderer.h"
 #include "wx/dcbuffer.h"


@@ -49,6 +47,7 @@
 #include "wx/headerctrl.h"
 #include "wx/dnd.h"
 #include "wx/stopwatch.h"
 #include "wx/headerctrl.h"
 #include "wx/dnd.h"
 #include "wx/stopwatch.h"

+#include "wx/weakref.h"

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -80,9 +79,48 @@ static const int EXPANDER_OFFSET = 1;
 // For the generic implementation, both the leaf nodes and the nodes are sorted for
 // fast search when needed
 static wxDataViewModel* g_model;
 // 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;
+
+// The column is either the index of the column to be used for sorting or one
+// of the special values in this enum:
+enum
+{
+    // Sort when we're thawed later.
+    SortColumn_OnThaw = -3,
+
+    // Don't sort at all.
+    SortColumn_None = -2,
+
+    // Sort using the model default sort order.
+    SortColumn_Default = -1
+};
+
+static int g_column = SortColumn_None;

 static bool g_asending = true;
 
 static bool g_asending = true;
 

+// ----------------------------------------------------------------------------
+// helper functions
+// ----------------------------------------------------------------------------
+
+namespace
+{
+
+// Return the expander column or, if it is not set, the first column and also
+// set it as the expander one for the future.
+wxDataViewColumn* GetExpanderColumnOrFirstOne(wxDataViewCtrl* dataview)
+{
+    wxDataViewColumn* expander = dataview->GetExpanderColumn();
+    if (!expander)
+    {
+        // TODO-RTL: last column for RTL support
+        expander = dataview->GetColumnAt( 0 );
+        dataview->SetExpanderColumn(expander);
+    }
+
+    return expander;
+}
+
+} // anonymous namespace
+

 //-----------------------------------------------------------------------------
 // wxDataViewColumn
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDataViewColumn
 //-----------------------------------------------------------------------------


@@ -122,6 +160,40 @@ void wxDataViewColumn::UpdateDisplay()
     }
 }
 
     }
 }
 

+void wxDataViewColumn::UnsetAsSortKey()
+{
+    m_sort = false;
+
+    if ( m_owner )
+        m_owner->SetSortingColumnIndex(wxNOT_FOUND);
+
+    UpdateDisplay();
+}
+
+void wxDataViewColumn::SetSortOrder(bool ascending)
+{
+    if ( !m_owner )
+        return;
+
+    // First unset the old sort column if any.
+    int oldSortKey = m_owner->GetSortingColumnIndex();
+    if ( oldSortKey != wxNOT_FOUND )
+    {
+        m_owner->GetColumn(oldSortKey)->UnsetAsSortKey();
+    }
+
+    // Now set this one as the new sort column.
+    const int idx = m_owner->GetColumnIndex(this);
+    m_owner->SetSortingColumnIndex(idx);
+
+    m_sort = true;
+    m_sortAscending = ascending;
+
+    // Call this directly instead of using UpdateDisplay() as we already have
+    // the column index, no need to look it up again.
+    m_owner->OnColumnChange(idx);
+}
+

 //-----------------------------------------------------------------------------
 // wxDataViewHeaderWindow
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDataViewHeaderWindow
 //-----------------------------------------------------------------------------


@@ -169,14 +241,14 @@ private:
 
         // for events created by wxDataViewHeaderWindow the
         // row / value fields are not valid
 
         // for events created by wxDataViewHeaderWindow the
         // row / value fields are not valid

-        return owner->GetEventHandler()->ProcessEvent(event);
+        return owner->ProcessWindowEvent(event);

     }
 
     void OnClick(wxHeaderCtrlEvent& event)
     {
         const unsigned idx = event.GetColumn();
 
     }
 
     void OnClick(wxHeaderCtrlEvent& event)
     {
         const unsigned idx = event.GetColumn();
 

-        if ( SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, idx) )
+        if ( SendEvent(wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, idx) )

             return;
 
         // default handling for the column click is to sort by this column or
             return;
 
         // default handling for the column click is to sort by this column or


@@ -197,16 +269,7 @@ private:
         }
         else // not using this column for sorting yet
         {
         }
         else // not using this column for sorting yet
         {

-            // first unset the old sort column if any
-            int oldSortKey = owner->GetSortingColumnIndex();
-            if ( oldSortKey != wxNOT_FOUND )
-            {
-                owner->GetColumn(oldSortKey)->UnsetAsSortKey();
-                owner->OnColumnChange(oldSortKey);
-            }
-
-            owner->SetSortingColumnIndex(idx);
-            col->SetAsSortKey();
+            col->SetSortOrder(true);

         }
 
         wxDataViewModel * const model = owner->GetModel();
         }
 
         wxDataViewModel * const model = owner->GetModel();


@@ -215,12 +278,12 @@ private:
 
         owner->OnColumnChange(idx);
 
 
         owner->OnColumnChange(idx);
 

-        SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, idx);
+        SendEvent(wxEVT_DATAVIEW_COLUMN_SORTED, idx);

     }
 
     void OnRClick(wxHeaderCtrlEvent& event)
     {
     }
 
     void OnRClick(wxHeaderCtrlEvent& event)
     {

-        if ( !SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK,
+        if ( !SendEvent(wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK,

                         event.GetColumn()) )
             event.Skip();
     }
                         event.GetColumn()) )
             event.Skip();
     }


@@ -283,42 +346,76 @@ class wxDataViewTreeNode
 {
 public:
     wxDataViewTreeNode(wxDataViewTreeNode *parent, const wxDataViewItem& item)
 {
 public:
     wxDataViewTreeNode(wxDataViewTreeNode *parent, const wxDataViewItem& item)

-        : m_item(item),
-          m_parent(parent),
+        : m_parent(parent),
+          m_item(item),

           m_branchData(NULL)
     {
     }
 
     ~wxDataViewTreeNode()
     {
           m_branchData(NULL)
     {
     }
 
     ~wxDataViewTreeNode()
     {

-        delete m_branchData;
+        if ( m_branchData )
+        {
+            wxDataViewTreeNodes& nodes = m_branchData->children;
+            for ( wxDataViewTreeNodes::iterator i = nodes.begin();
+                  i != nodes.end();
+                  ++i )
+            {
+                delete *i;
+            }
+
+            delete m_branchData;
+        }

     }
 
     static wxDataViewTreeNode* CreateRootNode()
     {
         wxDataViewTreeNode *n = new wxDataViewTreeNode(NULL, wxDataViewItem());
     }
 
     static wxDataViewTreeNode* CreateRootNode()
     {
         wxDataViewTreeNode *n = new wxDataViewTreeNode(NULL, wxDataViewItem());

-        n->SetHasChildren(true);
+        n->m_branchData = new BranchNodeData;

         n->m_branchData->open = true;
         return n;
     }
 
     wxDataViewTreeNode * GetParent() const { return m_parent; }
 
         n->m_branchData->open = true;
         return n;
     }
 
     wxDataViewTreeNode * GetParent() const { return m_parent; }
 

-    wxDataViewTreeNodes& GetNodes()
+    const wxDataViewTreeNodes& GetChildNodes() const

     {
         wxASSERT( m_branchData != NULL );
     {
         wxASSERT( m_branchData != NULL );

-        return m_branchData->nodes;
+        return m_branchData->children;

     }
 
     }
 

-    void AddNode( wxDataViewTreeNode * node )
+    void InsertChild(wxDataViewTreeNode *node, unsigned index)

     {
         if ( !m_branchData )
             m_branchData = new BranchNodeData;
 
     {
         if ( !m_branchData )
             m_branchData = new BranchNodeData;
 

-        m_branchData->nodes.Add( node );
+        m_branchData->children.Insert(node, index);
+

         // TODO: insert into sorted array directly in O(log n) instead of resorting in O(n log n)
         if (g_column >= -1)
         // TODO: insert into sorted array directly in O(log n) instead of resorting in O(n log n)
         if (g_column >= -1)

-            m_branchData->nodes.Sort( &wxGenericTreeModelNodeCmp );
+            m_branchData->children.Sort( &wxGenericTreeModelNodeCmp );
+    }
+
+    void RemoveChild(wxDataViewTreeNode *node)
+    {
+        wxCHECK_RET( m_branchData != NULL, "leaf node doesn't have children" );
+        m_branchData->children.Remove(node);
+    }
+
+    // returns position of child node for given item in children list or wxNOT_FOUND
+    int FindChildByItem(const wxDataViewItem& item) const
+    {
+        if ( !m_branchData )
+            return wxNOT_FOUND;
+
+        const wxDataViewTreeNodes& nodes = m_branchData->children;
+        const int len = nodes.size();
+        for ( int i = 0; i < len; i++ )
+        {
+            if ( nodes[i]->m_item == item )
+                return i;
+        }
+        return wxNOT_FOUND;

     }
 
     const wxDataViewItem & GetItem() const { return m_item; }
     }
 
     const wxDataViewItem & GetItem() const { return m_item; }


@@ -343,11 +440,16 @@ public:
 
     void ToggleOpen()
     {
 
     void ToggleOpen()
     {

+        // We do not allow the (invisible) root node to be collapsed because
+        // there is no way to expand it again.
+        if ( !m_parent )
+            return;
+

         wxCHECK_RET( m_branchData != NULL, "can't open leaf node" );
 
         int sum = 0;
 
         wxCHECK_RET( m_branchData != NULL, "can't open leaf node" );
 
         int sum = 0;
 

-        const wxDataViewTreeNodes& nodes = m_branchData->nodes;
+        const wxDataViewTreeNodes& nodes = m_branchData->children;

         const int len = nodes.GetCount();
         for ( int i = 0;i < len; i ++)
             sum += 1 + nodes[i]->GetSubTreeCount();
         const int len = nodes.GetCount();
         for ( int i = 0;i < len; i ++)
             sum += 1 + nodes[i]->GetSubTreeCount();


@@ -365,7 +467,7 @@ public:
     }
 
     // "HasChildren" property corresponds to model's IsContainer(). Note that it may be true
     }
 
     // "HasChildren" property corresponds to model's IsContainer(). Note that it may be true

-    // even if GetNodes() is empty; see below.
+    // even if GetChildNodes() is empty; see below.

     bool HasChildren() const
     {
         return m_branchData != NULL;
     bool HasChildren() const
     {
         return m_branchData != NULL;


@@ -373,6 +475,11 @@ public:
 
     void SetHasChildren(bool has)
     {
 
     void SetHasChildren(bool has)
     {

+        // The invisible root item always has children, so ignore any attempts
+        // to change this.
+        if ( !m_parent )
+            return;
+

         if ( !has )
         {
             wxDELETE(m_branchData);
         if ( !has )
         {
             wxDELETE(m_branchData);


@@ -409,7 +516,7 @@ public:
 
         if (g_column >= -1)
         {
 
         if (g_column >= -1)
         {

-            wxDataViewTreeNodes& nodes = m_branchData->nodes;
+            wxDataViewTreeNodes& nodes = m_branchData->children;

 
             nodes.Sort( &wxGenericTreeModelNodeCmp );
             int len = nodes.GetCount();
 
             nodes.Sort( &wxGenericTreeModelNodeCmp );
             int len = nodes.GetCount();


@@ -440,7 +547,7 @@ private:
 
         // Child nodes. Note that this may be empty even if m_hasChildren in
         // case this branch of the tree wasn't expanded and realized yet.
 
         // Child nodes. Note that this may be empty even if m_hasChildren in
         // case this branch of the tree wasn't expanded and realized yet.

-        wxDataViewTreeNodes  nodes;
+        wxDataViewTreeNodes  children;

 
         // Is the branch node currently open (expanded)?
         bool                 open;
 
         // Is the branch node currently open (expanded)?
         bool                 open;


@@ -479,7 +586,7 @@ public:
                             const wxString &name = wxT("wxdataviewctrlmainwindow") );
     virtual ~wxDataViewMainWindow();
 
                             const wxString &name = wxT("wxdataviewctrlmainwindow") );
     virtual ~wxDataViewMainWindow();
 

-    bool IsList() const { return GetOwner()->GetModel()->IsListModel(); }
+    bool IsList() const { return GetModel()->IsListModel(); }

     bool IsVirtualList() const { return m_root == NULL; }
 
     // notifications from wxDataViewModel
     bool IsVirtualList() const { return m_root == NULL; }
 
     // notifications from wxDataViewModel


@@ -498,20 +605,50 @@ public:
         UpdateDisplay();
     }
 
         UpdateDisplay();
     }
 

+    // Override the base class method to resort if needed, i.e. if
+    // SortPrepare() was called -- and ignored -- while we were frozen.
+    virtual void DoThaw()
+    {
+        if ( g_column == SortColumn_OnThaw )
+        {
+            Resort();
+            g_column = SortColumn_None;
+        }
+
+        wxWindow::DoThaw();
+    }
+

     void SortPrepare()
     {
     void SortPrepare()
     {

-        g_model = GetOwner()->GetModel();
+        g_model = GetModel();
+

         wxDataViewColumn* col = GetOwner()->GetSortingColumn();
         if( !col )
         {
             if (g_model->HasDefaultCompare())
         wxDataViewColumn* col = GetOwner()->GetSortingColumn();
         if( !col )
         {
             if (g_model->HasDefaultCompare())

-                g_column = -1;
+            {
+                // See below for the explanation of IsFrozen() test.
+                if ( IsFrozen() )
+                    g_column = SortColumn_OnThaw;
+                else
+                    g_column = SortColumn_Default;
+            }

             else
             else

-                g_column = -2;
+                g_column = SortColumn_None;

 
             g_asending = true;
             return;
         }
 
             g_asending = true;
             return;
         }

+
+        // Avoid sorting while the window is frozen, this allows to quickly add
+        // many items without resorting after each addition and only resort
+        // them all at once when the window is finally thawed, see above.
+        if ( IsFrozen() )
+        {
+            g_column = SortColumn_OnThaw;
+            return;
+        }
+

         g_column = col->GetModelColumn();
         g_asending = col->IsSortOrderAscending();
     }
         g_column = col->GetModelColumn();
         g_asending = col->IsSortOrderAscending();
     }


@@ -520,12 +657,18 @@ public:
     wxDataViewCtrl *GetOwner() { return m_owner; }
     const wxDataViewCtrl *GetOwner() const { return m_owner; }
 
     wxDataViewCtrl *GetOwner() { return m_owner; }
     const wxDataViewCtrl *GetOwner() const { return m_owner; }
 

+    wxDataViewModel* GetModel() { return GetOwner()->GetModel(); }
+    const wxDataViewModel* GetModel() const { return GetOwner()->GetModel(); }
+

 #if wxUSE_DRAG_AND_DROP
     wxBitmap CreateItemBitmap( unsigned int row, int &indent );
 #endif // wxUSE_DRAG_AND_DROP
     void OnPaint( wxPaintEvent &event );
 #if wxUSE_DRAG_AND_DROP
     wxBitmap CreateItemBitmap( unsigned int row, int &indent );
 #endif // wxUSE_DRAG_AND_DROP
     void OnPaint( wxPaintEvent &event );

-    void OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event);
+    void OnCharHook( wxKeyEvent &event );

     void OnChar( wxKeyEvent &event );
     void OnChar( wxKeyEvent &event );

+    void OnVerticalNavigation(int delta, const wxKeyEvent& event);
+    void OnLeftKey();
+    void OnRightKey();

     void OnMouse( wxMouseEvent &event );
     void OnSetFocus( wxFocusEvent &event );
     void OnKillFocus( wxFocusEvent &event );
     void OnMouse( wxMouseEvent &event );
     void OnSetFocus( wxFocusEvent &event );
     void OnKillFocus( wxFocusEvent &event );


@@ -542,6 +685,10 @@ public:
     unsigned GetCurrentRow() const { return m_currentRow; }
     bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; }
     void ChangeCurrentRow( unsigned int row );
     unsigned GetCurrentRow() const { return m_currentRow; }
     bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; }
     void ChangeCurrentRow( unsigned int row );

+    bool TryAdvanceCurrentColumn(wxDataViewTreeNode *node, bool forward);
+
+    wxDataViewColumn *GetCurrentColumn() const { return m_currentCol; }
+    void ClearCurrentColumn() { m_currentCol = NULL; }

 
     bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); }
     bool IsEmpty() { return GetRowCount() == 0; }
 
     bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); }
     bool IsEmpty() { return GetRowCount() == 0; }


@@ -554,7 +701,7 @@ public:
     // the displaying number of the tree are changing along with the
     // expanding/collapsing of the tree nodes
     unsigned int GetLastVisibleRow();
     // the displaying number of the tree are changing along with the
     // expanding/collapsing of the tree nodes
     unsigned int GetLastVisibleRow();

-    unsigned int GetRowCount();
+    unsigned int GetRowCount() const;

 
     const wxDataViewSelection& GetSelections() const { return m_selection; }
     void SetSelections( const wxDataViewSelection & sel )
 
     const wxDataViewSelection& GetSelections() const { return m_selection; }
     void SetSelections( const wxDataViewSelection & sel )


@@ -584,11 +731,17 @@ public:
     int GetLineAt( unsigned int y ) const;       // y / m_lineHeight in fixed mode
 
     void SetRowHeight( int lineHeight ) { m_lineHeight = lineHeight; }
     int GetLineAt( unsigned int y ) const;       // y / m_lineHeight in fixed mode
 
     void SetRowHeight( int lineHeight ) { m_lineHeight = lineHeight; }

+    int GetRowHeight() const { return m_lineHeight; }
+    int GetDefaultRowHeight() const;

 
     // Some useful functions for row and item mapping
     wxDataViewItem GetItemByRow( unsigned int row ) const;
     int GetRowByItem( const wxDataViewItem & item ) const;
 
 
     // Some useful functions for row and item mapping
     wxDataViewItem GetItemByRow( unsigned int row ) const;
     int GetRowByItem( const wxDataViewItem & item ) const;
 

+    wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const;
+    // We did not need this temporarily
+    // wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item );
+

     // Methods for building the mapping tree
     void BuildTree( wxDataViewModel  * model );
     void DestroyTree();
     // Methods for building the mapping tree
     void BuildTree( wxDataViewModel  * model );
     void DestroyTree();


@@ -611,18 +764,26 @@ public:
     void OnLeave();
 #endif // wxUSE_DRAG_AND_DROP
 
     void OnLeave();
 #endif // wxUSE_DRAG_AND_DROP
 

-private:
-    wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const;
-    // We did not need this temporarily
-    // wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item );
+    void OnColumnsCountChanged();
+
+    // Called by wxDataViewCtrl and our own OnRenameTimer() to start edit the
+    // specified item in the given column.
+    void StartEditing(const wxDataViewItem& item, const wxDataViewColumn* col);

 
 

-    int RecalculateCount();
+private:
+    int RecalculateCount() const;

 
     // Return false only if the event was vetoed by its handler.
     bool SendExpanderEvent(wxEventType type, const wxDataViewItem& item);
 
     wxDataViewTreeNode * FindNode( const wxDataViewItem & item );
 
 
     // Return false only if the event was vetoed by its handler.
     bool SendExpanderEvent(wxEventType type, const wxDataViewItem& item);
 
     wxDataViewTreeNode * FindNode( const wxDataViewItem & item );
 

+    wxDataViewColumn *FindColumnForEditing(const wxDataViewItem& item, wxDataViewCellMode mode);
+
+    bool IsCellEditableInMode(const wxDataViewItem& item, const wxDataViewColumn *col, wxDataViewCellMode mode) const;
+
+    void DrawCellBackground( wxDataViewRenderer* cell, wxDC& dc, const wxRect& rect );
+

 private:
     wxDataViewCtrl             *m_owner;
     int                         m_lineHeight;
 private:
     wxDataViewCtrl             *m_owner;
     int                         m_lineHeight;


@@ -636,6 +797,8 @@ private:
     bool                        m_lastOnSame;
 
     bool                        m_hasFocus;
     bool                        m_lastOnSame;
 
     bool                        m_hasFocus;

+    bool                        m_useCellFocus;
+    bool                        m_currentColSetByKeyboard;

 
 #if wxUSE_DRAG_AND_DROP
     int                         m_dragCount;
 
 #if wxUSE_DRAG_AND_DROP
     int                         m_dragCount;


@@ -668,6 +831,12 @@ private:
     // This is the tree node under the cursor
     wxDataViewTreeNode * m_underMouse;
 
     // This is the tree node under the cursor
     wxDataViewTreeNode * m_underMouse;
 

+    // The control used for editing or NULL.
+    wxWeakRef<wxWindow> m_editorCtrl;
+
+    // Id m_editorCtrl is non-NULL, pointer to the associated renderer.
+    wxDataViewRenderer* m_editorRenderer;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow)
     DECLARE_EVENT_TABLE()
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow)
     DECLARE_EVENT_TABLE()


@@ -791,7 +960,8 @@ wxWindow* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,
 {
     wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, value,
                                        wxPoint(labelRect.x,labelRect.y),
 {
     wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, value,
                                        wxPoint(labelRect.x,labelRect.y),

-                                       wxSize(labelRect.width,labelRect.height) );
+                                       wxSize(labelRect.width,labelRect.height),
+                                       wxTE_PROCESS_ENTER );

 
     // select the text in the control an place the cursor at the end
     ctrl->SetInsertionPointEnd();
 
     // select the text in the control an place the cursor at the end
     ctrl->SetInsertionPointEnd();


@@ -851,7 +1021,7 @@ bool wxDataViewBitmapRenderer::GetValue( wxVariant& WXUNUSED(value) ) const
 bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
 {
     if (m_bitmap.IsOk())
 bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
 {
     if (m_bitmap.IsOk())

-        dc->DrawBitmap( m_bitmap, cell.x, cell.y );
+        dc->DrawBitmap( m_bitmap, cell.x, cell.y, true /* use mask */ );

     else if (m_icon.IsOk())
         dc->DrawIcon( m_icon, cell.x, cell.y );
 
     else if (m_icon.IsOk())
         dc->DrawIcon( m_icon, cell.x, cell.y );
 


@@ -902,11 +1072,13 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state
         GetEnabled() == false)
         flags |= wxCONTROL_DISABLED;
 
         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());
+    // Ensure that the check boxes always have at least the minimal required
+    // size, otherwise DrawCheckBox() doesn't really work well. If this size is
+    // greater than the cell size, the checkbox will be truncated but this is a
+    // lesser evil.
+    wxSize size = cell.GetSize();
+    size.IncTo(GetSize());
+    cell.SetSize(size);

 
     wxRendererNative::Get().DrawCheckBox(
             GetOwner()->GetOwner(),
 
     wxRendererNative::Get().DrawCheckBox(
             GetOwner()->GetOwner(),


@@ -917,23 +1089,22 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state
     return true;
 }
 
     return true;
 }
 

-bool wxDataViewToggleRenderer::WXOnLeftClick(const wxPoint& cursor,
-                                             const wxRect& WXUNUSED(cell),
-                                             wxDataViewModel *model,
-                                             const wxDataViewItem& item,
-                                             unsigned int col)
+bool wxDataViewToggleRenderer::WXActivateCell(const wxRect& WXUNUSED(cellRect),
+                                              wxDataViewModel *model,
+                                              const wxDataViewItem& item,
+                                              unsigned int col,
+                                              const wxMouseEvent *mouseEvent)

 {
 {

-    // only react to clicks directly on the checkbox, not elsewhere in the same cell:
-    if (!wxRect(GetSize()).Contains(cursor))
-        return false;
-
-    if (model->IsEnabled(item, col))
+    if ( mouseEvent )

     {
     {

-        model->ChangeValue(!m_toggle, item, col);
-        return true;
+        // Only react to clicks directly on the checkbox, not elsewhere in the
+        // same cell.
+        if ( !wxRect(GetSize()).Contains(mouseEvent->GetPosition()) )
+            return false;

     }
 
     }
 

-    return false;
+    model->ChangeValue(!m_toggle, item, col);
+    return true;

 }
 
 wxSize wxDataViewToggleRenderer::GetSize() const
 }
 
 wxSize wxDataViewToggleRenderer::GetSize() const


@@ -999,113 +1170,6 @@ wxSize wxDataViewProgressRenderer::GetSize() const
     return wxSize(40,12);
 }
 
     return wxSize(40,12);
 }
 

-// ---------------------------------------------------------
-// wxDataViewDateRenderer
-// ---------------------------------------------------------
-
-#define wxUSE_DATE_RENDERER_POPUP (wxUSE_CALENDARCTRL && wxUSE_POPUPWIN)
-
-#if wxUSE_DATE_RENDERER_POPUP
-
-class wxDataViewDateRendererPopupTransient: public wxPopupTransientWindow
-{
-public:
-    wxDataViewDateRendererPopupTransient( wxWindow* parent, wxDateTime *value,
-        wxDataViewModel *model, const wxDataViewItem & item, unsigned int col) :
-        wxPopupTransientWindow( parent, wxBORDER_SIMPLE ),
-        m_item( item )
-    {
-        m_model = model;
-        m_col = col;
-        m_cal = new wxCalendarCtrl( this, wxID_ANY, *value );
-        wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
-        sizer->Add( m_cal, 1, wxGROW );
-        SetSizer( sizer );
-        sizer->Fit( this );
-    }
-
-    void OnCalendar( wxCalendarEvent &event );
-
-    wxCalendarCtrl      *m_cal;
-    wxDataViewModel *m_model;
-    unsigned int               m_col;
-    const wxDataViewItem &   m_item;
-
-protected:
-    virtual void OnDismiss()
-    {
-    }
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(wxDataViewDateRendererPopupTransient,wxPopupTransientWindow)
-    EVT_CALENDAR( wxID_ANY, wxDataViewDateRendererPopupTransient::OnCalendar )
-END_EVENT_TABLE()
-
-void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event )
-{
-    m_model->ChangeValue( event.GetDate(), m_item, m_col );
-    DismissAndNotify();
-}
-
-#endif // wxUSE_DATE_RENDERER_POPUP
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer, wxDataViewRenderer)
-
-wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype,
-                        wxDataViewCellMode mode, int align ) :
-    wxDataViewRenderer( varianttype, mode, align )
-{
-}
-
-bool wxDataViewDateRenderer::SetValue( const wxVariant &value )
-{
-    m_date = value.GetDateTime();
-
-    return true;
-}
-
-bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const
-{
-    value = m_date;
-    return true;
-}
-
-bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state )
-{
-    wxString tmp = m_date.FormatDate();
-    RenderText( tmp, 0, cell, dc, state );
-    return true;
-}
-
-wxSize wxDataViewDateRenderer::GetSize() const
-{
-    return GetTextExtent(m_date.FormatDate());
-}
-
-bool wxDataViewDateRenderer::WXOnActivate(const wxRect& WXUNUSED(cell),
-                                          wxDataViewModel *model,
-                                          const wxDataViewItem& item,
-                                          unsigned int col)
-{
-    wxDateTime dtOld = m_date;
-
-#if wxUSE_DATE_RENDERER_POPUP
-    wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient(
-        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(dtOld.Format());
-#endif // wxUSE_DATE_RENDERER_POPUP/!wxUSE_DATE_RENDERER_POPUP
-
-    return true;
-}
-

 // ---------------------------------------------------------
 // wxDataViewIconTextRenderer
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxDataViewIconTextRenderer
 // ---------------------------------------------------------


@@ -1177,7 +1241,8 @@ wxWindow* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect
 
     wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, text,
                                        wxPoint(labelRect.x,labelRect.y),
 
     wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, text,
                                        wxPoint(labelRect.x,labelRect.y),

-                                       wxSize(labelRect.width,labelRect.height) );
+                                       wxSize(labelRect.width,labelRect.height),
+                                       wxTE_PROCESS_ENTER );

 
     // select the text in the control an place the cursor at the end
     ctrl->SetInsertionPointEnd();
 
     // select the text in the control an place the cursor at the end
     ctrl->SetInsertionPointEnd();


@@ -1190,7 +1255,17 @@ bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxWindow *editor, wxVar
 {
     wxTextCtrl *text = (wxTextCtrl*) editor;
 
 {
     wxTextCtrl *text = (wxTextCtrl*) editor;
 

-    wxDataViewIconText iconText(text->GetValue(), m_value.GetIcon());
+    // The icon can't be edited so get its old value and reuse it.
+    wxVariant valueOld;
+    wxDataViewColumn* const col = GetOwner();
+    GetView()->GetModel()->GetValue(valueOld, m_item, col->GetModelColumn());
+
+    wxDataViewIconText iconText;
+    iconText << valueOld;
+
+    // But replace the text with the value entered by user.
+    iconText.SetText(text->GetValue());
+

     value << iconText;
     return true;
 }
     value << iconText;
     return true;
 }


@@ -1357,6 +1432,7 @@ BEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow)
     EVT_MOUSE_EVENTS  (wxDataViewMainWindow::OnMouse)
     EVT_SET_FOCUS     (wxDataViewMainWindow::OnSetFocus)
     EVT_KILL_FOCUS    (wxDataViewMainWindow::OnKillFocus)
     EVT_MOUSE_EVENTS  (wxDataViewMainWindow::OnMouse)
     EVT_SET_FOCUS     (wxDataViewMainWindow::OnSetFocus)
     EVT_KILL_FOCUS    (wxDataViewMainWindow::OnKillFocus)

+    EVT_CHAR_HOOK     (wxDataViewMainWindow::OnCharHook)

     EVT_CHAR          (wxDataViewMainWindow::OnChar)
 END_EVENT_TABLE()
 
     EVT_CHAR          (wxDataViewMainWindow::OnChar)
 END_EVENT_TABLE()
 


@@ -1368,14 +1444,17 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
 {
     SetOwner( parent );
 
 {
     SetOwner( parent );
 

+    m_editorRenderer = NULL;
+

     m_lastOnSame = false;
     m_renameTimer = new wxDataViewRenameTimer( this );
 
     // TODO: user better initial values/nothing selected
     m_currentCol = NULL;
     m_lastOnSame = false;
     m_renameTimer = new wxDataViewRenameTimer( this );
 
     // TODO: user better initial values/nothing selected
     m_currentCol = NULL;

-    m_currentRow = 0;
-
-    m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1
+    m_currentColSetByKeyboard = false;
+    m_useCellFocus = false;
+    m_currentRow = (unsigned)-1;
+    m_lineHeight = GetDefaultRowHeight();

 
 #if wxUSE_DRAG_AND_DROP
     m_dragCount = 0;
 
 #if wxUSE_DRAG_AND_DROP
     m_dragCount = 0;


@@ -1418,6 +1497,20 @@ wxDataViewMainWindow::~wxDataViewMainWindow()
 }
 
 
 }
 
 

+int wxDataViewMainWindow::GetDefaultRowHeight() const
+{
+#ifdef __WXMSW__
+    // We would like to use the same line height that Explorer uses. This is
+    // different from standard ListView control since Vista.
+    if ( wxGetWinVersion() >= wxWinVersion_Vista )
+        return wxMax(16, GetCharHeight()) + 6; // 16 = mini icon height
+    else
+#endif // __WXMSW__
+        return wxMax(16, GetCharHeight()) + 1; // 16 = mini icon height
+}
+
+
+

 #if wxUSE_DRAG_AND_DROP
 bool wxDataViewMainWindow::EnableDragSource( const wxDataFormat &format )
 {
 #if wxUSE_DRAG_AND_DROP
 bool wxDataViewMainWindow::EnableDragSource( const wxDataFormat &format )
 {


@@ -1464,13 +1557,14 @@ wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x,
 
     wxDataViewItem item = GetItemByRow( row );
 
 
     wxDataViewItem item = GetItemByRow( row );
 

-    wxDataViewModel *model = GetOwner()->GetModel();
+    wxDataViewModel *model = GetModel();

 
 

-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );

     event.SetEventObject( m_owner );
     event.SetItem( item );
     event.SetModel( model );
     event.SetDataFormat( format );
     event.SetEventObject( m_owner );
     event.SetItem( item );
     event.SetModel( model );
     event.SetDataFormat( format );

+    event.SetDropEffect( def );

     if (!m_owner->HandleWindowEvent( event ))
     {
         RemoveDropHint();
     if (!m_owner->HandleWindowEvent( event ))
     {
         RemoveDropHint();


@@ -1507,9 +1601,9 @@ bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y )
 
     wxDataViewItem item = GetItemByRow( row );
 
 
     wxDataViewItem item = GetItemByRow( row );
 

-    wxDataViewModel *model = GetOwner()->GetModel();
+    wxDataViewModel *model = GetModel();

 
 

-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );

     event.SetEventObject( m_owner );
     event.SetItem( item );
     event.SetModel( model );
     event.SetEventObject( m_owner );
     event.SetItem( item );
     event.SetModel( model );


@@ -1536,17 +1630,18 @@ wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoo
 
     wxDataViewItem item = GetItemByRow( row );
 
 
     wxDataViewItem item = GetItemByRow( row );
 

-    wxDataViewModel *model = GetOwner()->GetModel();
+    wxDataViewModel *model = GetModel();

 
     wxCustomDataObject *obj = (wxCustomDataObject *) GetDropTarget()->GetDataObject();
 
 
     wxCustomDataObject *obj = (wxCustomDataObject *) GetDropTarget()->GetDataObject();
 

-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, m_owner->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP, m_owner->GetId() );

     event.SetEventObject( m_owner );
     event.SetItem( item );
     event.SetModel( model );
     event.SetDataFormat( format );
     event.SetDataSize( obj->GetSize() );
     event.SetDataBuffer( obj->GetData() );
     event.SetEventObject( m_owner );
     event.SetItem( item );
     event.SetModel( model );
     event.SetDataFormat( format );
     event.SetDataSize( obj->GetSize() );
     event.SetDataBuffer( obj->GetData() );

+    event.SetDropEffect( def );

     if (!m_owner->HandleWindowEvent( event ))
         return wxDragNone;
 
     if (!m_owner->HandleWindowEvent( event ))
         return wxDragNone;
 


@@ -1594,14 +1689,8 @@ wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent )
 
     wxDataViewModel *model = m_owner->GetModel();
 
 
     wxDataViewModel *model = m_owner->GetModel();
 

-    wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
-    if (!expander)
-    {
-        // TODO-RTL: last column for RTL support
-        expander = GetOwner()->GetColumnAt( 0 );
-        GetOwner()->SetExpanderColumn(expander);
-    }
-
+    wxDataViewColumn * const
+        expander = GetExpanderColumnOrFirstOne(GetOwner());

 
     int x = 0;
     for (col = 0; col < cols; col++)
 
     int x = 0;
     for (col = 0; col < cols; col++)


@@ -1636,16 +1725,51 @@ wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent )
 #endif // wxUSE_DRAG_AND_DROP
 
 
 #endif // wxUSE_DRAG_AND_DROP
 
 

+// Draw focus rect for individual cell. Unlike native focus rect, we render
+// this in foreground text color (typically white) to enhance contrast and
+// make it visible.
+static void DrawSelectedCellFocusRect(wxDC& dc, const wxRect& rect)
+{
+    // (This code is based on wxRendererGeneric::DrawFocusRect and modified.)
+
+    // draw the pixels manually because the "dots" in wxPen with wxDOT style
+    // may be short traits and not really dots
+    //
+    // note that to behave in the same manner as DrawRect(), we must exclude
+    // the bottom and right borders from the rectangle
+    wxCoord x1 = rect.GetLeft(),
+            y1 = rect.GetTop(),
+            x2 = rect.GetRight(),
+            y2 = rect.GetBottom();
+
+    wxDCPenChanger pen(dc, wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
+
+    wxCoord z;
+    for ( z = x1 + 1; z < x2; z += 2 )
+        dc.DrawPoint(z, rect.GetTop());
+
+    wxCoord shift = z == x2 ? 0 : 1;
+    for ( z = y1 + shift; z < y2; z += 2 )
+        dc.DrawPoint(x2, z);
+
+    shift = z == y2 ? 0 : 1;
+    for ( z = x2 - shift; z > x1; z -= 2 )
+        dc.DrawPoint(z, y2);
+
+    shift = z == x1 ? 0 : 1;
+    for ( z = y2 - shift; z > y1; z -= 2 )
+        dc.DrawPoint(x1, z);
+}
+
+

 void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
 void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {

-    wxDataViewModel *model = GetOwner()->GetModel();
+    wxDataViewModel *model = GetModel();

     wxAutoBufferedPaintDC dc( this );
 
     wxAutoBufferedPaintDC dc( this );
 

-#ifdef __WXMSW__

     dc.SetBrush(GetOwner()->GetBackgroundColour());
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.DrawRectangle(GetClientSize());
     dc.SetBrush(GetOwner()->GetBackgroundColour());
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.DrawRectangle(GetClientSize());

-#endif

 
     if ( IsEmpty() )
     {
 
     if ( IsEmpty() )
     {


@@ -1669,7 +1793,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     // Send the event to wxDataViewCtrl itself.
     wxWindow * const parent = GetParent();
 
     // Send the event to wxDataViewCtrl itself.
     wxWindow * const parent = GetParent();

-    wxDataViewEvent cache_event(wxEVT_COMMAND_DATAVIEW_CACHE_HINT, parent->GetId());
+    wxDataViewEvent cache_event(wxEVT_DATAVIEW_CACHE_HINT, parent->GetId());

     cache_event.SetEventObject(parent);
     cache_event.SetCache(item_start, item_last - 1);
     parent->ProcessWindowEvent(cache_event);
     cache_event.SetEventObject(parent);
     cache_event.SetCache(item_start, item_last - 1);
     parent->ProcessWindowEvent(cache_event);


@@ -1712,6 +1836,37 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         x_last += col->GetWidth();
     }
 
         x_last += col->GetWidth();
     }
 

+    // Draw background of alternate rows specially if required
+    if ( m_owner->HasFlag(wxDV_ROW_LINES) )
+    {
+        wxColour altRowColour = m_owner->m_alternateRowColour;
+        if ( !altRowColour.IsOk() )
+        {
+            // Determine the alternate rows colour automatically from the
+            // background colour.
+            const wxColour bgColour = m_owner->GetBackgroundColour();
+
+            // Depending on the background, alternate row color
+            // will be 3% more dark or 50% brighter.
+            int alpha = bgColour.GetRGB() > 0x808080 ? 97 : 150;
+            altRowColour = bgColour.ChangeLightness(alpha);
+        }
+
+        dc.SetPen(*wxTRANSPARENT_PEN);
+        dc.SetBrush(wxBrush(altRowColour));
+
+        for (unsigned int item = item_start; item < item_last; item++)
+        {
+            if ( item % 2 )
+            {
+                dc.DrawRectangle(x_start,
+                                 GetLineStart(item),
+                                 GetClientSize().GetWidth(),
+                                 GetLineHeight(item));
+            }
+        }
+    }
+

     // Draw horizontal rules if required
     if ( m_owner->HasFlag(wxDV_HORIZ_RULES) )
     {
     // Draw horizontal rules if required
     if ( m_owner->HasFlag(wxDV_HORIZ_RULES) )
     {


@@ -1754,23 +1909,97 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     for (unsigned int item = item_start; item < item_last; item++)
     {
         bool selected = m_selection.Index( item ) != wxNOT_FOUND;
     for (unsigned int item = item_start; item < item_last; item++)
     {
         bool selected = m_selection.Index( item ) != wxNOT_FOUND;

+

         if (selected || item == m_currentRow)
         {
         if (selected || item == m_currentRow)
         {

-            int flags = selected ? (int)wxCONTROL_SELECTED : 0;
-            if (item == m_currentRow)
-                flags |= wxCONTROL_CURRENT;
-            if (m_hasFocus)
-                flags |= wxCONTROL_FOCUSED;
-

             wxRect rect( x_start, GetLineStart( item ),
                          x_last - x_start, GetLineHeight( item ) );
             wxRect rect( x_start, GetLineStart( item ),
                          x_last - x_start, GetLineHeight( item ) );

-            wxRendererNative::Get().DrawItemSelectionRect
-                                (
-                                    this,
-                                    dc,
-                                    rect,
-                                    flags
-                                );
+
+            // draw selection and whole-item focus:
+            if ( selected )
+            {
+                int flags = wxCONTROL_SELECTED;
+                if (m_hasFocus)
+                    flags |= wxCONTROL_FOCUSED;
+
+                wxRendererNative::Get().DrawItemSelectionRect
+                                    (
+                                        this,
+                                        dc,
+                                        rect,
+                                        flags
+                                    );
+            }
+
+            // draw keyboard focus rect if applicable
+            if ( item == m_currentRow && m_hasFocus )
+            {
+                bool renderColumnFocus = false;
+
+                if ( m_useCellFocus && m_currentCol && m_currentColSetByKeyboard )
+                {
+                    renderColumnFocus = true;
+
+                    // If this is container node without columns, render full-row focus:
+                    if ( !IsList() )
+                    {
+                        wxDataViewTreeNode *node = GetTreeNodeByRow(item);
+                        if ( node->HasChildren() && !model->HasContainerColumns(node->GetItem()) )
+                            renderColumnFocus = false;
+                    }
+                }
+
+                if ( renderColumnFocus )
+                {
+                    for ( unsigned int i = col_start; i < col_last; i++ )
+                    {
+                        wxDataViewColumn *col = GetOwner()->GetColumnAt(i);
+                        if ( col->IsHidden() )
+                            continue;
+
+                        rect.width = col->GetWidth();
+
+                        if ( col == m_currentCol )
+                        {
+                            // make the rect more visible by adding a small
+                            // margin around it:
+                            rect.Deflate(1, 1);
+
+                            if ( selected )
+                            {
+                                // DrawFocusRect() uses XOR and is all but
+                                // invisible against dark-blue background. Use
+                                // the same color used for selected text.
+                                DrawSelectedCellFocusRect(dc, rect);
+                            }
+                            else
+                            {
+                                wxRendererNative::Get().DrawFocusRect
+                                                    (
+                                                        this,
+                                                        dc,
+                                                        rect,
+                                                        0
+                                                );
+                            }
+                            break;
+                        }
+
+                        rect.x += rect.width;
+                    }
+                }
+                else
+                {
+                    // render focus rectangle for the whole row
+                    wxRendererNative::Get().DrawFocusRect
+                                        (
+                                            this,
+                                            dc,
+                                            rect,
+                                            selected ? (int)wxCONTROL_SELECTED : 0
+                                        );
+                }
+            }

         }
     }
 
         }
     }
 


@@ -1785,13 +2014,8 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     }
 #endif // wxUSE_DRAG_AND_DROP
 
     }
 #endif // wxUSE_DRAG_AND_DROP
 

-    wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
-    if (!expander)
-    {
-        // TODO-RTL: last column for RTL support
-        expander = GetOwner()->GetColumnAt( 0 );
-        GetOwner()->SetExpanderColumn(expander);
-    }
+    wxDataViewColumn * const
+        expander = GetExpanderColumnOrFirstOne(GetOwner());

 
     // redraw all cells for all rows which must be repainted and all columns
     wxRect cell_rect;
 
     // redraw all cells for all rows which must be repainted and all columns
     wxRect cell_rect;


@@ -1821,7 +2045,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
                 // Skip all columns of "container" rows except the expander
                 // column itself unless HasContainerColumns() overrides this.
 
                 // Skip all columns of "container" rows except the expander
                 // column itself unless HasContainerColumns() overrides this.

-                if ( col != GetOwner()->GetExpanderColumn() &&
+                if ( col != expander &&

                         model->IsContainer(dataitem) &&
                             !model->HasContainerColumns(dataitem) )
                     continue;
                         model->IsContainer(dataitem) &&
                             !model->HasContainerColumns(dataitem) )
                     continue;


@@ -1837,6 +2061,11 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             cell_rect.y = GetLineStart( item );
             cell_rect.height = GetLineHeight( item );
 
             cell_rect.y = GetLineStart( item );
             cell_rect.height = GetLineHeight( item );
 

+            // draw the background
+            bool selected = m_selection.Index( item ) != wxNOT_FOUND;
+            if ( !selected )
+                DrawCellBackground( cell, dc, cell_rect );
+

             // deal with the expander
             int indent = 0;
             if ((!IsList()) && (col == expander))
             // deal with the expander
             int indent = 0;
             if ((!IsList()) && (col == expander))


@@ -1890,7 +2119,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                 continue;
 
             int state = 0;
                 continue;
 
             int state = 0;

-            if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND))
+            if (m_hasFocus && selected)

                 state |= wxDATAVIEW_CELL_SELECTED;
 
             // TODO: it would be much more efficient to create a clipping
                 state |= wxDATAVIEW_CELL_SELECTED;
 
             // TODO: it would be much more efficient to create a clipping


@@ -1909,6 +2138,28 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     }
 }
 
     }
 }
 

+
+void wxDataViewMainWindow::DrawCellBackground( wxDataViewRenderer* cell, wxDC& dc, const wxRect& rect )
+{
+    wxRect rectBg( rect );
+
+    // don't overlap the horizontal rules
+    if ( m_owner->HasFlag(wxDV_HORIZ_RULES) )
+    {
+        rectBg.x++;
+        rectBg.width--;
+    }
+
+    // don't overlap the vertical rules
+    if ( m_owner->HasFlag(wxDV_VERT_RULES) )
+    {
+        rectBg.y++;
+        rectBg.height--;
+    }
+
+    cell->RenderBackground(&dc, rectBg);
+}
+

 void wxDataViewMainWindow::OnRenameTimer()
 {
     // We have to call this here because changes may just have
 void wxDataViewMainWindow::OnRenameTimer()
 {
     // We have to call this here because changes may just have


@@ -1922,9 +2173,25 @@ void wxDataViewMainWindow::OnRenameTimer()
 
     wxDataViewItem item = GetItemByRow( m_currentRow );
 
 
     wxDataViewItem item = GetItemByRow( m_currentRow );
 

-    wxRect labelRect = GetItemRect(item, m_currentCol);
+    StartEditing( item, m_currentCol );
+}
+
+void
+wxDataViewMainWindow::StartEditing(const wxDataViewItem& item,
+                                   const wxDataViewColumn* col)
+{
+    wxDataViewRenderer* renderer = col->GetRenderer();
+    if ( !IsCellEditableInMode(item, col, wxDATAVIEW_CELL_EDITABLE) )
+        return;

 
 

-    m_currentCol->GetRenderer()->StartEditing( item, labelRect );
+    const wxRect itemRect = GetItemRect(item, col);
+    if ( renderer->StartEditing(item, itemRect) )
+    {
+        // Save the renderer to be able to finish/cancel editing it later and
+        // save the control to be able to detect if we're still editing it.
+        m_editorRenderer = renderer;
+        m_editorCtrl = renderer->GetEditorCtrl();
+    }

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


@@ -1937,10 +2204,13 @@ public:
     virtual ~DoJob() { }
 
     // The return value control how the tree-walker tranverse the tree
     virtual ~DoJob() { }
 
     // 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
-    enum  { OK = 0 , IGR = 1, CONT = 2 };
+    enum
+    {
+        DONE,          // Job done, stop traversing and return
+        SKIP_SUBTREE,  // Ignore the current node's subtree and continue
+        CONTINUE       // Job not done, continue
+    };
+

     virtual int operator() ( wxDataViewTreeNode * node ) = 0;
 };
 
     virtual int operator() ( wxDataViewTreeNode * node ) = 0;
 };
 


@@ -1950,17 +2220,17 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func )
 
     switch( func( node ) )
     {
 
     switch( func( node ) )
     {

-        case DoJob::OK:
+        case DoJob::DONE:

             return true;
             return true;

-        case DoJob::IGR:
+        case DoJob::SKIP_SUBTREE:

             return false;
             return false;

-        case DoJob::CONT:
+        case DoJob::CONTINUE:

             break;
     }
 
     if ( node->HasChildren() )
     {
             break;
     }
 
     if ( node->HasChildren() )
     {

-        const wxDataViewTreeNodes& nodes = node->GetNodes();
+        const wxDataViewTreeNodes& nodes = node->GetChildNodes();

 
         for ( wxDataViewTreeNodes::const_iterator i = nodes.begin();
               i != nodes.end();
 
         for ( wxDataViewTreeNodes::const_iterator i = nodes.begin();
               i != nodes.end();


@@ -1979,7 +2249,7 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
     if (IsVirtualList())
     {
         wxDataViewVirtualListModel *list_model =
     if (IsVirtualList())
     {
         wxDataViewVirtualListModel *list_model =

-            (wxDataViewVirtualListModel*) GetOwner()->GetModel();
+            (wxDataViewVirtualListModel*) GetModel();

         m_count = list_model->GetCount();
     }
     else
         m_count = list_model->GetCount();
     }
     else


@@ -1991,31 +2261,76 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
         if ( !parentNode )
             return false;
 
         if ( !parentNode )
             return false;
 

-        wxDataViewTreeNode *itemNode = new wxDataViewTreeNode(parentNode, item);
-        itemNode->SetHasChildren(GetOwner()->GetModel()->IsContainer(item));
+        wxDataViewItemArray modelSiblings;
+        GetModel()->GetChildren(parent, modelSiblings);
+        const int modelSiblingsSize = modelSiblings.size();

 
 

-        parentNode->SetHasChildren(true);
-        parentNode->AddNode(itemNode);
-        parentNode->ChangeSubTreeCount(+1);
+        int posInModel = modelSiblings.Index(item, /*fromEnd=*/true);
+        wxCHECK_MSG( posInModel != wxNOT_FOUND, false, "adding non-existent item?" );

 
 

-        m_count = -1;
-    }
+        wxDataViewTreeNode *itemNode = new wxDataViewTreeNode(parentNode, item);
+        itemNode->SetHasChildren(GetModel()->IsContainer(item));

 
 

-    GetOwner()->UpdateColBestWidths();
-    UpdateDisplay();
+        parentNode->SetHasChildren(true);

 
 

-    return true;
-}
+        const wxDataViewTreeNodes& nodeSiblings = parentNode->GetChildNodes();
+        const int nodeSiblingsSize = nodeSiblings.size();

 
 

-static void DestroyTreeHelper( wxDataViewTreeNode * node);
+        int nodePos = 0;

 
 

-bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
-                                       const wxDataViewItem& item)
-{
-    if (IsVirtualList())
-    {
+        if ( posInModel == modelSiblingsSize - 1 )
+        {
+            nodePos = nodeSiblingsSize;
+        }
+        else if ( modelSiblingsSize == nodeSiblingsSize + 1 )
+        {
+            // This is the simple case when our node tree already matches the
+            // model and only this one item is missing.
+            nodePos = posInModel;
+        }
+        else
+        {
+            // It's possible that a larger discrepancy between the model and
+            // our realization exists. This can happen e.g. when adding a bunch
+            // of items to the model and then calling ItemsAdded() just once
+            // afterwards. In this case, we must find the right position by
+            // looking at sibling items.
+
+            // append to the end if we won't find a better position:
+            nodePos = nodeSiblingsSize;
+
+            for ( int nextItemPos = posInModel + 1;
+                  nextItemPos < modelSiblingsSize;
+                  nextItemPos++ )
+            {
+                int nextNodePos = parentNode->FindChildByItem(modelSiblings[nextItemPos]);
+                if ( nextNodePos != wxNOT_FOUND )
+                {
+                    nodePos = nextNodePos;
+                    break;
+                }
+            }
+        }
+
+        parentNode->ChangeSubTreeCount(+1);
+        parentNode->InsertChild(itemNode, nodePos);
+
+        m_count = -1;
+    }
+
+    GetOwner()->InvalidateColBestWidths();
+    UpdateDisplay();
+
+    return true;
+}
+
+bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
+                                       const wxDataViewItem& item)
+{
+    if (IsVirtualList())
+    {

         wxDataViewVirtualListModel *list_model =
         wxDataViewVirtualListModel *list_model =

-            (wxDataViewVirtualListModel*) GetOwner()->GetModel();
+            (wxDataViewVirtualListModel*) GetModel();

         m_count = list_model->GetCount();
 
         if ( !m_selection.empty() )
         m_count = list_model->GetCount();
 
         if ( !m_selection.empty() )


@@ -2047,10 +2362,10 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
         // 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 ( !parentNode )
         // 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 ( !parentNode )

-            return false;
+            return true;

 
         wxCHECK_MSG( parentNode->HasChildren(), false, "parent node doesn't have children?" );
 
         wxCHECK_MSG( parentNode->HasChildren(), false, "parent node doesn't have children?" );

-        const wxDataViewTreeNodes& parentsChildren = parentNode->GetNodes();
+        const wxDataViewTreeNodes& parentsChildren = parentNode->GetChildNodes();

 
         // We can't use FindNode() to find 'item', because it was already
         // removed from the model by the time ItemDeleted() is called, so we
 
         // We can't use FindNode() to find 'item', because it was already
         // removed from the model by the time ItemDeleted() is called, so we


@@ -2075,17 +2390,17 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
         {
             // If this was the last child to be removed, it's possible the parent
             // node became a leaf. Let's ask the model about it.
         {
             // If this was the last child to be removed, it's possible the parent
             // node became a leaf. Let's ask the model about it.

-            if ( parentNode->GetNodes().empty() )
-                parentNode->SetHasChildren(GetOwner()->GetModel()->IsContainer(parent));
+            if ( parentNode->GetChildNodes().empty() )
+                parentNode->SetHasChildren(GetModel()->IsContainer(parent));

 
 

-            return false;
+            return true;

         }
 
         // Delete the item from wxDataViewTreeNode representation:
         const int itemsDeleted = 1 + itemNode->GetSubTreeCount();
 
         }
 
         // Delete the item from wxDataViewTreeNode representation:
         const int itemsDeleted = 1 + itemNode->GetSubTreeCount();
 

-        parentNode->GetNodes().Remove(itemNode);
-        ::DestroyTreeHelper(itemNode);
+        parentNode->RemoveChild(itemNode);
+        delete itemNode;

         parentNode->ChangeSubTreeCount(-itemsDeleted);
 
         // Make the row number invalid and get a new valid one when user call GetRowCount
         parentNode->ChangeSubTreeCount(-itemsDeleted);
 
         // Make the row number invalid and get a new valid one when user call GetRowCount


@@ -2093,8 +2408,18 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
 
         // If this was the last child to be removed, it's possible the parent
         // node became a leaf. Let's ask the model about it.
 
         // If this was the last child to be removed, it's possible the parent
         // node became a leaf. Let's ask the model about it.

-        if ( parentNode->GetNodes().empty() )
-            parentNode->SetHasChildren(GetOwner()->GetModel()->IsContainer(parent));
+        if ( parentNode->GetChildNodes().empty() )
+        {
+            bool isContainer = GetModel()->IsContainer(parent);
+            parentNode->SetHasChildren(isContainer);
+            if ( isContainer )
+            {
+                // If it's still a container, make sure we show "+" icon for it
+                // and not "-" one as there is nothing to collapse any more.
+                if ( parentNode->IsOpen() )
+                    parentNode->ToggleOpen();
+            }
+        }

 
         // Update selection by removing 'item' and its entire children tree from the selection.
         if ( !m_selection.empty() )
 
         // Update selection by removing 'item' and its entire children tree from the selection.
         if ( !m_selection.empty() )


@@ -2110,7 +2435,7 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
             else
             {
                 // row number is that of the sibling above 'item' + its subtree if any + 1
             else
             {
                 // row number is that of the sibling above 'item' + its subtree if any + 1

-                const wxDataViewTreeNode *siblingNode = parentNode->GetNodes()[itemPosInNode - 1];
+                const wxDataViewTreeNode *siblingNode = parentNode->GetChildNodes()[itemPosInNode - 1];

 
                 itemRow = GetRowByItem(siblingNode->GetItem()) +
                           siblingNode->GetSubTreeCount() +
 
                 itemRow = GetRowByItem(siblingNode->GetItem()) +
                           siblingNode->GetSubTreeCount() +


@@ -2135,10 +2460,10 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
     }
 
     // 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() )
+    if ( m_currentRow >= GetRowCount() )

         ChangeCurrentRow(m_count - 1);
 
         ChangeCurrentRow(m_count - 1);
 

-    GetOwner()->UpdateColBestWidths();
+    GetOwner()->InvalidateColBestWidths();

     UpdateDisplay();
 
     return true;
     UpdateDisplay();
 
     return true;


@@ -2149,33 +2474,23 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
     SortPrepare();
     g_model->Resort();
 
     SortPrepare();
     g_model->Resort();
 

-    GetOwner()->UpdateColBestWidths();
+    GetOwner()->InvalidateColBestWidths();

 
     // Send event
     wxWindow *parent = GetParent();
 
     // Send event
     wxWindow *parent = GetParent();

-    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
+    wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());

     le.SetEventObject(parent);
     le.SetEventObject(parent);

-    le.SetModel(GetOwner()->GetModel());
+    le.SetModel(GetModel());

     le.SetItem(item);
     le.SetItem(item);

-    parent->GetEventHandler()->ProcessEvent(le);
+    parent->ProcessWindowEvent(le);

 
     return true;
 }
 
 bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int model_column )
 {
 
     return true;
 }
 
 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)
+    int view_column = m_owner->GetModelColumnIndex(model_column);
+    if ( view_column == wxNOT_FOUND )

         return false;
 
     // NOTE: to be valid, we cannot use e.g. INT_MAX - 1
         return false;
 
     // NOTE: to be valid, we cannot use e.g. INT_MAX - 1


@@ -2190,17 +2505,17 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
     SortPrepare();
     g_model->Resort();
 
     SortPrepare();
     g_model->Resort();
 

-    GetOwner()->UpdateColBestWidth(view_column);
+    GetOwner()->InvalidateColBestWidth(view_column);

 
     // Send event
     wxWindow *parent = GetParent();
 
     // Send event
     wxWindow *parent = GetParent();

-    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
+    wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());

     le.SetEventObject(parent);
     le.SetEventObject(parent);

-    le.SetModel(GetOwner()->GetModel());
+    le.SetModel(GetModel());

     le.SetItem(item);
     le.SetColumn(view_column);
     le.SetDataViewColumn(GetOwner()->GetColumn(view_column));
     le.SetItem(item);
     le.SetColumn(view_column);
     le.SetDataViewColumn(GetOwner()->GetColumn(view_column));

-    parent->GetEventHandler()->ProcessEvent(le);
+    parent->ProcessWindowEvent(le);

 
     return true;
 }
 
     return true;
 }


@@ -2209,11 +2524,19 @@ bool wxDataViewMainWindow::Cleared()
 {
     DestroyTree();
     m_selection.Clear();
 {
     DestroyTree();
     m_selection.Clear();

+    m_currentRow = (unsigned)-1;

 
 

-    SortPrepare();
-    BuildTree( GetOwner()->GetModel() );
+    if (GetModel())
+    {
+        SortPrepare();
+        BuildTree( GetModel() );
+    }
+    else
+    {
+        m_count = 0;
+    }

 
 

-    GetOwner()->UpdateColBestWidths();
+    GetOwner()->InvalidateColBestWidths();

     UpdateDisplay();
 
     return true;
     UpdateDisplay();
 
     return true;


@@ -2238,7 +2561,7 @@ void wxDataViewMainWindow::OnInternalIdle()
 
 void wxDataViewMainWindow::RecalculateDisplay()
 {
 
 void wxDataViewMainWindow::RecalculateDisplay()
 {

-    wxDataViewModel *model = GetOwner()->GetModel();
+    wxDataViewModel *model = GetModel();

     if (!model)
     {
         Refresh();
     if (!model)
     {
         Refresh();


@@ -2271,7 +2594,7 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column )
     int x, y;
     m_owner->GetScrollPixelsPerUnit( &x, &y );
     int sy = GetLineStart( rows )/y;
     int x, y;
     m_owner->GetScrollPixelsPerUnit( &x, &y );
     int sy = GetLineStart( rows )/y;

-    int sx = 0;
+    int sx = -1;

     if( column != -1 )
     {
         wxRect rect = GetClientRect();
     if( column != -1 )
     {
         wxRect rect = GetClientRect();


@@ -2345,12 +2668,14 @@ unsigned int wxDataViewMainWindow::GetLastVisibleRow()
     return wxMin( GetRowCount()-1, row );
 }
 
     return wxMin( GetRowCount()-1, row );
 }
 

-unsigned int wxDataViewMainWindow::GetRowCount()
+unsigned int wxDataViewMainWindow::GetRowCount() const

 {
     if ( m_count == -1 )
     {
 {
     if ( m_count == -1 )
     {

-        m_count = RecalculateCount();
-        UpdateDisplay();
+        wxDataViewMainWindow* const
+            self = const_cast<wxDataViewMainWindow*>(this);
+        self->m_count = RecalculateCount();
+        self->UpdateDisplay();

     }
     return m_count;
 }
     }
     return m_count;
 }


@@ -2463,13 +2788,13 @@ bool wxDataViewMainWindow::IsRowSelected( unsigned int row )
 void wxDataViewMainWindow::SendSelectionChangedEvent( const wxDataViewItem& item)
 {
     wxWindow *parent = GetParent();
 void wxDataViewMainWindow::SendSelectionChangedEvent( const wxDataViewItem& item)
 {
     wxWindow *parent = GetParent();

-    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, parent->GetId());
+    wxDataViewEvent le(wxEVT_DATAVIEW_SELECTION_CHANGED, parent->GetId());

 
     le.SetEventObject(parent);
 
     le.SetEventObject(parent);

-    le.SetModel(GetOwner()->GetModel());
+    le.SetModel(GetModel());

     le.SetItem( item );
 
     le.SetItem( item );
 

-    parent->GetEventHandler()->ProcessEvent(le);
+    parent->ProcessWindowEvent(le);

 }
 
 void wxDataViewMainWindow::RefreshRow( unsigned int row )
 }
 
 void wxDataViewMainWindow::RefreshRow( unsigned int row )


@@ -2515,58 +2840,6 @@ void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow )
     Refresh( true, &rect );
 }
 
     Refresh( true, &rect );
 }
 

-void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event)
-{
-    wxCHECK_RET( newCurrent < GetRowCount(),
-                wxT("invalid item index in OnArrowChar()") );
-
-    // if there is no selection, we cannot move it anywhere
-    if (!HasCurrentRow())
-        return;
-
-    unsigned int oldCurrent = m_currentRow;
-
-    // in single selection we just ignore Shift as we can't select several
-    // items anyhow
-    if ( event.ShiftDown() && !IsSingleSel() )
-    {
-        RefreshRow( oldCurrent );
-
-        ChangeCurrentRow( newCurrent );
-
-        // select all the items between the old and the new one
-        if ( oldCurrent > newCurrent )
-        {
-            newCurrent = oldCurrent;
-            oldCurrent = m_currentRow;
-        }
-
-        SelectRows( oldCurrent, newCurrent, true );
-        if (oldCurrent!=newCurrent)
-            SendSelectionChangedEvent(GetItemByRow(m_selection[0]));
-    }
-    else // !shift
-    {
-        RefreshRow( oldCurrent );
-
-        // all previously selected items are unselected unless ctrl is held
-        if ( !event.ControlDown() )
-            SelectAllRows(false);
-
-        ChangeCurrentRow( newCurrent );
-
-        if ( !event.ControlDown() )
-        {
-            SelectRow( m_currentRow, true );
-            SendSelectionChangedEvent(GetItemByRow(m_currentRow));
-        }
-        else
-            RefreshRow( m_currentRow );
-    }
-
-    GetOwner()->EnsureVisible( m_currentRow, -1 );
-}
-

 wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const
 {
     wxRect rect;
 wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const
 {
     wxRect rect;


@@ -2580,7 +2853,7 @@ wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const
 
 int wxDataViewMainWindow::GetLineStart( unsigned int row ) const
 {
 
 int wxDataViewMainWindow::GetLineStart( unsigned int row ) const
 {

-    const wxDataViewModel *model = GetOwner()->GetModel();
+    const wxDataViewModel *model = GetModel();

 
     if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT)
     {
 
     if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT)
     {


@@ -2630,7 +2903,7 @@ int wxDataViewMainWindow::GetLineStart( unsigned int row ) const
 
 int wxDataViewMainWindow::GetLineAt( unsigned int y ) const
 {
 
 int wxDataViewMainWindow::GetLineAt( unsigned int y ) const
 {

-    const wxDataViewModel *model = GetOwner()->GetModel();
+    const wxDataViewModel *model = GetModel();

 
     // check for the easy case first
     if ( !GetOwner()->HasFlag(wxDV_VARIABLE_LINE_HEIGHT) )
 
     // check for the easy case first
     if ( !GetOwner()->HasFlag(wxDV_VARIABLE_LINE_HEIGHT) )


@@ -2681,7 +2954,7 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const
 
 int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
 {
 
 int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
 {

-    const wxDataViewModel *model = GetOwner()->GetModel();
+    const wxDataViewModel *model = GetModel();

 
     if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT)
     {
 
     if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT)
     {


@@ -2741,13 +3014,13 @@ public:
         if( current == static_cast<int>(row))
         {
             ret = node;
         if( current == static_cast<int>(row))
         {
             ret = node;

-            return DoJob::OK;
+            return DoJob::DONE;

         }
 
         if( node->GetSubTreeCount() + current < static_cast<int>(row) )
         {
             current += node->GetSubTreeCount();
         }
 
         if( node->GetSubTreeCount() + current < static_cast<int>(row) )
         {
             current += node->GetSubTreeCount();

-            return  DoJob::IGR;
+            return  DoJob::SKIP_SUBTREE;

         }
         else
         {
         }
         else
         {


@@ -2757,14 +3030,14 @@ public:
             // desired node directly. This can speed up finding the node
             // in some cases, and will have a very good effect for list views.
             if ( node->HasChildren() &&
             // desired node directly. This can speed up finding the node
             // in some cases, and will have a very good effect for list views.
             if ( node->HasChildren() &&

-                 (int)node->GetNodes().size() == node->GetSubTreeCount() )
+                 (int)node->GetChildNodes().size() == node->GetSubTreeCount() )

             {
                 const int index = static_cast<int>(row) - current - 1;
             {
                 const int index = static_cast<int>(row) - current - 1;

-                ret = node->GetNodes()[index];
-                return DoJob::OK;
+                ret = node->GetChildNodes()[index];
+                return DoJob::DONE;

             }
 
             }
 

-            return DoJob::CONT;
+            return DoJob::CONTINUE;

         }
     }
 
         }
     }
 


@@ -2782,6 +3055,9 @@ wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) co
 {
     wxASSERT( !IsVirtualList() );
 
 {
     wxASSERT( !IsVirtualList() );
 

+    if ( row == (unsigned)-1 )
+        return NULL;
+

     RowToTreeNodeJob job( row , -2, m_root );
     Walker( m_root , job );
     return job.GetResult();
     RowToTreeNodeJob job( row , -2, m_root );
     Walker( m_root , job );
     return job.GetResult();


@@ -2789,15 +3065,20 @@ wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) co
 
 wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const
 {
 
 wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const
 {

+    wxDataViewItem item;

     if (IsVirtualList())
     {
     if (IsVirtualList())
     {

-        return wxDataViewItem( wxUIntToPtr(row+1) );
+        if ( row < GetRowCount() )
+            item = wxDataViewItem(wxUIntToPtr(row+1));

     }
     else
     {
         wxDataViewTreeNode *node = GetTreeNodeByRow(row);
     }
     else
     {
         wxDataViewTreeNode *node = GetTreeNodeByRow(row);

-        return node ? node->GetItem() : wxDataViewItem();
+        if ( node )
+            item = node->GetItem();

     }
     }

+
+    return item;

 }
 
 bool
 }
 
 bool


@@ -2808,7 +3089,7 @@ wxDataViewMainWindow::SendExpanderEvent(wxEventType type,
     wxDataViewEvent le(type, parent->GetId());
 
     le.SetEventObject(parent);
     wxDataViewEvent le(type, parent->GetId());
 
     le.SetEventObject(parent);

-    le.SetModel(GetOwner()->GetModel());
+    le.SetModel(GetModel());

     le.SetItem( item );
 
     return !parent->ProcessWindowEvent(le) || le.IsAllowed();
     le.SetItem( item );
 
     return !parent->ProcessWindowEvent(le) || le.IsAllowed();


@@ -2856,44 +3137,44 @@ void wxDataViewMainWindow::Expand( unsigned int row )
     if (!node->HasChildren())
         return;
 
     if (!node->HasChildren())
         return;
 

-            if (!node->IsOpen())
-            {
-                if ( !SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, node->GetItem()) )
-                {
-                    // Vetoed by the event handler.
-                    return;
-                }
+    if (!node->IsOpen())
+    {
+        if ( !SendExpanderEvent(wxEVT_DATAVIEW_ITEM_EXPANDING, node->GetItem()) )
+        {
+            // Vetoed by the event handler.
+            return;
+        }

 
 

-                node->ToggleOpen();
+        node->ToggleOpen();

 
 

-                // build the children of current node
-                if( node->GetNodes().empty() )
-                {
-                    SortPrepare();
-                    ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);
-                }
+        // build the children of current node
+        if( node->GetChildNodes().empty() )
+        {
+            SortPrepare();
+            ::BuildTreeHelper(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;
+        // 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;
-                }
+            m_selection[i] += rowAdjustment;
+        }

 
 

-                if(m_currentRow > row)
-                    ChangeCurrentRow(m_currentRow + 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());
-            }
+        m_count = -1;
+        UpdateDisplay();
+        // Send the expanded event
+        SendExpanderEvent(wxEVT_DATAVIEW_ITEM_EXPANDED,node->GetItem());
+    }

 }
 
 void wxDataViewMainWindow::Collapse(unsigned int row)
 }
 
 void wxDataViewMainWindow::Collapse(unsigned int row)


@@ -2910,7 +3191,7 @@ void wxDataViewMainWindow::Collapse(unsigned int row)
 
         if (node->IsOpen())
         {
 
         if (node->IsOpen())
         {

-            if ( !SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem()) )
+            if ( !SendExpanderEvent(wxEVT_DATAVIEW_ITEM_COLLAPSING,node->GetItem()) )

             {
                 // Vetoed by the event handler.
                 return;
             {
                 // Vetoed by the event handler.
                 return;


@@ -2966,13 +3247,13 @@ void wxDataViewMainWindow::Collapse(unsigned int row)
 
             m_count = -1;
             UpdateDisplay();
 
             m_count = -1;
             UpdateDisplay();

-            SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,node->GetItem());
+            SendExpanderEvent(wxEVT_DATAVIEW_ITEM_COLLAPSED,node->GetItem());

         }
 }
 
 wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item )
 {
         }
 }
 
 wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item )
 {

-    const wxDataViewModel * model = GetOwner()->GetModel();
+    const wxDataViewModel * model = GetModel();

     if( model == NULL )
         return NULL;
 
     if( model == NULL )
         return NULL;
 


@@ -2995,7 +3276,7 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
     {
         if( node->HasChildren() )
         {
     {
         if( node->HasChildren() )
         {

-            if( node->GetNodes().empty() )
+            if( node->GetChildNodes().empty() )

             {
                 // Even though the item is a container, it doesn't have any
                 // child nodes in the control's representation yet. We have
             {
                 // Even though the item is a container, it doesn't have any
                 // child nodes in the control's representation yet. We have


@@ -3004,7 +3285,7 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
                 ::BuildTreeHelper(model, node->GetItem(), node);
             }
 
                 ::BuildTreeHelper(model, node->GetItem(), node);
             }
 

-            const wxDataViewTreeNodes& nodes = node->GetNodes();
+            const wxDataViewTreeNodes& nodes = node->GetChildNodes();

             bool found = false;
 
             for (unsigned i = 0; i < nodes.GetCount(); ++i)
             bool found = false;
 
             for (unsigned i = 0; i < nodes.GetCount(); ++i)


@@ -3099,7 +3380,8 @@ wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item,
     // to get the correct x position where the actual text is
     int indent = 0;
     int row = GetRowByItem(item);
     // to get the correct x position where the actual text is
     int indent = 0;
     int row = GetRowByItem(item);

-    if (!IsList() && (column == 0 || GetOwner()->GetExpanderColumn() == column) )
+    if (!IsList() &&
+            (column == 0 || GetExpanderColumnOrFirstOne(GetOwner()) == column) )

     {
         wxDataViewTreeNode* node = GetTreeNodeByRow(row);
         indent = GetOwner()->GetIndent() * node->GetIndentLevel();
     {
         wxDataViewTreeNode* node = GetTreeNodeByRow(row);
         indent = GetOwner()->GetIndent() * node->GetIndentLevel();


@@ -3117,12 +3399,12 @@ wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item,
     return itemRect;
 }
 
     return itemRect;
 }
 

-int wxDataViewMainWindow::RecalculateCount()
+int wxDataViewMainWindow::RecalculateCount() const

 {
     if (IsVirtualList())
     {
         wxDataViewVirtualListModel *list_model =
 {
     if (IsVirtualList())
     {
         wxDataViewVirtualListModel *list_model =

-            (wxDataViewVirtualListModel*) GetOwner()->GetModel();
+            (wxDataViewVirtualListModel*) GetModel();

 
         return list_model->GetCount();
     }
 
         return list_model->GetCount();
     }


@@ -3148,18 +3430,18 @@ public:
         ret ++;
         if( node->GetItem() == item )
         {
         ret ++;
         if( node->GetItem() == item )
         {

-            return DoJob::OK;
+            return DoJob::DONE;

         }
 
         if( node->GetItem() == *m_iter )
         {
             m_iter++;
         }
 
         if( node->GetItem() == *m_iter )
         {
             m_iter++;

-            return DoJob::CONT;
+            return DoJob::CONTINUE;

         }
         else
         {
             ret += node->GetSubTreeCount();
         }
         else
         {
             ret += node->GetSubTreeCount();

-            return DoJob::IGR;
+            return DoJob::SKIP_SUBTREE;

         }
 
     }
         }
 
     }


@@ -3177,7 +3459,7 @@ private:
 
 int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) const
 {
 
 int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) const
 {

-    const wxDataViewModel * model = GetOwner()->GetModel();
+    const wxDataViewModel * model = GetModel();

     if( model == NULL )
         return -1;
 
     if( model == NULL )
         return -1;
 


@@ -3226,7 +3508,7 @@ static void BuildTreeHelper( const wxDataViewModel * model,  const wxDataViewIte
         if( model->IsContainer(children[index]) )
             n->SetHasChildren( true );
 
         if( model->IsContainer(children[index]) )
             n->SetHasChildren( true );
 

-        node->AddNode(n);
+        node->InsertChild(n, index);

     }
 
     wxASSERT( node->IsOpen() );
     }
 
     wxASSERT( node->IsOpen() );


@@ -3237,7 +3519,7 @@ void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
 {
     DestroyTree();
 
 {
     DestroyTree();
 

-    if (GetOwner()->GetModel()->IsVirtualListModel())
+    if (GetModel()->IsVirtualListModel())

     {
         m_count = -1;
         return;
     {
         m_count = -1;
         return;


@@ -3252,26 +3534,110 @@ void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
     m_count = -1;
 }
 
     m_count = -1;
 }
 

-static void DestroyTreeHelper( wxDataViewTreeNode * node )
+void wxDataViewMainWindow::DestroyTree()

 {
 {

-    if ( node->HasChildren() )
+    if (!IsVirtualList())

     {
     {

-        wxDataViewTreeNodes& nodes = node->GetNodes();
-        const int len = nodes.size();
-        for (int i = 0; i < len; i++)
-            DestroyTreeHelper(nodes[i]);
+        wxDELETE(m_root);
+        m_count = 0;

     }
     }

-    delete node;

 }
 
 }
 

-void wxDataViewMainWindow::DestroyTree()
+wxDataViewColumn*
+wxDataViewMainWindow::FindColumnForEditing(const wxDataViewItem& item, wxDataViewCellMode mode)

 {
 {

-    if (!IsVirtualList())
+    // Edit the current column editable in 'mode'. If no column is focused
+    // (typically because the user has full row selected), try to find the
+    // first editable column (this would typically be a checkbox for
+    // wxDATAVIEW_CELL_ACTIVATABLE and we don't want to force the user to set
+    // focus on the checkbox column; or on the only editable text column).
+
+    wxDataViewColumn *candidate = m_currentCol;
+
+    if ( candidate &&
+         !IsCellEditableInMode(item, candidate, mode) &&
+         !m_currentColSetByKeyboard )
+    {
+        // If current column was set by mouse to something not editable (in
+        // 'mode') and the user pressed Space/F2 to edit it, treat the
+        // situation as if there was whole-row focus, because that's what is
+        // visually indicated and the mouse click could very well be targeted
+        // on the row rather than on an individual cell.
+        //
+        // But if it was done by keyboard, respect that even if the column
+        // isn't editable, because focus is visually on that column and editing
+        // something else would be surprising.
+        candidate = NULL;
+    }
+
+    if ( !candidate )
+    {
+        const unsigned cols = GetOwner()->GetColumnCount();
+        for ( unsigned i = 0; i < cols; i++ )
+        {
+            wxDataViewColumn *c = GetOwner()->GetColumnAt(i);
+            if ( c->IsHidden() )
+                continue;
+
+            if ( IsCellEditableInMode(item, c, mode) )
+            {
+                candidate = c;
+                break;
+            }
+        }
+    }
+
+    // If on container item without columns, only the expander column
+    // may be directly editable:
+    if ( candidate &&
+         GetOwner()->GetExpanderColumn() != candidate &&
+         GetModel()->IsContainer(item) &&
+         !GetModel()->HasContainerColumns(item) )
+    {
+        candidate = GetOwner()->GetExpanderColumn();
+    }
+
+    if ( !candidate )
+       return NULL;
+
+   if ( !IsCellEditableInMode(item, candidate, mode) )
+       return NULL;
+
+   return candidate;
+}
+
+bool wxDataViewMainWindow::IsCellEditableInMode(const wxDataViewItem& item,
+                                                const wxDataViewColumn *col,
+                                                wxDataViewCellMode mode) const
+{
+    if ( col->GetRenderer()->GetMode() != mode )
+        return false;
+
+    if ( !GetModel()->IsEnabled(item, col->GetModelColumn()) )
+        return false;
+
+    return true;
+}
+
+void wxDataViewMainWindow::OnCharHook(wxKeyEvent& event)
+{
+    if ( m_editorCtrl )

     {
     {

-        ::DestroyTreeHelper(m_root);
-            m_count = 0;
-            m_root = NULL;
+        // Handle any keys special for the in-place editor and return without
+        // calling Skip() below.
+        switch ( event.GetKeyCode() )
+        {
+            case WXK_ESCAPE:
+                m_editorRenderer->CancelEditing();
+                return;
+
+            case WXK_RETURN:
+                m_editorRenderer->FinishEditing();
+                return;
+        }

     }
     }

+
+    event.Skip();

 }
 
 void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
 }
 
 void wxDataViewMainWindow::OnChar( wxKeyEvent &event )


@@ -3301,117 +3667,128 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
     switch ( event.GetKeyCode() )
     {
         case WXK_RETURN:
     switch ( event.GetKeyCode() )
     {
         case WXK_RETURN:

+            if ( event.HasModifiers() )
+            {
+                event.Skip();
+                break;
+            }
+            else

             {
             {

-                wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED,
+                // Enter activates the item, i.e. sends wxEVT_DATAVIEW_ITEM_ACTIVATED to
+                // it. Only if that event is not handled do we activate column renderer (which
+                // is normally done by Space) or even inline editing.
+
+                const wxDataViewItem item = GetItemByRow(m_currentRow);
+
+                wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_ACTIVATED,

                                    parent->GetId());
                                    parent->GetId());

-                le.SetItem( GetItemByRow(m_currentRow) );
+                le.SetItem(item);

                 le.SetEventObject(parent);
                 le.SetEventObject(parent);

-                le.SetModel(GetOwner()->GetModel());
+                le.SetModel(GetModel());

 
 

-                parent->GetEventHandler()->ProcessEvent(le);
+                if ( parent->ProcessWindowEvent(le) )
+                    break;
+                // else: fall through to WXK_SPACE handling

             }
             }

-            break;

 
 

-        case WXK_UP:
-            if ( m_currentRow > 0 )
-                OnArrowChar( m_currentRow - 1, event );
-            break;
+        case WXK_SPACE:
+            if ( event.HasModifiers() )
+            {
+                event.Skip();
+                break;
+            }
+            else
+            {
+                // Space toggles activatable items or -- if not activatable --
+                // starts inline editing (this is normally done using F2 on
+                // Windows, but Space is common everywhere else, so use it too
+                // for greater cross-platform compatibility).

 
 

-        case WXK_DOWN:
-            if ( m_currentRow + 1 < GetRowCount() )
-                OnArrowChar( m_currentRow + 1, event );
-            break;
-        // Add the process for tree expanding/collapsing
-        case WXK_LEFT:
-        {
-            if (IsList())
-               break;
+                const wxDataViewItem item = GetItemByRow(m_currentRow);

 
 

-            wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
-            if (!node)
-                break;
+                // Activate the current activatable column. If not column is focused (typically
+                // because the user has full row selected), try to find the first activatable
+                // column (this would typically be a checkbox and we don't want to force the user
+                // to set focus on the checkbox column).
+                wxDataViewColumn *activatableCol = FindColumnForEditing(item, wxDATAVIEW_CELL_ACTIVATABLE);
+
+                if ( activatableCol )
+                {
+                    const unsigned colIdx = activatableCol->GetModelColumn();
+                    const wxRect cell_rect = GetOwner()->GetItemRect(item, activatableCol);
+
+                    wxDataViewRenderer *cell = activatableCol->GetRenderer();
+                    cell->PrepareForItem(GetModel(), item, colIdx);
+                    cell->WXActivateCell(cell_rect, GetModel(), item, colIdx, NULL);
+
+                    break;
+                }
+                // else: fall through to WXK_F2 handling
+            }

 
 

-            if (node->HasChildren() && node->IsOpen())
+        case WXK_F2:
+            if ( event.HasModifiers() )

             {
             {

-                Collapse(m_currentRow);
+                event.Skip();
+                break;

             }
             }

-            else    // if the node is already closed we move the selection to its parent
+            else

             {
             {

-                wxDataViewTreeNode *parent_node = node->GetParent();
-
-                if (parent_node)
+                if( !m_selection.empty() )

                 {
                 {

-                    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() );
-                    }
+                    // Mimic Windows 7 behavior: edit the item that has focus
+                    // if it is selected and the first selected item if focus
+                    // is out of selection.
+                    int sel;
+                    if ( m_selection.Index(m_currentRow) != wxNOT_FOUND )
+                        sel = m_currentRow;
+                    else
+                        sel = m_selection[0];
+
+
+                    const wxDataViewItem item = GetItemByRow(sel);
+
+                    // Edit the current column. If no column is focused
+                    // (typically because the user has full row selected), try
+                    // to find the first editable column.
+                    wxDataViewColumn *editableCol = FindColumnForEditing(item, wxDATAVIEW_CELL_EDITABLE);
+
+                    if ( editableCol )
+                        GetOwner()->EditItem(item, editableCol);

                 }
             }
             break;
                 }
             }
             break;

-        }
+
+        case WXK_UP:
+            OnVerticalNavigation( -1, event );
+            break;
+
+        case WXK_DOWN:
+            OnVerticalNavigation( +1, event );
+            break;
+        // Add the process for tree expanding/collapsing
+        case WXK_LEFT:
+            OnLeftKey();
+            break;
+

         case WXK_RIGHT:
         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) );
-            }
+            OnRightKey();

             break;
             break;

-        }
+

         case WXK_END:
         case WXK_END:

-        {
-            if (!IsEmpty())
-                OnArrowChar( GetRowCount() - 1, event );
+            OnVerticalNavigation( +(int)GetRowCount(), event );

             break;
             break;

-        }
+

         case WXK_HOME:
         case WXK_HOME:

-            if (!IsEmpty())
-                OnArrowChar( 0, event );
+            OnVerticalNavigation( -(int)GetRowCount(), event );

             break;
 
         case WXK_PAGEUP:
             break;
 
         case WXK_PAGEUP:

-            {
-                int steps = pageSize - 1;
-                int index = m_currentRow - steps;
-                if (index < 0)
-                    index = 0;
-
-                OnArrowChar( index, event );
-            }
+            OnVerticalNavigation( -(pageSize - 1), event );

             break;
 
         case WXK_PAGEDOWN:
             break;
 
         case WXK_PAGEDOWN:

-            {
-                int steps = pageSize - 1;
-                unsigned int index = m_currentRow + steps;
-                unsigned int count = GetRowCount();
-                if ( index >= count )
-                    index = count - 1;
-
-                OnArrowChar( index, 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);
-                }
-            }
+            OnVerticalNavigation( +(pageSize - 1), event );

             break;
 
         default:
             break;
 
         default:


@@ -3419,18 +3796,212 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
     }
 }
 
     }
 }
 

-void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
+void wxDataViewMainWindow::OnVerticalNavigation(int delta, const wxKeyEvent& event)

 {
 {

-    if (event.GetEventType() == wxEVT_MOUSEWHEEL)
-    {
-        // let the base handle mouse wheel events.
-        event.Skip();
+    // if there is no selection, we cannot move it anywhere
+    if (!HasCurrentRow() || IsEmpty())

         return;
         return;

+
+    int newRow = (int)m_currentRow + delta;
+
+    // let's keep the new row inside the allowed range
+    if ( newRow < 0 )
+        newRow = 0;
+
+    const int rowCount = (int)GetRowCount();
+    if ( newRow >= rowCount )
+        newRow = rowCount - 1;
+
+    unsigned int oldCurrent = m_currentRow;
+    unsigned int newCurrent = (unsigned int)newRow;
+
+    // in single selection we just ignore Shift as we can't select several
+    // items anyhow
+    if ( event.ShiftDown() && !IsSingleSel() )
+    {
+        RefreshRow( oldCurrent );
+
+        ChangeCurrentRow( newCurrent );
+
+        // select all the items between the old and the new one
+        if ( oldCurrent > newCurrent )
+        {
+            newCurrent = oldCurrent;
+            oldCurrent = m_currentRow;
+        }
+
+        SelectRows( oldCurrent, newCurrent, true );
+        if (oldCurrent!=newCurrent)
+            SendSelectionChangedEvent(GetItemByRow(m_selection[0]));

     }
     }

+    else // !shift
+    {
+        RefreshRow( oldCurrent );
+
+        // all previously selected items are unselected unless ctrl is held
+        if ( !event.ControlDown() )
+            SelectAllRows(false);

 
 

-    // set the focus to ourself if any of the mouse buttons are pressed
-    if(event.ButtonDown() && !HasFocus())
-        SetFocus();
+        ChangeCurrentRow( newCurrent );
+
+        if ( !event.ControlDown() )
+        {
+            SelectRow( m_currentRow, true );
+            SendSelectionChangedEvent(GetItemByRow(m_currentRow));
+        }
+        else
+            RefreshRow( m_currentRow );
+    }
+
+    GetOwner()->EnsureVisible( m_currentRow, -1 );
+}
+
+void wxDataViewMainWindow::OnLeftKey()
+{
+    if ( IsList() )
+    {
+        TryAdvanceCurrentColumn(NULL, /*forward=*/false);
+    }
+    else
+    {
+        wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
+        if ( !node )
+            return;
+
+        if ( TryAdvanceCurrentColumn(node, /*forward=*/false) )
+            return;
+
+        // Because TryAdvanceCurrentColumn() return false, we are at the first
+        // column or using whole-row selection. In this situation, we can use
+        // the standard TreeView handling of the left key.
+        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 (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() );
+                }
+            }
+        }
+    }
+}
+
+void wxDataViewMainWindow::OnRightKey()
+{
+    if ( IsList() )
+    {
+        TryAdvanceCurrentColumn(NULL, /*forward=*/true);
+    }
+    else
+    {
+        wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
+        if ( !node )
+            return;
+
+        if ( node->HasChildren() )
+        {
+            if ( !node->IsOpen() )
+            {
+                Expand( m_currentRow );
+            }
+            else
+            {
+                // if the node is already open, we move the selection to the first child
+                unsigned int row = m_currentRow;
+                SelectRow( row, false );
+                SelectRow( row + 1, true );
+                ChangeCurrentRow( row + 1 );
+                GetOwner()->EnsureVisible( row + 1, -1 );
+                SendSelectionChangedEvent( GetItemByRow(row+1) );
+            }
+        }
+        else
+        {
+            TryAdvanceCurrentColumn(node, /*forward=*/true);
+        }
+    }
+}
+
+bool wxDataViewMainWindow::TryAdvanceCurrentColumn(wxDataViewTreeNode *node, bool forward)
+{
+    if ( GetOwner()->GetColumnCount() == 0 )
+        return false;
+
+    if ( !m_useCellFocus )
+        return false;
+
+    if ( node )
+    {
+        // navigation shouldn't work in branch nodes without other columns:
+        if ( node->HasChildren() && !GetModel()->HasContainerColumns(node->GetItem()) )
+            return false;
+    }
+
+    if ( m_currentCol == NULL || !m_currentColSetByKeyboard )
+    {
+        if ( forward )
+        {
+            m_currentCol = GetOwner()->GetColumnAt(1);
+            m_currentColSetByKeyboard = true;
+            RefreshRow(m_currentRow);
+            return true;
+        }
+        else
+            return false;
+    }
+
+    int idx = GetOwner()->GetColumnIndex(m_currentCol) + (forward ? +1 : -1);
+
+    if ( idx >= (int)GetOwner()->GetColumnCount() )
+        return false;
+
+    GetOwner()->EnsureVisible(m_currentRow, idx);
+
+    if ( idx < 1 )
+    {
+        // We are going to the left of the second column. Reset to whole-row
+        // focus (which means first column would be edited).
+        m_currentCol = NULL;
+        RefreshRow(m_currentRow);
+        return true;
+    }
+
+    m_currentCol = GetOwner()->GetColumnAt(idx);
+    m_currentColSetByKeyboard = true;
+    RefreshRow(m_currentRow);
+    return true;
+}
+
+void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
+{
+    if (event.GetEventType() == wxEVT_MOUSEWHEEL)
+    {
+        // let the base handle mouse wheel events.
+        event.Skip();
+        return;
+    }
+
+    if(event.ButtonDown())
+    {
+        // Not skipping button down events would prevent the system from
+        // setting focus to this window as most (all?) of them do by default,
+        // so skip it to enable default handling.
+        event.Skip();
+    }

 
     int x = event.GetX();
     int y = event.GetY();
 
     int x = event.GetX();
     int y = event.GetY();


@@ -3453,74 +4024,35 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         }
         xpos += c->GetWidth();
     }
         }
         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;
-    }
+    wxDataViewModel* const model = GetModel();

 
 

-    // Test whether the mouse is hovering over the expander (a.k.a tree "+"
-    // button) and also determine the offset of the real cell start, skipping
-    // the indentation and the expander itself.
-    bool hoverOverExpander = false;
-    int expanderOffset = 0;
-    if ((!IsList()) && (GetOwner()->GetExpanderColumn() == col))
-    {
-        wxDataViewTreeNode * node = GetTreeNodeByRow(current);
-        if( node!=NULL && node->HasChildren() )
-        {
-            int indent = node->GetIndentLevel();
-            indent = GetOwner()->GetIndent()*indent;
+    const unsigned int current = GetLineAt( y );
+    const wxDataViewItem item = GetItemByRow(current);

 
 

-            // 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);
-
-            expanderOffset = indent + m_lineHeight;
-
-            if( rect.Contains(x, y) )
-            {
-                // So the mouse is over the expander
-                hoverOverExpander = true;
-                if (m_underMouse && m_underMouse != node)
-                {
-                    // wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
-                    RefreshRow(GetRowByItem(m_underMouse->GetItem()));
-                }
-                if (m_underMouse != node)
-                {
-                    // wxLogMessage("Do the row: %d", current);
-                    RefreshRow(current);
-                }
-                m_underMouse = node;
-            }
-        }
-    }
-    if (!hoverOverExpander)
+    // Handle right clicking here, before everything else as context menu
+    // events should be sent even when we click outside of any item, unlike all
+    // the other ones.
+    if (event.RightUp())

     {
     {

-        if (m_underMouse != NULL)
+        wxWindow *parent = GetParent();
+        wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId());
+        le.SetEventObject(parent);
+        le.SetModel(model);
+
+        if ( item.IsOk() && col )

         {
         {

-            // wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
-            RefreshRow(GetRowByItem(m_underMouse->GetItem()));
-            m_underMouse = NULL;
+            le.SetItem( item );
+            le.SetColumn( col->GetModelColumn() );
+            le.SetDataViewColumn( col );

         }
         }

-    }

 
 

-    wxDataViewModel *model = GetOwner()->GetModel();
+        parent->ProcessWindowEvent(le);
+        return;
+    }

 
 #if wxUSE_DRAG_AND_DROP
 
 #if wxUSE_DRAG_AND_DROP

-    if (event.Dragging())
+    if (event.Dragging() || ((m_dragCount > 0) && event.Leaving()))

     {
         if (m_dragCount == 0)
         {
     {
         if (m_dragCount == 0)
         {


@@ -3531,8 +4063,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         }
 
         m_dragCount++;
         }
 
         m_dragCount++;

-
-        if (m_dragCount != 3)
+        if ((m_dragCount < 3) && (event.Leaving()))
+            m_dragCount = 3;
+        else if (m_dragCount != 3)

             return;
 
         if (event.LeftIsDown())
             return;
 
         if (event.LeftIsDown())


@@ -3540,12 +4073,12 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             m_owner->CalcUnscrolledPosition( m_dragStart.x, m_dragStart.y,
                                              &m_dragStart.x, &m_dragStart.y );
             unsigned int drag_item_row = GetLineAt( 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 );
+            wxDataViewItem itemDragged = GetItemByRow( drag_item_row );

 
             // Notify cell about drag
 
             // Notify cell about drag

-            wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() );
+            wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() );

             event.SetEventObject( m_owner );
             event.SetEventObject( m_owner );

-            event.SetItem( item );
+            event.SetItem( itemDragged );

             event.SetModel( model );
             if (!m_owner->HandleWindowEvent( event ))
                 return;
             event.SetModel( model );
             if (!m_owner->HandleWindowEvent( event ))
                 return;


@@ -3559,7 +4092,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
             wxDataViewDropSource drag( this, drag_item_row );
             drag.SetData( *obj );
 
             wxDataViewDropSource drag( this, drag_item_row );
             drag.SetData( *obj );

-            /* wxDragResult res = */ drag.DoDragDrop();
+            /* wxDragResult res = */ drag.DoDragDrop(event.GetDragFlags());

             delete obj;
         }
         return;
             delete obj;
         }
         return;


@@ -3570,6 +4103,79 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     }
 #endif // wxUSE_DRAG_AND_DROP
 
     }
 #endif // wxUSE_DRAG_AND_DROP
 

+    // Check if we clicked outside the item area.
+    if ((current >= GetRowCount()) || !col)
+    {
+        // Follow Windows convention here: clicking either left or right (but
+        // not middle) button clears the existing selection.
+        if (m_owner && (event.LeftDown() || event.RightDown()))
+        {
+            if (!GetSelections().empty())
+            {
+                m_owner->UnselectAll();
+                SendSelectionChangedEvent(wxDataViewItem());
+            }
+        }
+        event.Skip();
+        return;
+    }
+
+    wxDataViewRenderer *cell = col->GetRenderer();
+    wxDataViewColumn* const
+        expander = GetExpanderColumnOrFirstOne(GetOwner());
+
+    // Test whether the mouse is hovering over the expander (a.k.a tree "+"
+    // button) and also determine the offset of the real cell start, skipping
+    // the indentation and the expander itself.
+    bool hoverOverExpander = false;
+    int itemOffset = 0;
+    if ((!IsList()) && (expander == col))
+    {
+        wxDataViewTreeNode * node = GetTreeNodeByRow(current);
+
+        int indent = node->GetIndentLevel();
+        itemOffset = GetOwner()->GetIndent()*indent;
+
+        if ( node->HasChildren() )
+        {
+            // 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(itemOffset,
+                        GetLineStart( current ) + (GetLineHeight(current) - m_lineHeight)/2,
+                        m_lineHeight, m_lineHeight);
+
+            if( rect.Contains(x, y) )
+            {
+                // So the mouse is over the expander
+                hoverOverExpander = true;
+                if (m_underMouse && m_underMouse != node)
+                {
+                    // wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
+                    RefreshRow(GetRowByItem(m_underMouse->GetItem()));
+                }
+                if (m_underMouse != node)
+                {
+                    // wxLogMessage("Do the row: %d", current);
+                    RefreshRow(current);
+                }
+                m_underMouse = node;
+            }
+        }
+
+        // Account for the expander as well, even if this item doesn't have it,
+        // its parent does so it still counts for the offset.
+        itemOffset += m_lineHeight;
+    }
+    if (!hoverOverExpander)
+    {
+        if (m_underMouse != NULL)
+        {
+            // wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
+            RefreshRow(GetRowByItem(m_underMouse->GetItem()));
+            m_underMouse = NULL;
+        }
+    }
+

     bool simulateClick = false;
 
     if (event.ButtonDClick())
     bool simulateClick = false;
 
     if (event.ButtonDClick())


@@ -3578,9 +4184,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         m_lastOnSame = false;
     }
 
         m_lastOnSame = false;
     }
 

-    wxDataViewItem item = GetItemByRow(current);

     bool ignore_other_columns =
     bool ignore_other_columns =

-        ((GetOwner()->GetExpanderColumn() != col) &&
+        ((expander != col) &&

         (model->IsContainer(item)) &&
         (!model->HasContainerColumns(item)));
 
         (model->IsContainer(item)) &&
         (!model->HasContainerColumns(item)));
 


@@ -3593,28 +4198,15 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         }
         else if ( current == m_lineLastClicked )
         {
         }
         else if ( current == m_lineLastClicked )
         {

-            if ((!ignore_other_columns) && (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE))
-            {
-                const unsigned colIdx = col->GetModelColumn();
-
-                cell->PrepareForItem(model, item, colIdx);
-
-                wxRect cell_rect( xpos, GetLineStart( current ),
-                                col->GetWidth(), GetLineHeight( current ) );
-                cell->WXOnActivate( 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());
-
-                parent->GetEventHandler()->ProcessEvent(le);
-            }
+            wxWindow *parent = GetParent();
+            wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_ACTIVATED, parent->GetId());
+            le.SetItem( item );
+            le.SetColumn( col->GetModelColumn() );
+            le.SetDataViewColumn( col );
+            le.SetEventObject(parent);
+            le.SetModel(GetModel());
+
+            parent->ProcessWindowEvent(le);

             return;
         }
         else
             return;
         }
         else


@@ -3640,7 +4232,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         if (m_lastOnSame && !ignore_other_columns)
         {
             if ((col == m_currentCol) && (current == m_currentRow) &&
         if (m_lastOnSame && !ignore_other_columns)
         {
             if ((col == m_currentCol) && (current == m_currentRow) &&

-                (cell->GetMode() & wxDATAVIEW_CELL_EDITABLE) )
+                IsCellEditableInMode(item, col, wxDATAVIEW_CELL_EDITABLE) )

             {
                 m_renameTimer->Start( 100, true );
             }
             {
                 m_renameTimer->Start( 100, true );
             }


@@ -3675,20 +4267,6 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );
         }
     }
             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);
-        parent->GetEventHandler()->ProcessEvent(le);
-    }

     else if (event.MiddleDown())
     {
     }
     else if (event.MiddleDown())
     {
     }


@@ -3767,59 +4345,77 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
         // Update selection here...
         m_currentCol = col;
 
         // Update selection here...
         m_currentCol = col;

-
+        m_currentColSetByKeyboard = false;
+
+        // This flag is used to decide whether we should start editing the item
+        // label. We do it if the user clicks twice (but not double clicks,
+        // i.e. simulateClick is false) on the same item but not if the click
+        // was used for something else already, e.g. selecting the item (so it
+        // must have been already selected) or giving the focus to the control
+        // (so it must have had focus already).

         m_lastOnSame = !simulateClick && ((col == oldCurrentCol) &&
         m_lastOnSame = !simulateClick && ((col == oldCurrentCol) &&

-                        (current == oldCurrentRow)) && oldWasSelected;
+                        (current == oldCurrentRow)) && oldWasSelected &&
+                        HasFocus();

 
 

-        // Call LeftClick after everything else as under GTK+
-        if (cell->GetMode() & wxDATAVIEW_CELL_ACTIVATABLE)
+        // Call ActivateCell() after everything else as under GTK+
+        if ( IsCellEditableInMode(item, col, wxDATAVIEW_CELL_ACTIVATABLE) )

         {
             // notify cell about click
             cell->PrepareForItem(model, item, col->GetModelColumn());
 
         {
             // notify cell about click
             cell->PrepareForItem(model, item, col->GetModelColumn());
 

-            wxRect cell_rect( xpos + expanderOffset,
+            wxRect cell_rect( xpos + itemOffset,

                               GetLineStart( current ),
                               GetLineStart( current ),

-                              col->GetWidth() - expanderOffset,
+                              col->GetWidth() - itemOffset,

                               GetLineHeight( current ) );
 
             // Report position relative to the cell's custom area, i.e.
                               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
+            // not the entire space as given by the control but the one

             // used by the renderer after calculation of alignment etc.
             // used by the renderer after calculation of alignment etc.

+            //
+            // Notice that this results in negative coordinates when clicking
+            // in the upper left corner of a centre-aligned cell which doesn't
+            // fill its column entirely so this is somewhat surprising, but we
+            // do it like this for compatibility with the native GTK+ version,
+            // see #12270.

 
             // adjust the rectangle ourselves to account for the alignment
 
             // adjust the rectangle ourselves to account for the alignment

+            int align = cell->GetAlignment();
+            if ( align == wxDVR_DEFAULT_ALIGNMENT )
+                align = wxALIGN_CENTRE;
+

             wxRect rectItem = cell_rect;
             wxRect rectItem = cell_rect;

-            const int align = cell->GetAlignment();
-            if ( align != wxDVR_DEFAULT_ALIGNMENT )
+            const wxSize size = cell->GetSize();
+            if ( size.x >= 0 && size.x < cell_rect.width )

             {
             {

-                const wxSize size = cell->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
-                }
+                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

             }
 
             }
 

-            wxPoint pos( event.GetPosition() );
-            pos.x -= rectItem.x;
-            pos.y -= rectItem.y;
-
-            m_owner->CalcUnscrolledPosition( pos.x, pos.y, &pos.x, &pos.y );
+            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
+            }

 
 

-             /* ignore ret */ cell->WXOnLeftClick( pos, cell_rect,
-                              model, item, col->GetModelColumn());
+            wxMouseEvent event2(event);
+            event2.m_x -= rectItem.x;
+            event2.m_y -= rectItem.y;
+            m_owner->CalcUnscrolledPosition(event2.m_x, event2.m_y, &event2.m_x, &event2.m_y);
+
+             /* ignore ret */ cell->WXActivateCell
+                                    (
+                                        cell_rect,
+                                        model,
+                                        item,
+                                        col->GetModelColumn(),
+                                        &event2
+                                    );

         }
     }
 }
         }
     }
 }


@@ -3844,6 +4440,25 @@ void wxDataViewMainWindow::OnKillFocus( wxFocusEvent &event )
     event.Skip();
 }
 
     event.Skip();
 }
 

+void wxDataViewMainWindow::OnColumnsCountChanged()
+{
+    int editableCount = 0;
+
+    const unsigned cols = GetOwner()->GetColumnCount();
+    for ( unsigned i = 0; i < cols; i++ )
+    {
+        wxDataViewColumn *c = GetOwner()->GetColumnAt(i);
+        if ( c->IsHidden() )
+            continue;
+        if ( c->GetRenderer()->GetMode() != wxDATAVIEW_CELL_INERT )
+            editableCount++;
+    }
+
+    m_useCellFocus = (editableCount > 1);
+
+    UpdateDisplay();
+}
+

 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------


@@ -3873,6 +4488,9 @@ void wxDataViewCtrl::Init()
     m_sortingColumnIdx = wxNOT_FOUND;
 
     m_headerArea = NULL;
     m_sortingColumnIdx = wxNOT_FOUND;
 
     m_headerArea = NULL;

+    m_clientArea = NULL;
+
+    m_colsDirty = false;

 }
 
 bool wxDataViewCtrl::Create(wxWindow *parent,
 }
 
 bool wxDataViewCtrl::Create(wxWindow *parent,


@@ -3984,18 +4602,53 @@ void wxDataViewCtrl::SetFocus()
         m_clientArea->SetFocus();
 }
 
         m_clientArea->SetFocus();
 }
 

+bool wxDataViewCtrl::SetFont(const wxFont & font)
+{
+    if (!wxControl::SetFont(font))
+        return false;
+
+    if (m_headerArea)
+        m_headerArea->SetFont(font);
+
+    if (m_clientArea)
+    {
+        m_clientArea->SetFont(font);
+        m_clientArea->SetRowHeight(m_clientArea->GetDefaultRowHeight());
+    }
+
+    if (m_headerArea || m_clientArea)
+    {
+        InvalidateColBestWidths();
+        Layout();
+    }
+
+    return true;
+}
+
+
+

 bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
 {
     if (!wxDataViewCtrlBase::AssociateModel( model ))
         return false;
 
 bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
 {
     if (!wxDataViewCtrlBase::AssociateModel( model ))
         return false;
 

-    m_notifier = new wxGenericDataViewModelNotifier( m_clientArea );
-
-    model->AddNotifier( m_notifier );
+    if (model)
+    {
+        m_notifier = new wxGenericDataViewModelNotifier( m_clientArea );
+        model->AddNotifier( m_notifier );
+    }
+    else if (m_notifier)
+    {
+        m_notifier->Cleared();
+        m_notifier = NULL;
+    }

 
     m_clientArea->DestroyTree();
 
 
     m_clientArea->DestroyTree();
 

-    m_clientArea->BuildTree(model);
+    if (model)
+    {
+        m_clientArea->BuildTree(model);
+    }

 
     m_clientArea->UpdateDisplay();
 
 
     m_clientArea->UpdateDisplay();
 


@@ -4022,7 +4675,7 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
         return false;
 
     m_cols.Append( col );
         return false;
 
     m_cols.Append( col );

-    m_colsBestWidths.push_back(0);
+    m_colsBestWidths.push_back(CachedColWidthInfo());

     OnColumnsCountChanged();
     return true;
 }
     OnColumnsCountChanged();
     return true;
 }


@@ -4033,7 +4686,7 @@ bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
         return false;
 
     m_cols.Insert( col );
         return false;
 
     m_cols.Insert( col );

-    m_colsBestWidths.insert(m_colsBestWidths.begin(), 0);
+    m_colsBestWidths.insert(m_colsBestWidths.begin(), CachedColWidthInfo());

     OnColumnsCountChanged();
     return true;
 }
     OnColumnsCountChanged();
     return true;
 }


@@ -4044,7 +4697,7 @@ bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col )
         return false;
 
     m_cols.Insert( pos, col );
         return false;
 
     m_cols.Insert( pos, col );

-    m_colsBestWidths.insert(m_colsBestWidths.begin() + pos, 0);
+    m_colsBestWidths.insert(m_colsBestWidths.begin() + pos, CachedColWidthInfo());

     OnColumnsCountChanged();
     return true;
 }
     OnColumnsCountChanged();
     return true;
 }


@@ -4062,11 +4715,19 @@ void wxDataViewCtrl::OnColumnsCountChanged()
     if (m_headerArea)
         m_headerArea->SetColumnCount(GetColumnCount());
 
     if (m_headerArea)
         m_headerArea->SetColumnCount(GetColumnCount());
 

-    m_clientArea->UpdateDisplay();
+    m_clientArea->OnColumnsCountChanged();

 }
 
 void wxDataViewCtrl::DoSetExpanderColumn()
 {
 }
 
 void wxDataViewCtrl::DoSetExpanderColumn()
 {

+    wxDataViewColumn* column = GetExpanderColumn();
+    if ( column )
+    {
+        int index = GetColumnIndex(column);
+        if ( index != wxNOT_FOUND )
+            InvalidateColBestWidth(index);
+    }
+

     m_clientArea->UpdateDisplay();
 }
 
     m_clientArea->UpdateDisplay();
 }
 


@@ -4117,10 +4778,22 @@ int wxDataViewCtrl::GetColumnIndex(const wxDataViewColumn *column) const
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

+int wxDataViewCtrl::GetModelColumnIndex( unsigned int model_column ) const
+{
+    const int count = GetColumnCount();
+    for ( int index = 0; index < count; index++ )
+    {
+        wxDataViewColumn* column = GetColumn(index);
+        if ( column->GetModelColumn() == model_column )
+            return index;
+    }
+    return wxNOT_FOUND;
+}
+

 unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
 {
 unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
 {

-    if ( m_colsBestWidths[idx] != 0 )
-        return m_colsBestWidths[idx];
+    if ( m_colsBestWidths[idx].width != 0 )
+        return m_colsBestWidths[idx].width;

 
     const int count = m_clientArea->GetRowCount();
     wxDataViewColumn *column = GetColumn(idx);
 
     const int count = m_clientArea->GetRowCount();
     wxDataViewColumn *column = GetColumn(idx);


@@ -4130,16 +4803,27 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
     class MaxWidthCalculator
     {
     public:
     class MaxWidthCalculator
     {
     public:

-        MaxWidthCalculator(wxDataViewMainWindow *clientArea,
+        MaxWidthCalculator(const wxDataViewCtrl *dvc,
+                           wxDataViewMainWindow *clientArea,

                            wxDataViewRenderer *renderer,
                            const wxDataViewModel *model,
                            wxDataViewRenderer *renderer,
                            const wxDataViewModel *model,

-                           unsigned column)
+                           unsigned int model_column,
+                           int expanderSize)

             : m_width(0),
             : m_width(0),

+              m_dvc(dvc),

               m_clientArea(clientArea),
               m_renderer(renderer),
               m_model(model),
               m_clientArea(clientArea),
               m_renderer(renderer),
               m_model(model),

-              m_column(column)
+              m_model_column(model_column),
+              m_expanderSize(expanderSize)
+

         {
         {

+            int index = dvc->GetModelColumnIndex( model_column );
+            wxDataViewColumn* column = index == wxNOT_FOUND ? NULL : dvc->GetColumn(index);
+            m_isExpanderCol =
+                !clientArea->IsList() &&
+                (column == 0 ||
+                 GetExpanderColumnOrFirstOne(const_cast<wxDataViewCtrl*>(dvc)) == column );

         }
 
         void UpdateWithWidth(int width)
         }
 
         void UpdateWithWidth(int width)


@@ -4149,32 +4833,45 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
 
         void UpdateWithRow(int row)
         {
 
         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 indent = 0;
+            wxDataViewItem item;
+
+            if ( m_isExpanderCol )
+            {
+                wxDataViewTreeNode *node = m_clientArea->GetTreeNodeByRow(row);
+                item = node->GetItem();
+                indent = m_dvc->GetIndent() * node->GetIndentLevel() + m_expanderSize;
+            }
+            else
+            {
+                item = m_clientArea->GetItemByRow(row);
+            }
+
+            m_renderer->PrepareForItem(m_model, item, m_model_column);
+            m_width = wxMax(m_width, m_renderer->GetSize().x + indent);

         }
 
         int GetMaxWidth() const { return m_width; }
 
     private:
         int m_width;
         }
 
         int GetMaxWidth() const { return m_width; }
 
     private:
         int m_width;

+        const wxDataViewCtrl *m_dvc;

         wxDataViewMainWindow *m_clientArea;
         wxDataViewRenderer *m_renderer;
         const wxDataViewModel *m_model;
         wxDataViewMainWindow *m_clientArea;
         wxDataViewRenderer *m_renderer;
         const wxDataViewModel *m_model;

-        unsigned m_column;
+        unsigned m_model_column;
+        bool m_isExpanderCol;
+        int m_expanderSize;

     };
 
     };
 

-    MaxWidthCalculator calculator(m_clientArea, renderer,
-                                  GetModel(), column->GetModelColumn());
+    MaxWidthCalculator calculator(this, m_clientArea, renderer,
+                                  GetModel(), column->GetModelColumn(),
+                                  m_clientArea->GetRowHeight());
+
+    calculator.UpdateWithWidth(column->GetMinWidth());

 
     if ( m_headerArea )
 
     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);
-    }
+        calculator.UpdateWithWidth(m_headerArea->GetColumnTitleWidth(*column));

 
     // The code below deserves some explanation. For very large controls, we
     // simply can't afford to calculate sizes for all items, it takes too
 
     // The code below deserves some explanation. For very large controls, we
     // simply can't afford to calculate sizes for all items, it takes too


@@ -4248,7 +4945,7 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
     if ( max_width > 0 )
         max_width += 2 * PADDING_RIGHTLEFT;
 
     if ( max_width > 0 )
         max_width += 2 * PADDING_RIGHTLEFT;
 

-    const_cast<wxDataViewCtrl*>(this)->m_colsBestWidths[idx] = max_width;
+    const_cast<wxDataViewCtrl*>(this)->m_colsBestWidths[idx].width = max_width;

     return max_width;
 }
 
     return max_width;
 }
 


@@ -4269,6 +4966,10 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
 
     m_colsBestWidths.erase(m_colsBestWidths.begin() + GetColumnIndex(column));
     m_cols.Erase(ret);
 
     m_colsBestWidths.erase(m_colsBestWidths.begin() + GetColumnIndex(column));
     m_cols.Erase(ret);

+
+    if ( m_clientArea->GetCurrentColumn() == column )
+        m_clientArea->ClearCurrentColumn();
+

     OnColumnsCountChanged();
 
     return true;
     OnColumnsCountChanged();
 
     return true;


@@ -4276,36 +4977,68 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
 
 bool wxDataViewCtrl::ClearColumns()
 {
 
 bool wxDataViewCtrl::ClearColumns()
 {

+    SetExpanderColumn(NULL);

     m_cols.Clear();
     m_colsBestWidths.clear();
     m_cols.Clear();
     m_colsBestWidths.clear();

+
+    m_clientArea->ClearCurrentColumn();
+

     OnColumnsCountChanged();
     OnColumnsCountChanged();

+

     return true;
 }
 
     return true;
 }
 

-void wxDataViewCtrl::UpdateColBestWidth(int idx)
+void wxDataViewCtrl::InvalidateColBestWidth(int idx)

 {
 {

-    m_colsBestWidths[idx] = 0;
-
-    if ( m_headerArea )
-        m_headerArea->UpdateColumn(idx);
+    m_colsBestWidths[idx].width = 0;
+    m_colsBestWidths[idx].dirty = true;
+    m_colsDirty = true;

 }
 
 }
 

-void wxDataViewCtrl::UpdateColBestWidths()
+void wxDataViewCtrl::InvalidateColBestWidths()

 {
 {

+    // mark all columns as dirty:

     m_colsBestWidths.clear();
     m_colsBestWidths.resize(m_cols.size());
     m_colsBestWidths.clear();
     m_colsBestWidths.resize(m_cols.size());

+    m_colsDirty = true;
+}

 
 

-    if ( m_headerArea )
-    {
-        const unsigned cols = m_headerArea->GetColumnCount();
-        for ( unsigned i = 0; i < cols; i++ )
+void wxDataViewCtrl::UpdateColWidths()
+{
+    m_colsDirty = false;
+
+    if ( !m_headerArea )
+        return;
+
+    const unsigned len = m_colsBestWidths.size();
+    for ( unsigned i = 0; i < len; i++ )
+    {
+        // Note that we have to have an explicit 'dirty' flag here instead of
+        // checking if the width==0, as is done in GetBestColumnWidth().
+        //
+        // Testing width==0 wouldn't work correctly if some code called
+        // GetWidth() after col. width invalidation but before
+        // wxDataViewCtrl::UpdateColWidths() was called at idle time. This
+        // would result in the header's column width getting out of sync with
+        // the control itself.
+        if ( m_colsBestWidths[i].dirty )
+        {

             m_headerArea->UpdateColumn(i);
             m_headerArea->UpdateColumn(i);

+            m_colsBestWidths[i].dirty = false;
+        }

     }
 }
 
     }
 }
 

+void wxDataViewCtrl::OnInternalIdle()
+{
+    wxDataViewCtrlBase::OnInternalIdle();
+
+    if ( m_colsDirty )
+        UpdateColWidths();
+}
+

 int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
 {
 int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
 {

-#if 1

     unsigned int len = GetColumnCount();
     for ( unsigned int i = 0; i < len; i++ )
     {
     unsigned int len = GetColumnCount();
     for ( unsigned int i = 0; i < len; i++ )
     {


@@ -4315,25 +5048,6 @@ int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
     }
 
     return wxNOT_FOUND;
     }
 
     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();
-    for ( unsigned int i = 0; i < len; i++ )
-    {
-        wxDataViewColumn * col = GetColumnAt(i);
-        if (col->IsHidden())
-            continue;
-        ret += col->GetWidth();
-        if (column==col)
-        {
-            CalcScrolledPosition( ret, dummy, &ret, &dummy );
-            break;
-        }
-    }
-    return ret;
-#endif

 }
 
 wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
 }
 
 wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const


@@ -4360,6 +5074,11 @@ void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item)
     }
 }
 
     }
 }
 

+wxDataViewColumn *wxDataViewCtrl::GetCurrentColumn() const
+{
+    return m_clientArea->GetCurrentColumn();
+}
+

 int wxDataViewCtrl::GetSelectedItemsCount() const
 {
     return m_clientArea->GetSelections().size();
 int wxDataViewCtrl::GetSelectedItemsCount() const
 {
     return m_clientArea->GetSelections().size();


@@ -4448,6 +5167,11 @@ bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const
     return false;
 }
 
     return false;
 }
 

+void wxDataViewCtrl::SetAlternateRowColour(const wxColour& colour)
+{
+    m_alternateRowColour = colour;
+}
+

 void wxDataViewCtrl::SelectAll()
 {
     m_clientArea->SelectAllRows(true);
 void wxDataViewCtrl::SelectAll()
 {
     m_clientArea->SelectAllRows(true);


@@ -4520,14 +5244,20 @@ void wxDataViewCtrl::Expand( const wxDataViewItem & item )
 
     int row = m_clientArea->GetRowByItem( item );
     if (row != -1)
 
     int row = m_clientArea->GetRowByItem( item );
     if (row != -1)

+    {

         m_clientArea->Expand(row);
         m_clientArea->Expand(row);

+        InvalidateColBestWidths();
+    }

 }
 
 void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
 {
     int row = m_clientArea->GetRowByItem( item );
     if (row != -1)
 }
 
 void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
 {
     int row = m_clientArea->GetRowByItem( item );
     if (row != -1)

+    {

         m_clientArea->Collapse(row);
         m_clientArea->Collapse(row);

+        InvalidateColBestWidths();
+    }

 }
 
 bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
 }
 
 bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const


@@ -4538,16 +5268,12 @@ bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
     return false;
 }
 
     return false;
 }
 

-void wxDataViewCtrl::StartEditor( const wxDataViewItem & item, unsigned int column )
+void wxDataViewCtrl::EditItem(const wxDataViewItem& item, const wxDataViewColumn *column)

 {
 {

-    wxDataViewColumn* col = GetColumn( column );
-    if (!col)
-        return;
+    wxCHECK_RET( item.IsOk(), "invalid item" );
+    wxCHECK_RET( column, "no column provided" );

 
 

-    wxRect itemRect = GetItemRect(item, col);
-    wxDataViewRenderer* renderer = col->GetRenderer();
-    if (renderer->GetMode() == wxDATAVIEW_CELL_EDITABLE)
-        renderer->StartEditing(item, itemRect);
+    m_clientArea->StartEditing(item, column);

 }
 
 #endif // !wxUSE_GENERICDATAVIEWCTRL
 }
 
 #endif // !wxUSE_GENERICDATAVIEWCTRL