X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7e9f8b136c02826c7e5b3bf9b339d2013ac05f6..883ea3bf80503de1f2aa797ce91acda654d88d74:/src/generic/datavgen.cpp

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 2fb1c5b35a..0f5094e310 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -2,7 +2,7 @@
 // Name:        src/generic/datavgen.cpp
 // Purpose:     wxDataViewCtrl generic implementation
 // Author:      Robert Roebling
-// Modified by: Francesco Montorsi, Guru Kathiresan, Otto Wyss
+// Modified by: Francesco Montorsi, Guru Kathiresan, Bo Yang
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
@@ -68,6 +68,12 @@ static const int EXPANDER_MARGIN = 4;
 
 #define USE_NATIVE_HEADER_WINDOW    0
 
+//Below is the compare stuff
+//For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed
+static wxDataViewModel * g_model;
+static int g_column = -2;
+static bool g_asending = true;
+
 // NB: for some reason, this class must be dllexport'ed or we get warnings from
 //     MSVC in DLL build
 class WXDLLIMPEXP_ADV wxDataViewHeaderWindowBase : public wxControl
@@ -254,26 +260,24 @@ public:
 // wxDataViewTreeNode
 //-----------------------------------------------------------------------------
 class wxDataViewTreeNode;
-WX_DEFINE_SORTED_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes );
-WX_DEFINE_SORTED_ARRAY( void* , wxDataViewTreeLeaves);
+WX_DEFINE_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes );
+WX_DEFINE_ARRAY( void* , wxDataViewTreeLeaves);
 
-int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode * node1, wxDataViewTreeNode * node2);
-int LINKAGEMODE wxGenericTreeModelItemCmp( void * id1, void * id2);
+int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2);
+int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2);
 
 class wxDataViewTreeNode
 {
 public:
     wxDataViewTreeNode( wxDataViewTreeNode * parent = NULL )
-        :leaves( wxGenericTreeModelItemCmp ),
-         nodes(wxGenericTreeModelNodeCmp)
-    	{ this->parent = parent;
+        { this->parent = parent;
           if( parent == NULL )
               open = true;
-	   else
-	   	open = false;
+       else
+        open = false;
           hasChildren = false;
           subTreeCount  = 0;
-	}
+    }
     //I don't know what I need to do in the destructure
     ~wxDataViewTreeNode()
     {
@@ -287,10 +291,19 @@ public:
 
     void AddNode( wxDataViewTreeNode * node )
     {
-        nodes.Add( node );
         leaves.Add( node->GetItem().GetID() );
+        if (g_column >= -1)
+            leaves.Sort( &wxGenericTreeModelItemCmp );
+        nodes.Add( node );
+        if (g_column >= -1)
+            nodes.Sort( &wxGenericTreeModelNodeCmp );
+    }
+    void AddLeaf( void * leaf )
+    {
+        leaves.Add( leaf );
+        if (g_column >= -1)
+            leaves.Sort( &wxGenericTreeModelItemCmp );
     }
-    void AddLeaf( void * leaf ) { leaves.Add( leaf ); }
 
     wxDataViewItem & GetItem() { return item; }
     void SetItem( const wxDataViewItem & item ) { this->item = item; }
@@ -300,13 +313,13 @@ public:
     int GetIndentLevel()
     {
         int ret = 0 ;
-	 wxDataViewTreeNode * node = this;
-	 while( node->GetParent()->GetParent() != NULL )
-	 {
-	     node = node->GetParent();
-	     ret ++;
-	 }
-	 return ret;
+     wxDataViewTreeNode * node = this;
+     while( node->GetParent()->GetParent() != NULL )
+     {
+         node = node->GetParent();
+         ret ++;
+     }
+     return ret;
     }
 
     bool IsOpen()
@@ -349,26 +362,15 @@ public:
 
     void Resort()
     {
-        wxDataViewTreeNodes nds = nodes;
-        wxDataViewTreeLeaves lvs = leaves;
-        nodes.Empty();
-        leaves.Empty();
-
-        int len = nds.GetCount();
-        if(len > 0)
+        if (g_column >= -1)
         {
-			int i;
-            for(i = 0; i < len; i ++)
-                nodes.Add(nds[i]);
-            for(i = 0; i < len; i ++)
+            nodes.Sort( &wxGenericTreeModelNodeCmp );
+            int len = nodes.GetCount();
+            for (int i = 0; i < len; i ++)
+            {
                 nodes[i]->Resort();
-        }
-
-        len = lvs.GetCount();
-        if(len > 0)
-        {
-            for(int i = 0; i < len; i++)
-                leaves.Add(lvs[i]);
+            }
+            leaves.Sort( &wxGenericTreeModelItemCmp );
         }
     }
 
@@ -382,18 +384,14 @@ private:
     int subTreeCount;
 };
 
-//Below is the compare stuff
-//For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed
-static wxDataViewModel * g_model;
-
-int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode * node1, wxDataViewTreeNode * node2)
+int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2)
 {
-    return g_model->Compare( node1->GetItem(), node2->GetItem() );
+    return g_model->Compare( (*node1)->GetItem(), (*node2)->GetItem(), g_column, g_asending );
 }
 
-int LINKAGEMODE wxGenericTreeModelItemCmp( void * id1, void * id2)
+int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2)
 {
-    return g_model->Compare( id1, id2 );
+    return g_model->Compare( *id1, *id2, g_column, g_asending );
 }
 
 
@@ -418,14 +416,35 @@ public:
     virtual ~wxDataViewMainWindow();
 
     // notifications from wxDataViewModel
-    void SendModelEvent( wxEventType type, const wxDataViewItem & item);
     bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
     bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
     bool ItemChanged( const wxDataViewItem &item );
     bool ValueChanged( const wxDataViewItem &item, unsigned int col );
     bool Cleared();
     void Resort()
-        { g_model = GetOwner()->GetModel(); m_root->Resort(); UpdateDisplay(); }
+    {
+        SortPrepare();
+        m_root->Resort();
+        UpdateDisplay();
+    }
+
+    void SortPrepare()
+    {
+        g_model = GetOwner()->GetModel();
+        wxDataViewColumn* col = GetOwner()->GetSortingColumn();
+        if( !col )
+        {
+            if (g_model->HasDefaultCompare())
+                g_column = -1;
+            else
+                g_column = -2;
+
+            g_asending = true;
+            return;
+        }
+        g_column = col->GetModelColumn();
+        g_asending = col->IsSortOrderAscending();
+    }
 
     void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; }
     wxDataViewCtrl *GetOwner() { return m_owner; }
@@ -445,7 +464,7 @@ public:
     void OnRenameTimer();
 
     void ScrollWindow( int dx, int dy, const wxRect *rect = NULL );
-    void ScrollTo( int rows );
+    void ScrollTo( int rows, int column );
 
     bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; }
     void ChangeCurrentRow( unsigned int row );
@@ -460,7 +479,7 @@ public:
     unsigned int GetLastVisibleRow();
     unsigned int GetRowCount() ;
 
-    wxDataViewItem GetSelection();
+    wxDataViewItem GetSelection() const;
     wxDataViewSelection GetSelections(){ return m_selection; }
     void SetSelections( const wxDataViewSelection & sel ) { m_selection = sel; UpdateDisplay(); }
     void Select( const wxArrayInt& aSelections );
@@ -469,6 +488,7 @@ public:
     void SelectRows( unsigned int from, unsigned int to, bool on );
     void ReverseRowSelection( unsigned int row );
     bool IsRowSelected( unsigned int row );
+    void SendSelectionChangedEvent( const wxDataViewItem& item);
 
     void RefreshRow( unsigned int row );
     void RefreshRows( unsigned int from, unsigned int to );
@@ -484,12 +504,17 @@ public:
     wxRect GetLineRect( unsigned int row ) const;
 
     //Some useful functions for row and item mapping
-    wxDataViewItem GetItemByRow( unsigned int row );
+    wxDataViewItem GetItemByRow( unsigned int row ) const;
     int GetRowByItem( const wxDataViewItem & item );
 
     //Methods for building the mapping tree
     void BuildTree( wxDataViewModel  * model );
     void DestroyTree();
+    void HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column );
+    wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column );
+
+    void Expand( unsigned int row ) { OnExpanding( row ); }
+    void Collapse( unsigned int row ) { OnCollapsing( row ); }
 private:
     wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row );
     //We did not need this temporarily
@@ -497,6 +522,7 @@ private:
 
     int RecalculateCount() ;
 
+    wxDataViewEvent SendExpanderEvent( wxEventType type, const wxDataViewItem & item );
     void OnExpanding( unsigned int row );
     void OnCollapsing( unsigned int row );
 
@@ -533,6 +559,8 @@ private:
     //This is the tree structure of the model
     wxDataViewTreeNode * m_root;
     int m_count;
+    //This is the tree node under the cursor
+    wxDataViewTreeNode * m_underMouse;
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow)
     DECLARE_EVENT_TABLE()
@@ -559,7 +587,7 @@ public:
     virtual bool Cleared()
         { return m_mainWindow->Cleared(); }
     virtual void Resort()
-    	 { m_mainWindow->Resort(); }
+         { m_mainWindow->Resort(); }
 
     wxDataViewMainWindow    *m_mainWindow;
 };
@@ -964,6 +992,66 @@ bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *m
     return true;
 }
 
+// ---------------------------------------------------------
+// wxDataViewIconTextRenderer
+// ---------------------------------------------------------
+
+IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer)
+
+wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(
+  const wxString &varianttype, wxDataViewCellMode mode, int align ) :
+    wxDataViewCustomRenderer( varianttype, mode, align )
+{
+    SetMode(mode);
+    SetAlignment(align);
+}
+
+wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer()
+{
+}
+
+bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )
+{
+    m_value << value;
+    return true;
+}
+
+bool wxDataViewIconTextRenderer::GetValue( wxVariant &value ) const
+{
+    return false;
+}
+
+bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state )
+{
+    dc->SetFont( GetOwner()->GetOwner()->GetFont() );
+
+    const wxIcon &icon = m_value.GetIcon();
+    if (icon.IsOk())
+    {
+        dc->DrawIcon( icon, cell.x, cell.y ); // TODO centre
+        cell.x += icon.GetWidth()+4;
+    }
+
+    dc->DrawText( m_value.GetText(), cell.x, cell.y );
+
+    return true;
+}
+
+wxSize wxDataViewIconTextRenderer::GetSize() const
+{
+    return wxSize(80,16);  // TODO
+}
+
+wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
+{
+    return NULL;
+}
+
+bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
+{
+    return false;
+}
+
 // ---------------------------------------------------------
 // wxDataViewColumn
 // ---------------------------------------------------------
@@ -1197,7 +1285,7 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay()
         //hdi.fmt &= ~(HDF_SORTDOWN|HDF_SORTUP);
 
         //sorting support
-        if(model && model->GetSortingColumn() == i)
+        if(model && m_owner->GetSortingColumn() == col)
         {
             //The Microsoft Comctrl32.dll 6.0 support SORTUP/SORTDOWN, but they are not default
             //see http://msdn2.microsoft.com/en-us/library/ms649534.aspx for more detail
@@ -1332,16 +1420,14 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA
                     wxDataViewColumn *col = GetColumn(idx);
                     if(col->IsSortable())
                     {
-                        if(model && model->GetSortingColumn() == idx)
+                        if(model && m_owner->GetSortingColumn() == col)
                         {
                             bool order = col->IsSortOrderAscending();
                             col->SetSortOrder(!order);
-                            model->SetSortOrderAscending(!order);
                         }
                         else if(model)
                         {
-                            model->SetSortingColumn(idx);
-                            model->SetSortOrderAscending(col->IsSortOrderAscending());
+                            m_owner->SetSortingColumn(col);
                         }
                     }
                     UpdateDisplay();
@@ -1505,7 +1591,7 @@ void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         int ch = h;
 
         wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE;
-        if (col->IsSortable() && GetOwner()->GetModel()->GetSortingColumn() == i)
+        if (col->IsSortable() && GetOwner()->GetSortingColumn() == col)
         {
             if (col->IsSortOrderAscending())
                 sortArrow = wxHDR_SORT_ICON_UP;
@@ -1576,10 +1662,6 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event )
         m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
         w -= 6;
 
-        // erase the line if it was drawn
-        if (m_currentX < w)
-            DrawCurrent();
-
         if (event.ButtonUp())
         {
             m_isDragging = false;
@@ -1587,19 +1669,15 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event )
                 ReleaseMouse();
 
             m_dirty = true;
+        }
+        m_currentX = wxMax(m_minX + 7, x);
 
+        if (m_currentX < w)
+        {
             GetColumn(m_column)->SetWidth(m_currentX - m_minX);
-
             Refresh();
             GetOwner()->Refresh();
         }
-        else
-        {
-            m_currentX = wxMax(m_minX + 7, x);
-
-            // draw in the new location
-            if (m_currentX < w) DrawCurrent();
-        }
 
     }
     else     // not dragging
@@ -1654,7 +1732,6 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event )
                 m_isDragging = true;
                 CaptureMouse();
                 m_currentX = x;
-                DrawCurrent();
             }
             else    // click on a column
             {
@@ -1670,17 +1747,15 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event )
                     wxDataViewColumn *col = GetColumn(m_column);
                     if(col->IsSortable())
                     {
-                        unsigned int colnum = model->GetSortingColumn();
-                        if(model && static_cast<int>(colnum) == m_column)
+                        wxDataViewColumn* sortCol = m_owner->GetSortingColumn();
+                        if(model && sortCol == col)
                         {
                             bool order = col->IsSortOrderAscending();
                             col->SetSortOrder(!order);
-                            model->SetSortOrderAscending(!order);
                         }
                         else if(model)
                         {
-                            model->SetSortingColumn(m_column);
-                            model->SetSortOrderAscending(col->IsSortOrderAscending());
+                            m_owner->SetSortingColumn(col);
                         }
                     }
                     UpdateDisplay();
@@ -1703,8 +1778,12 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event )
     }
 }
 
+//I must say that this function is deprecated, but I think it is useful to keep it for a time
 void wxGenericDataViewHeaderWindow::DrawCurrent()
 {
+#if 1
+    GetColumn(m_column)->SetWidth(m_currentX - m_minX);
+#else
     int x1 = m_currentX;
     int y1 = 0;
     ClientToScreen (&x1, &y1);
@@ -1722,7 +1801,8 @@ void wxGenericDataViewHeaderWindow::DrawCurrent()
     dc.SetPen(m_penCurrent);
     dc.SetBrush(*wxTRANSPARENT_BRUSH);
     AdjustDC(dc);
-    dc.DrawLine(x1, y1, x2, y2);
+    dc.DrawLine(x1, y1, x2, y2 );
+#endif
 }
 
 void wxGenericDataViewHeaderWindow::AdjustDC(wxDC& dc)
@@ -1823,6 +1903,7 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
 
     //Make m_count = -1 will cause the class recaculate the real displaying number of rows.
     m_count = -1 ;
+    m_underMouse = NULL;
     UpdateDisplay();
 }
 
@@ -1860,6 +1941,7 @@ void wxDataViewMainWindow::OnRenameTimer()
 
     wxDataViewItem item = GetItemByRow( m_currentRow );
     m_currentCol->GetRenderer()->StartEditing( item, labelRect );
+
 }
 
 //------------------------------------------------------------------
@@ -1882,7 +1964,7 @@ public:
 
 bool Walker( wxDataViewTreeNode * node, DoJob & func )
 {
-    if( node==NULL ||  !node->HasChildren())
+    if( node==NULL )
         return false;
 
     switch( func( node ) )
@@ -1930,25 +2012,12 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func )
     return false;
 }
 
-void wxDataViewMainWindow::SendModelEvent( wxEventType type, const wxDataViewItem & item )
-{
-    wxWindow *parent = GetParent();
-    wxDataViewEvent le(type, parent->GetId());
-
-    le.SetEventObject(parent);
-    le.SetModel(GetOwner()->GetModel());
-    le.SetItem( item );
-
-    parent->GetEventHandler()->ProcessEvent(le);
-}
-
 bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item)
 {
-    g_model = GetOwner()->GetModel();
+    SortPrepare();
 
     wxDataViewTreeNode * node;
     node = FindNode(parent);
-    SendModelEvent(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_ADDED, item );
 
     if( node == NULL )
         return false;
@@ -1969,7 +2038,7 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
 
     m_count = -1;
     UpdateDisplay();
-	
+
     return true;
 }
 
@@ -1978,20 +2047,29 @@ void DestroyTreeHelper( wxDataViewTreeNode * node);
 bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
                                        const wxDataViewItem& item)
 {
-    g_model = GetOwner()->GetModel();
-
-    wxDataViewTreeNode * node;
-    node = FindNode(parent);
-    SendModelEvent(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_DELETED, item);
+    wxDataViewTreeNode * node = FindNode(parent);
 
-    if( node == NULL || node->GetChildren().Index( item.GetID() ) == wxNOT_FOUND )
-    {
-        return false;
-    }
+    wxCHECK_MSG( node != NULL, false, "item not found" );
+    wxCHECK_MSG( node->GetChildren().Index( item.GetID() ) != wxNOT_FOUND, false, "item not found" );
 
     int sub = -1;
     node->GetChildren().Remove( item.GetID() );
-    if( GetOwner()->GetModel()->IsContainer( item ) )
+    //Manuplate selection
+    if( m_selection.GetCount() > 1 )
+    {
+        m_selection.Empty();
+    }
+    bool isContainer = false;
+    wxDataViewTreeNodes nds = node->GetNodes();
+    for (size_t i = 0; i < nds.GetCount(); i ++)
+    {
+        if (nds[i]->GetItem() == item)
+        {
+            isContainer = true;
+            break;
+        }
+    }
+    if( isContainer )
     {
         wxDataViewTreeNode * n = NULL;
         wxDataViewTreeNodes nodes = node->GetNodes();
@@ -2005,35 +2083,43 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
             }
         }
 
-        if (!n)
-            return false;
+        wxCHECK_MSG( n != NULL, false, "item not found" );
 
         node->GetNodes().Remove( n );
         sub -= n->GetSubTreeCount();
         DestroyTreeHelper(n);
     }
-
-    if( node->GetChildrenNumber() == 0)
-        node->SetHasChildren( false );
-
     //Make the row number invalid and get a new valid one when user call GetRowCount
     m_count = -1;
     node->ChangeSubTreeCount(sub);
+    if( node->GetChildrenNumber() == 0)
+    {
+        node->GetParent()->GetNodes().Remove( node );
+        delete node;
+    }
+
     //Change the current row to the last row if the current exceed the max row number
     if( m_currentRow > GetRowCount() )
         m_currentRow = m_count - 1;
 
     UpdateDisplay();
+
     return true;
 }
 
 bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
 {
-    g_model = GetOwner()->GetModel();
+    SortPrepare();
     g_model->Resort();
 
-    SendModelEvent(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_CHANGED,item);
-
+    //Send event
+    wxWindow *parent = GetParent();
+    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
+    le.SetEventObject(parent);
+    le.SetModel(GetOwner()->GetModel());
+    le.SetItem(item);
+    parent->GetEventHandler()->ProcessEvent(le);
+    
     return true;
 }
 
@@ -2048,12 +2134,12 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
 
     return true;
 */
-    g_model = GetOwner()->GetModel();
+    SortPrepare();
     g_model->Resort();
 
     //Send event
     wxWindow *parent = GetParent();
-    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED, parent->GetId());
+    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
     le.SetEventObject(parent);
     le.SetModel(GetOwner()->GetModel());
     le.SetItem(item);
@@ -2066,17 +2152,11 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
 
 bool wxDataViewMainWindow::Cleared()
 {
-    g_model = GetOwner()->GetModel();
+    SortPrepare();
 
     DestroyTree();
     UpdateDisplay();
 
-    wxWindow *parent = GetParent();
-    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED, parent->GetId());
-    le.SetEventObject(parent);
-    le.SetModel(GetOwner()->GetModel());
-    parent->GetEventHandler()->ProcessEvent(le);
-
     return true;
 }
 
@@ -2122,12 +2202,41 @@ void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
         GetOwner()->m_headerArea->ScrollWindow( dx, 0 );
 }
 
-void wxDataViewMainWindow::ScrollTo( int rows )
+void wxDataViewMainWindow::ScrollTo( int rows, int column )
 {
     int x, y;
     m_owner->GetScrollPixelsPerUnit( &x, &y );
-    int sc = rows*m_lineHeight/y;
-    m_owner->Scroll(0, sc );
+    int sy = rows*m_lineHeight/y;
+    int sx = 0;
+    if( column != -1 )
+    {
+        wxRect rect = GetClientRect();
+        unsigned int colnum = 0;
+        unsigned int x_start = 0, x_end = 0, w = 0;
+        int xx, yy, xe;
+        m_owner->CalcUnscrolledPosition( rect.x, rect.y, &xx, &yy );
+        for (x_start = 0; colnum < column; colnum++)
+        {
+            wxDataViewColumn *col = GetOwner()->GetColumn(colnum);
+            if (col->IsHidden())
+                continue;      // skip it!
+
+            w = col->GetWidth();
+            x_start += w;
+        }
+
+        x_end = x_start + w;
+        xe = xx + rect.width;
+        if( x_end > xe )
+        {
+            sx = ( xx + x_end - xe )/x;
+        }
+        if( x_start < xx )
+        {
+            sx = x_start/x;
+        }
+    }
+    m_owner->Scroll( sx, sy );
 }
 
 void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
@@ -2242,6 +2351,14 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         }
     }
 
+    wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
+    if (!expander)
+    {
+        // TODO: last column for RTL support
+        expander = GetOwner()->GetColumn( 0 );
+        GetOwner()->SetExpanderColumn(expander);
+    }
+
     // redraw all cells for all rows which must be repainted and for all columns
     wxRect cell_rect;
     cell_rect.x = x_start;
@@ -2255,18 +2372,19 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         if (col->IsHidden())
             continue;       // skipt it!
 
+
         for (unsigned int item = item_start; item < item_last; item++)
         {
             // get the cell value and set it into the renderer
             wxVariant value;
-	     wxDataViewTreeNode * node = GetTreeNodeByRow(item);
-	     if( node == NULL )
-	     {
-	         continue;
-	     }
+         wxDataViewTreeNode * node = GetTreeNodeByRow(item);
+         if( node == NULL )
+         {
+             continue;
+         }
 
             wxDataViewItem dataitem = node->GetItem();
-	     model->GetValue( value, dataitem, col->GetModelColumn());
+             model->GetValue( value, dataitem, col->GetModelColumn());
             cell->SetValue( value );
 
             // update the y offset
@@ -2274,7 +2392,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
             //Draw the expander here.
             int indent = node->GetIndentLevel();
-            if( col->GetModelColumn() == GetOwner()->GetExpanderColumn() )
+            if( col == expander )
             {
                 //Calculate the indent first
                 indent = cell_rect.x + GetOwner()->GetIndent() * indent;
@@ -2287,13 +2405,16 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                 dc.SetBrush( wxNullBrush );
                 if( node->HasChildren() )
                 {
-                    //dc.DrawRoundedRectangle( expander_x,expander_y,expander_width,expander_width, 1.0);
-                    //dc.DrawLine( expander_x + 2 , expander_y + expander_width/2, expander_x + expander_width - 2, expander_y + expander_width/2 );
                     wxRect rect( expander_x , expander_y, expander_width, expander_width);
+                    int flag = 0;
+                    if (m_underMouse == node)
+                    {
+                        flag |= wxCONTROL_CURRENT;
+                    }
                     if( node->IsOpen() )
-                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, wxCONTROL_EXPANDED );
+                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag|wxCONTROL_EXPANDED );
                     else
-                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect );
+                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
                 }
                 else
                 {
@@ -2397,7 +2518,12 @@ unsigned int wxDataViewMainWindow::GetLastVisibleRow()
     m_owner->CalcUnscrolledPosition( client_size.x, client_size.y,
                                      &client_size.x, &client_size.y );
 
-    return wxMin( GetRowCount()-1, ((unsigned)client_size.y/m_lineHeight)+1 );
+    //we should deal with the pixel here
+    unsigned int row = (client_size.y)/m_lineHeight;
+    if( client_size.y % m_lineHeight < m_lineHeight/2 )
+        row -= 1;
+
+    return wxMin( GetRowCount()-1, row );
 }
 
 unsigned int wxDataViewMainWindow::GetRowCount()
@@ -2519,6 +2645,18 @@ bool wxDataViewMainWindow::IsRowSelected( unsigned int row )
     return (m_selection.Index( row ) != wxNOT_FOUND);
 }
 
+void wxDataViewMainWindow::SendSelectionChangedEvent( const wxDataViewItem& item)
+{
+    wxWindow *parent = GetParent();
+    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, parent->GetId());
+
+    le.SetEventObject(parent);
+    le.SetModel(GetOwner()->GetModel());
+    le.SetItem( item );
+
+    parent->GetEventHandler()->ProcessEvent(le);
+}
+
 void wxDataViewMainWindow::RefreshRow( unsigned int row )
 {
     wxRect rect( 0, row*m_lineHeight, GetEndOfLastCol(), m_lineHeight );
@@ -2593,6 +2731,8 @@ void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent
         }
 
         SelectRows( oldCurrent, newCurrent, true );
+        if (oldCurrent!=newCurrent)
+            SendSelectionChangedEvent(GetItemByRow(m_selection[0]));
     }
     else // !shift
     {
@@ -2605,7 +2745,10 @@ void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent
         ChangeCurrentRow( newCurrent );
 
         if ( !event.ControlDown() )
+        {
             SelectRow( m_currentRow, true );
+            SendSelectionChangedEvent(GetItemByRow(m_currentRow));
+        }
         else
             RefreshRow( m_currentRow );
     }
@@ -2634,7 +2777,7 @@ public:
     {
         current ++;
         if( current == static_cast<int>(row))
-    	 {
+         {
             ret = node->GetItem() ;
             return DoJob::OK;
         }
@@ -2662,7 +2805,7 @@ public:
     {
         current ++;
         if( current == static_cast<int>(row))
-    	 {
+         {
             ret = wxDataViewItem( n ) ;
             return DoJob::OK;
         }
@@ -2675,7 +2818,7 @@ private:
     wxDataViewItem ret;
 };
 
-wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row)
+wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const
 {
     RowToItemJob job( row, -2 );
     Walker( m_root , job );
@@ -2698,7 +2841,7 @@ public:
     {
         current ++;
         if( current == static_cast<int>(row))
-    	 {
+         {
             ret = node ;
             return DoJob::OK;
         }
@@ -2732,7 +2875,7 @@ public:
     {
         current ++;
         if( current == static_cast<int>(row))
-    	 {
+         {
             ret = new wxDataViewTreeNode( parent ) ;
             ret->SetItem( wxDataViewItem( n ));
             ret->SetHasChildren(false);
@@ -2757,27 +2900,53 @@ wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row)
     return job.GetResult();
 }
 
+wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const wxDataViewItem & item )
+{
+    wxWindow *parent = GetParent();
+    wxDataViewEvent le(type, parent->GetId());
+
+    le.SetEventObject(parent);
+    le.SetModel(GetOwner()->GetModel());
+    le.SetItem( item );
+
+    parent->GetEventHandler()->ProcessEvent(le);
+    return le;
+}
+
 void wxDataViewMainWindow::OnExpanding( unsigned int row )
 {
     wxDataViewTreeNode * node = GetTreeNodeByRow(row);
     if( node != NULL )
     {
         if( node->HasChildren())
+        {
             if( !node->IsOpen())
             {
+               wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,node->GetItem());
+               //Check if the user prevent expanding
+               if( e.GetSkipped() )
+                    return;
+
                node->ToggleOpen();
                //Here I build the children of current node
                if( node->GetChildrenNumber() == 0 )
+               {
+                   SortPrepare();
                    BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);
+               }
                m_count = -1;
                UpdateDisplay();
+               //Send the expanded event
+               SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem());
             }
             else
             {
                 SelectRow( row, false );
                 SelectRow( row + 1, true );
                 ChangeCurrentRow( row + 1 );
+                SendSelectionChangedEvent( GetItemByRow(row+1));
             }
+        }
         else
             delete node;
     }
@@ -2792,27 +2961,31 @@ void wxDataViewMainWindow::OnCollapsing(unsigned int row)
 
         if( node->HasChildren() && node->IsOpen() )
         {
+            wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem());
+            if( e.GetSkipped() )
+                return;
             node->ToggleOpen();
             m_count = -1;
             UpdateDisplay();
-            //RefreshRows(row,GetLastVisibleRow());
-         }
-         else
-         {
-             node = node->GetParent();
-             if( node != NULL )
-             {
-                 int  parent = GetRowByItem( node->GetItem() ) ;
-                 if( parent >= 0 )
-                 {
-                     SelectRow( row, false);
-                     SelectRow(parent , true );
-                     ChangeCurrentRow( parent );
-                 }
-             }
-         }
-         if( !nd->HasChildren())
-             delete nd;
+            SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,nd->GetItem());
+        }
+        else
+        {
+            node = node->GetParent();
+            if( node != NULL )
+            {
+                int  parent = GetRowByItem( node->GetItem() ) ;
+                if( parent >= 0 )
+                {
+                    SelectRow( row, false);
+                    SelectRow(parent , true );
+                    ChangeCurrentRow( parent );
+                    SendSelectionChangedEvent( node->GetItem() );
+                }
+            }
+        }
+        if( !nd->HasChildren())
+            delete nd;
     }
 }
 
@@ -2836,21 +3009,28 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
     //Find the item along the parent-chain.
     //This algorithm is designed to speed up the node-finding method
     wxDataViewTreeNode * node = m_root;
-    for( ItemList::Node * n = list.GetFirst(); n; n = n->GetNext() )
+    for( ItemList::const_iterator iter = list.begin(); iter !=list.end() ; iter++ )
     {
         if( node->HasChildren() )
         {
             if( node->GetChildrenNumber() == 0 )
+            {
+                SortPrepare();
                 BuildTreeHelper(model, node->GetItem(), node);
+            }
 
             wxDataViewTreeNodes nodes = node->GetNodes();
-            //The wxSortedArray search a node in binary search, so using Item() is more efficient
-            wxDataViewTreeNode temp;
-            temp.SetItem(*(n->GetData()));
-            int index = nodes.Index( &temp );
-            if( index == wxNOT_FOUND )
+            int i = 0;
+            for (; i < nodes.GetCount(); i ++)
+            {
+                if (nodes[i]->GetItem() == (**iter))
+                {
+                    node = nodes[i];
+                    break;
+                }
+            }
+            if (i == nodes.GetCount())
                 return NULL;
-            node = nodes[index];
         }
         else
             return NULL;
@@ -2858,6 +3038,50 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
     return node;
 }
 
+void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column )
+{
+    wxDataViewColumn *col = NULL;
+    unsigned int cols = GetOwner()->GetColumnCount();
+    unsigned int colnum = 0;
+    unsigned int x_start = 0;
+    int x, y;
+    m_owner->CalcUnscrolledPosition( point.x, point.y, &x, &y );
+    for (x_start = 0; colnum < cols; colnum++)
+    {
+        col = GetOwner()->GetColumn(colnum);
+        if (col->IsHidden())
+            continue;      // skip it!
+
+        unsigned int w = col->GetWidth();
+        if (x_start+w >= (unsigned int)x)
+            break;
+
+        x_start += w;
+    }
+
+    column = col;
+    item = GetItemByRow( y/m_lineHeight );
+}
+
+wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column )
+{
+    int row = GetRowByItem(item);
+    int y = row*m_lineHeight;
+    int h = m_lineHeight;
+    int x = 0;
+    wxDataViewColumn *col = NULL;
+    for( int i = 0, cols = GetOwner()->GetColumnCount(); i < cols; i ++ )
+    {
+       col = GetOwner()->GetColumn( i );
+       x += col->GetWidth();
+       if( GetOwner()->GetColumn(i+1) == column )
+           break;
+    }
+    int w = col->GetWidth();
+    m_owner->CalcScrolledPosition( x, y, &x, &y );
+    return wxRect(x, y, w, h);
+}
+
 int wxDataViewMainWindow::RecalculateCount()
 {
     return m_root->GetSubTreeCount();
@@ -2866,8 +3090,8 @@ int wxDataViewMainWindow::RecalculateCount()
 class ItemToRowJob : public DoJob
 {
 public:
-    ItemToRowJob(const wxDataViewItem & item, ItemList::Node * node )
-    { this->item = item ; ret = -1 ; nd = node ; }
+    ItemToRowJob(const wxDataViewItem & item, ItemList::const_iterator iter )
+    { this->item = item ; ret = -1 ; m_iter = iter ; }
     virtual ~ItemToRowJob(){};
 
     //Maybe binary search will help to speed up this process
@@ -2879,9 +3103,9 @@ public:
              return DoJob::OK;
          }
 
-         if( nd && node->GetItem() == *(nd->GetData()))
+         if( node->GetItem() == **m_iter )
          {
-             nd = nd->GetNext();
+             m_iter++ ;
              return DoJob::CONT;
          }
          else
@@ -2902,7 +3126,7 @@ public:
     //the row number is begin from zero
     int GetResult(){ return ret -1 ; }
 private:
-    ItemList::Node * nd;
+    ItemList::const_iterator  m_iter;
     wxDataViewItem item;
     int ret;
 
@@ -2912,7 +3136,7 @@ int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item)
 {
     wxDataViewModel * model = GetOwner()->GetModel();
     if( model == NULL )
-        return 0;
+        return -1;
 
     if( !item.IsOk() )
         return -1;
@@ -2931,7 +3155,7 @@ int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item)
     pItem = new wxDataViewItem( );
     list.Insert( pItem );
 
-    ItemToRowJob job( item, list.GetFirst() );
+    ItemToRowJob job( item, list.begin() );
     Walker(m_root , job );
     return job.GetResult();
 }
@@ -2941,23 +3165,23 @@ void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataVie
     if( !model->IsContainer( item ) )
         return ;
 
-    wxDataViewItem i = model->GetFirstChild( item );
-    int num = 0;
-    while( i.IsOk() )
+    wxDataViewItemArray children;
+    unsigned int num = model->GetChildren( item, children);
+    int index = 0;
+    while( index < num )
     {
-        num ++;
-        if( model->IsContainer( i ) )
+        if( model->IsContainer( children[index] ) )
         {
             wxDataViewTreeNode * n = new wxDataViewTreeNode( node );
-            n->SetItem(i);
+            n->SetItem(children[index]);
             n->SetHasChildren( true ) ;
             node->AddNode( n );
         }
         else
         {
-            node->AddLeaf( i.GetID() );
+            node->AddLeaf( children[index].GetID() );
         }
-        i = model->GetNextSibling( i );
+        index ++;
     }
     node->SetSubTreeCount( num );
     wxDataViewTreeNode * n = node->GetParent();
@@ -2970,7 +3194,7 @@ void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
 {
     //First we define a invalid item to fetch the top-level elements
     wxDataViewItem item;
-    g_model = GetOwner()->GetModel();
+    SortPrepare();
     BuildTreeHelper( model, item, m_root);
     m_count = -1 ;
 }
@@ -3034,11 +3258,11 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
             break;
         //Add the process for tree expanding/collapsing
         case WXK_LEFT:
-	     OnCollapsing(m_currentRow);
-	     break;
-	 case WXK_RIGHT:
-	     OnExpanding( m_currentRow);
-	     break;
+         OnCollapsing(m_currentRow);
+         break;
+     case WXK_RIGHT:
+         OnExpanding( m_currentRow);
+         break;
         case WXK_END:
             if (!IsEmpty())
                 OnArrowChar( GetRowCount() - 1, event );
@@ -3089,7 +3313,6 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     int x = event.GetX();
     int y = event.GetY();
     m_owner->CalcUnscrolledPosition( x, y, &x, &y );
-
     wxDataViewColumn *col = NULL;
 
     int xpos = 0;
@@ -3110,16 +3333,55 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     }
     if (!col)
         return;
-    wxDataViewRenderer *cell = col->GetRenderer();
 
+    wxDataViewRenderer *cell = col->GetRenderer();
     unsigned int current = y / m_lineHeight;
-
     if ((current > GetRowCount()) || (x > GetEndOfLastCol()))
     {
         // Unselect all if below the last row ?
         return;
     }
 
+    //Test whether the mouse is hovered on the tree item button
+    bool hover = false;
+    if (GetOwner()->GetExpanderColumn() == col)
+    {
+        wxDataViewTreeNode * node = GetTreeNodeByRow(current);
+        if( node!=NULL && node->HasChildren() )
+        {
+            int indent = node->GetIndentLevel();
+            indent = GetOwner()->GetIndent()*indent;
+            wxRect rect( xpos + indent + EXPANDER_MARGIN, current * m_lineHeight + EXPANDER_MARGIN, m_lineHeight-2*EXPANDER_MARGIN,m_lineHeight-2*EXPANDER_MARGIN);
+            if( rect.Contains( x, y) )
+            {
+                //So the mouse is over the expander
+                hover = true;
+                if (m_underMouse && m_underMouse != node)
+                {
+                    //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
+                    Refresh(GetRowByItem(m_underMouse->GetItem()));
+                }
+                if (m_underMouse != node)
+                {
+                    //wxLogMessage("Do the row: %d", current);
+                    Refresh(current);
+                }
+                m_underMouse = node;
+            }
+        }
+     if (node!=NULL && !node->HasChildren())
+            delete node;
+    }
+    if (!hover)
+    {
+        if (m_underMouse != NULL)
+        {
+            //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
+            Refresh(GetRowByItem(m_underMouse->GetItem()));
+            m_underMouse = NULL;
+        }
+    }
+
     wxDataViewModel *model = GetOwner()->GetModel();
 
     if (event.Dragging())
@@ -3201,22 +3463,24 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
         //Process the event of user clicking the expander
         bool expander = false;
-        wxDataViewTreeNode * node = GetTreeNodeByRow(current);
-        if( node!=NULL && node->HasChildren() )
+        if (GetOwner()->GetExpanderColumn() == col)
         {
-            int indent = node->GetIndentLevel();
-            indent = GetOwner()->GetIndent()*indent;
-            wxRect rect( xpos + indent + EXPANDER_MARGIN, current * m_lineHeight + EXPANDER_MARGIN, m_lineHeight-2*EXPANDER_MARGIN,m_lineHeight-2*EXPANDER_MARGIN);
-            if( rect.Contains( x, y) )
+            wxDataViewTreeNode * node = GetTreeNodeByRow(current);
+            if( node!=NULL && node->HasChildren() )
             {
-                expander = true;
-                if( node->IsOpen() )
-                    OnCollapsing(current);
-                else
-                    OnExpanding( current );
+                int indent = node->GetIndentLevel();
+                indent = GetOwner()->GetIndent()*indent;
+                wxRect rect( xpos + indent + EXPANDER_MARGIN, current * m_lineHeight + EXPANDER_MARGIN, m_lineHeight-2*EXPANDER_MARGIN,m_lineHeight-2*EXPANDER_MARGIN);
+                if( rect.Contains( x, y) )
+                {
+                    expander = true;
+                    if( node->IsOpen() )
+                        OnCollapsing(current);
+                    else
+                        OnExpanding( current );
+                }
             }
         }
-
         //If the user click the expander, we do not do editing even if the column with expander are editable
         if (m_lastOnSame && !expander )
         {
@@ -3251,6 +3515,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             SelectAllRows(false);
             ChangeCurrentRow(current);
             SelectRow(m_currentRow,true);
+            SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );
         }
 
         // notify cell about right click
@@ -3266,9 +3531,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     }
     if (event.LeftDown() || forceClick)
     {
-#ifdef __WXMSW__
         SetFocus();
-#endif
 
         m_lineBeforeLastClicked = m_lineLastClicked;
         m_lineLastClicked = current;
@@ -3282,10 +3545,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             if ( IsSingleSel() || !IsRowSelected(current) )
             {
                 SelectAllRows( false );
-
                 ChangeCurrentRow(current);
-
                 SelectRow(m_currentRow,true);
+                SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );
             }
             else // multi sel & current is highlighted & no mod keys
             {
@@ -3298,8 +3560,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             if (cmdModifierDown)
             {
                 ChangeCurrentRow(current);
-
                 ReverseRowSelection(m_currentRow);
+                SendSelectionChangedEvent(GetItemByRow(m_selection[0]) );
             }
             else if (event.ShiftDown())
             {
@@ -3315,6 +3577,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
                 }
 
                 SelectRows(lineFrom, lineTo, true);
+                SendSelectionChangedEvent(GetItemByRow(m_selection[0]) );
             }
             else // !ctrl, !shift
             {
@@ -3356,7 +3619,7 @@ void wxDataViewMainWindow::OnKillFocus( wxFocusEvent &event )
     event.Skip();
 }
 
-wxDataViewItem wxDataViewMainWindow::GetSelection()
+wxDataViewItem wxDataViewMainWindow::GetSelection() const
 {
     if( m_selection.GetCount() != 1 )
         return wxDataViewItem();
@@ -3367,6 +3630,7 @@ wxDataViewItem wxDataViewMainWindow::GetSelection()
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------
+WX_DEFINE_LIST(wxDataViewColumnList);
 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
 
@@ -3471,6 +3735,7 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
     if (!wxDataViewCtrlBase::AppendColumn(col))
         return false;
 
+    m_cols.Append( col );
     OnColumnChange();
     return true;
 }
@@ -3493,7 +3758,77 @@ void wxDataViewCtrl::DoSetIndent()
     m_clientArea->UpdateDisplay();
 }
 
+unsigned int wxDataViewCtrl::GetColumnCount() const
+{
+    return m_cols.GetCount();
+}
+
+wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
+{
+    wxDataViewColumnList::const_iterator iter;
+    int i = 0;
+    for (iter = m_cols.begin(); iter!=m_cols.end(); iter++)
+    {
+        if (i == pos)
+            return *iter;
+
+        if ((*iter)->IsHidden())
+            continue;
+        i ++;
+    }
+    return NULL;
+}
+
+bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
+{
+    wxDataViewColumnList::compatibility_iterator  ret = m_cols.Find( column );
+    if (ret == NULL)
+        return false;
+
+    m_cols.Erase(ret);
+    delete column;
+    OnColumnChange();
+
+    return true;
+}
+
+bool wxDataViewCtrl::ClearColumns()
+{
+    m_cols.clear();
+    OnColumnChange();
+    return true;
+}
+
+int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
+{
+    int ret = 0, dead = 0;
+    int len = GetColumnCount();
+    for (int i=0; i<len; i++)
+    {
+        wxDataViewColumn * col = GetColumn(i);
+        if (col->IsHidden())
+            continue;
+        ret += col->GetWidth();
+        if (column==col)
+        {
+            CalcScrolledPosition( ret, dead, &ret, &dead );
+            break;
+        }
+    }
+    return ret;
+}
+
+wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
+{
+    return NULL;
+}
+
 //Selection code with wxDataViewItem as parameters
+wxDataViewItem wxDataViewCtrl::GetSelection() const
+{
+    return m_clientArea->GetSelection();
+}
+
 int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const
 {
     sel.Empty();
@@ -3524,7 +3859,12 @@ void wxDataViewCtrl::Select( const wxDataViewItem & item )
 {
     int row = m_clientArea->GetRowByItem( item );
     if( row >= 0 )
+    {
+        //Unselect all rows before select another in the single select mode
+        if (m_clientArea->IsSingleSel())
+            m_clientArea->SelectAllRows(false);
         m_clientArea->SelectRow(row, true);
+    }
 }
 
 void wxDataViewCtrl::Unselect( const wxDataViewItem & item )
@@ -3574,7 +3914,11 @@ void wxDataViewCtrl::SetSelections( const wxArrayInt & sel )
 void wxDataViewCtrl::Select( int row )
 {
     if( row >= 0 )
+    {
+        if (m_clientArea->IsSingleSel())
+            m_clientArea->SelectAllRows(false);
         m_clientArea->SelectRow( row, true );
+    }
 }
 
 void wxDataViewCtrl::Unselect( int row )
@@ -3592,7 +3936,7 @@ bool wxDataViewCtrl::IsSelected( int row ) const
 
 void wxDataViewCtrl::SelectRange( int from, int to )
 {
-    wxArrayInt sel; 
+    wxArrayInt sel;
     for( int i = from; i < to; i ++ )
         sel.Add( i );
     m_clientArea->Select(sel);
@@ -3617,16 +3961,54 @@ void wxDataViewCtrl::UnselectAll()
     m_clientArea->SelectAllRows(false);
 }
 
-void wxDataViewCtrl::EnsureVisible( int row )
+void wxDataViewCtrl::EnsureVisible( int row, int column )
 {
-    m_clientArea->ScrollTo( row );
+    if( row < 0 )
+        row = 0;
+    if( row > m_clientArea->GetRowCount() )
+        row = m_clientArea->GetRowCount();
+
+    int first = m_clientArea->GetFirstVisibleRow();
+    int last = m_clientArea->GetLastVisibleRow();
+    if( row < first )
+        m_clientArea->ScrollTo( row, column );
+    else if( row > last )
+        m_clientArea->ScrollTo( row - last + first, column );
+    else
+        m_clientArea->ScrollTo( first, column );
 }
 
-void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item )
+void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn * column )
 {
     int row = m_clientArea->GetRowByItem(item);
     if( row >= 0 )
-        EnsureVisible(row);
+    {
+        if( column == NULL )
+            EnsureVisible(row, -1);
+        else
+        {
+            int col = 0;
+            int len = GetColumnCount();
+            for( int i = 0; i < len; i ++ )
+                if( GetColumn(i) == column )
+                {
+                    col = i;
+                    break;
+                }
+            EnsureVisible( row, col );
+        }
+    }
+
+}
+
+void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ) const
+{
+    m_clientArea->HitTest(point, item, column);
+}
+
+wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column ) const
+{
+    return m_clientArea->GetItemRect(item, column);
 }
 
 wxDataViewItem wxDataViewCtrl::GetItemByRow( unsigned int row ) const
@@ -3639,6 +4021,20 @@ int wxDataViewCtrl::GetRowByItem( const wxDataViewItem & item ) const
     return m_clientArea->GetRowByItem( item );
 }
 
+void wxDataViewCtrl::Expand( const wxDataViewItem & item )
+{
+    int row = m_clientArea->GetRowByItem( item );
+    if (row != -1)
+        m_clientArea->Expand(row);
+}
+
+void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
+{
+    int row = m_clientArea->GetRowByItem( item );
+    if (row != -1)
+        m_clientArea->Collapse(row);
+}
+
  #endif
     // !wxUSE_GENERICDATAVIEWCTRL