many compilation fixes for WinCE using VC8 (it now build, although still doesn't...

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 92414ec47d2282e3443c2d265acc7ca5d8e299bf..40d763b1fd802e4b26e8849c32d6f71cdfdae19b 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -42,6 +42,8 @@
 #include "wx/renderer.h"
 #include "wx/dcbuffer.h"
 #include "wx/icon.h"
 #include "wx/renderer.h"
 #include "wx/dcbuffer.h"
 #include "wx/icon.h"

+#include "wx/list.h"
+#include "wx/listimpl.cpp"

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


@@ -179,7 +181,7 @@ public:
     }
 
     virtual void UpdateDisplay() { Refresh(); }
     }
 
     virtual void UpdateDisplay() { Refresh(); }

-    
+

     // event handlers:
 
     void OnPaint( wxPaintEvent &event );
     // event handlers:
 
     void OnPaint( wxPaintEvent &event );


@@ -251,36 +253,50 @@ public:
 //-----------------------------------------------------------------------------
 // wxDataViewTreeNode
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDataViewTreeNode
 //-----------------------------------------------------------------------------

-class wxDataViewTreeNode; 
-WX_DEFINE_ARRAY_PTR( wxDataViewTreeNode *, wxDataViewTreeNodes );
+class wxDataViewTreeNode;
+WX_DEFINE_SORTED_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes );
+WX_DEFINE_SORTED_ARRAY( void* , wxDataViewTreeLeaves);
+
+int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode * node1, wxDataViewTreeNode * node2);
+int LINKAGEMODE wxGenericTreeModelItemCmp( void * id1, void * id2);

 
 class wxDataViewTreeNode
 {
 public:
     wxDataViewTreeNode( wxDataViewTreeNode * parent )
 
 class wxDataViewTreeNode
 {
 public:
     wxDataViewTreeNode( wxDataViewTreeNode * parent )

-       { this->parent = parent; 
+        :leaves( wxGenericTreeModelItemCmp ),
+         nodes(wxGenericTreeModelNodeCmp)
+       { this->parent = parent;

           if( parent == NULL )
               open = true;
           else
                open = false;
           if( parent == NULL )
               open = true;
           else
                open = false;

+          hasChildren = false;
+          subTreeCount  = 0;

        }
     //I don't know what I need to do in the destructure
     ~wxDataViewTreeNode()
        }
     //I don't know what I need to do in the destructure
     ~wxDataViewTreeNode()

-       { }
+    {
+
+    }

 
     wxDataViewTreeNode * GetParent() { return parent; }
     void SetParent( wxDataViewTreeNode * parent ) { this->parent = parent; }
 
     wxDataViewTreeNode * GetParent() { return parent; }
     void SetParent( wxDataViewTreeNode * parent ) { this->parent = parent; }

-    wxDataViewTreeNodes  GetChildren() { return children; }
-    void SetChildren( wxDataViewTreeNodes  children ) { this->children = children; }
+    wxDataViewTreeNodes &  GetNodes() { return nodes; }
+    wxDataViewTreeLeaves & GetChildren() { return leaves; }

 
 

-    wxDataViewTreeNode * GetChild( unsigned int n ) { return children.Item( n ); }
-    void InsertChild( wxDataViewTreeNode * child, unsigned int n) { children.Insert( child, n); }
-    void AppendChild( wxDataViewTreeNode * child ) { children.Add( child ); }
+    void AddNode( wxDataViewTreeNode * node )
+    {
+        nodes.Add( node );
+        leaves.Add( node->GetItem().GetID() );
+    }
+    void AddLeaf( void * leaf ) { leaves.Add( leaf ); }

 
     wxDataViewItem & GetItem() { return item; }
 
     wxDataViewItem & GetItem() { return item; }

-    void SetItem( wxDataViewItem & item ) { this->item = item; }
+    void SetItem( const wxDataViewItem & item ) { this->item = item; }

 
 

-    unsigned int GetChildrenNumber() { return children.GetCount(); }
+    unsigned int GetChildrenNumber() { return leaves.GetCount(); }
+    unsigned int GetNodeNumber() { return nodes.GetCount(); }

     int GetIndentLevel()
     {
         int ret = 0 ;
     int GetIndentLevel()
     {
         int ret = 0 ;


@@ -293,22 +309,78 @@ public:
         return ret;
     }
 
         return ret;
     }
 

-    bool IsOpen() { return open; } 
-    void ToggleOpen(){ open = !open; }
-    bool HasChildren() { return children.GetCount() != 0; }
+    bool IsOpen()
+    {
+        return open ;
+    }
+
+    void ToggleOpen()
+    {
+        int len = nodes.GetCount();
+        int sum = 0;
+        for ( int i = 0 ;i < len ; i ++)
+            sum += nodes[i]->GetSubTreeCount();
+
+        sum += leaves.GetCount();
+        if( open )
+        {
+            ChangeSubTreeCount(-sum);
+            open = !open;
+        }
+        else
+        {
+            open = !open;
+            ChangeSubTreeCount(sum);
+        }
+    }
+    bool HasChildren() { return hasChildren; }
+    void SetHasChildren( bool has ){ hasChildren = has; }
+
+    void SetSubTreeCount( int num ) { subTreeCount = num; }
+    int GetSubTreeCount() { return subTreeCount; }
+    void ChangeSubTreeCount( int num )
+    {
+        if( !open )
+            return ;
+        subTreeCount += num;
+        if( parent )
+            parent->ChangeSubTreeCount(num);
+    }
+

 private:
     wxDataViewTreeNode * parent;
 private:
     wxDataViewTreeNode * parent;

-    wxDataViewTreeNodes  children; 
-    wxDataViewItem  item; 
+    wxDataViewTreeNodes  nodes;
+    wxDataViewTreeLeaves leaves;
+    wxDataViewItem  item;

     bool open;
     bool open;

+    bool hasChildren;
+    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)
+{
+    return g_model->Compare( node1->GetItem(), node2->GetItem() );
+}
+
+int LINKAGEMODE wxGenericTreeModelItemCmp( void * id1, void * id2)
+{
+    return g_model->Compare( id1, id2 );
+}
+
+
+

 //-----------------------------------------------------------------------------
 // wxDataViewMainWindow
 //-----------------------------------------------------------------------------
 
 WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection,
                                             WXDLLIMPEXP_ADV);
 //-----------------------------------------------------------------------------
 // wxDataViewMainWindow
 //-----------------------------------------------------------------------------
 
 WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection,
                                             WXDLLIMPEXP_ADV);

+WX_DECLARE_LIST(wxDataViewItem, ItemList);
+WX_DEFINE_LIST(ItemList);

 
 class wxDataViewMainWindow: public wxWindow
 {
 
 class wxDataViewMainWindow: public wxWindow
 {


@@ -322,7 +394,7 @@ public:
 
     // notifications from wxDataViewModel
     bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
 
     // notifications from wxDataViewModel
     bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );

-    bool ItemDeleted( 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();
     bool ItemChanged( const wxDataViewItem &item );
     bool ValueChanged( const wxDataViewItem &item, unsigned int col );
     bool Cleared();


@@ -359,6 +431,8 @@ public:
     unsigned int GetLastVisibleRow();
     unsigned int GetRowCount() ;
 
     unsigned int GetLastVisibleRow();
     unsigned int GetRowCount() ;
 

+    wxDataViewItem GetSelection();
+

     void Select( const wxArrayInt& aSelections );
     void SelectAllRows( bool on );
     void SelectRow( unsigned int row, bool on );
     void Select( const wxArrayInt& aSelections );
     void SelectAllRows( bool on );
     void SelectRow( unsigned int row, bool on );


@@ -388,13 +462,16 @@ public:
     void DestroyTree();
 private:
     wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row );
     void DestroyTree();
 private:
     wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row );

-    wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item ){};
+    //We did not need this temporarily
+    //wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item );

 
     int RecalculateCount() ;
 
     void OnExpanding( unsigned int row );
     void OnCollapsing( unsigned int row );
 
 
     int RecalculateCount() ;
 
     void OnExpanding( unsigned int row );
     void OnCollapsing( unsigned int row );
 

+    wxDataViewTreeNode * FindNode( const wxDataViewItem & item );
+

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


@@ -424,7 +501,7 @@ private:
     wxPen m_penExpander;
 
     //This is the tree structure of the model
     wxPen m_penExpander;
 
     //This is the tree structure of the model

-    wxDataViewTreeNode * m_root; 
+    wxDataViewTreeNode * m_root;

     int m_count;
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow)
     int m_count;
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow)


@@ -443,7 +520,7 @@ public:
 
     virtual bool ItemAdded( const wxDataViewItem & parent, const wxDataViewItem & item )
         { return m_mainWindow->ItemAdded( parent , item ); }
 
     virtual bool ItemAdded( const wxDataViewItem & parent, const wxDataViewItem & item )
         { return m_mainWindow->ItemAdded( parent , item ); }

-    virtual bool ItemDeleted( const wxDataViewItem & item )
+    virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )

         { return m_mainWindow->ItemDeleted( item ); }
     virtual bool ItemChanged( const wxDataViewItem & item )
         { return m_mainWindow->ItemChanged(item);  }
         { return m_mainWindow->ItemDeleted( item ); }
     virtual bool ItemChanged( const wxDataViewItem & item )
         { return m_mainWindow->ItemChanged(item);  }


@@ -528,14 +605,14 @@ bool wxDataViewTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const
 }
 
 bool wxDataViewTextRenderer::HasEditorCtrl()
 }
 
 bool wxDataViewTextRenderer::HasEditorCtrl()

-{ 
+{

     return true;
 }
 
 wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,
         wxRect labelRect, const wxVariant &value )
 {
     return true;
 }
 
 wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,
         wxRect labelRect, const wxVariant &value )
 {

-    return new wxTextCtrl( parent, wxID_ANY, value, 
+    return new wxTextCtrl( parent, wxID_ANY, value,

                            wxPoint(labelRect.x,labelRect.y),
                            wxSize(labelRect.width,labelRect.height) );
 }
                            wxPoint(labelRect.x,labelRect.y),
                            wxSize(labelRect.width,labelRect.height) );
 }


@@ -921,7 +998,7 @@ void wxDataViewColumn::SetSortable( bool sortable )
         m_flags |= wxDATAVIEW_COL_SORTABLE;
     else
         m_flags &= ~wxDATAVIEW_COL_SORTABLE;
         m_flags |= wxDATAVIEW_COL_SORTABLE;
     else
         m_flags &= ~wxDATAVIEW_COL_SORTABLE;

-        
+

     // Update header button
     if (GetOwner())
         GetOwner()->OnColumnChange();
     // Update header button
     if (GetOwner())
         GetOwner()->OnColumnChange();


@@ -930,7 +1007,7 @@ void wxDataViewColumn::SetSortable( bool sortable )
 void wxDataViewColumn::SetSortOrder( bool ascending )
 {
     m_ascending = ascending;
 void wxDataViewColumn::SetSortOrder( bool ascending )
 {
     m_ascending = ascending;

-    
+

     // Update header button
     if (GetOwner())
         GetOwner()->OnColumnChange();
     // Update header button
     if (GetOwner())
         GetOwner()->OnColumnChange();


@@ -1586,6 +1663,9 @@ void wxDataViewRenameTimer::Notify()
 // wxDataViewMainWindow
 //-----------------------------------------------------------------------------
 
 // wxDataViewMainWindow
 //-----------------------------------------------------------------------------
 

+//The tree building helper, declared firstly
+void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataViewTreeNode * node);
+

 int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )
 {
     if (row1 > row2) return 1;
 int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )
 {
     if (row1 > row2) return 1;


@@ -1645,6 +1725,8 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
     m_penExpander = wxPen( wxColour(0,0,0), 1, wxSOLID );
     //Some new added code to deal with the tree structure
     m_root = new wxDataViewTreeNode( NULL );
     m_penExpander = wxPen( wxColour(0,0,0), 1, wxSOLID );
     //Some new added code to deal with the tree structure
     m_root = new wxDataViewTreeNode( NULL );

+    m_root->SetHasChildren(true);
+

     //Make m_count = -1 will cause the class recaculate the real displaying number of rows.
     m_count = -1 ;
     UpdateDisplay();
     //Make m_count = -1 will cause the class recaculate the real displaying number of rows.
     m_count = -1 ;
     UpdateDisplay();


@@ -1682,7 +1764,8 @@ void wxDataViewMainWindow::OnRenameTimer()
     GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y,
                                      &labelRect.x, &labelRect.y);
 
     GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y,
                                      &labelRect.x, &labelRect.y);
 

-    m_currentCol->GetRenderer()->StartEditing( m_currentRow, labelRect );
+    wxDataViewItem item = GetItemByRow( m_currentRow );
+    m_currentCol->GetRenderer()->StartEditing( item, labelRect );

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


@@ -1700,77 +1783,194 @@ public:
     // 2: Job not done, continue
     enum  { OK = 0 , IGR = 1, CONT = 2 };
     virtual int operator() ( wxDataViewTreeNode * node ) = 0 ;
     // 2: Job not done, continue
     enum  { OK = 0 , IGR = 1, CONT = 2 };
     virtual int operator() ( wxDataViewTreeNode * node ) = 0 ;

+    virtual int operator() ( void * n ) = 0;

 };
 
 };
 

+#if 0

 class ItemAddJob: public DoJob
 {
 public:
 class ItemAddJob: public DoJob
 {
 public:

-    ItemAddJob( const wxDataViewItem & parent, const wxDataViewItem & item )
-       { this->parent = parent ; this->item = item ; }
+    ItemAddJob( const wxDataViewItem & parent, const wxDataViewItem & item, int * count )
+       { this->parent = parent ; this->item = item ; m_count = count; }

     virtual ~ItemAddJob(){};
 
     virtual int operator() ( wxDataViewTreeNode * node )
     {
         if( node->GetItem() == parent )
         {
     virtual ~ItemAddJob(){};
 
     virtual int operator() ( wxDataViewTreeNode * node )
     {
         if( node->GetItem() == parent )
         {

+            node->SetHasChildren( true );

             wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node );
             newnode->SetItem(item);
             node->AppendChild( newnode);
             wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node );
             newnode->SetItem(item);
             node->AppendChild( newnode);

+            *m_count = -1;

             return OK;
         }
         return CONT;
     }
             return OK;
         }
         return CONT;
     }

+

 private:
 private:

+    int * m_count;

     wxDataViewItem parent, item;
 };
     wxDataViewItem parent, item;
 };

+#endif

 
 bool Walker( wxDataViewTreeNode * node, DoJob & func )
 {
     if( node==NULL ||  !node->HasChildren())
         return false;
 
 
 bool Walker( wxDataViewTreeNode * node, DoJob & func )
 {
     if( node==NULL ||  !node->HasChildren())
         return false;
 

-    wxDataViewTreeNodes nodes = node->GetChildren();
-    int len = node->GetChildrenNumber();
-    int i = 0 ;
+    wxDataViewTreeNodes nodes = node->GetNodes();
+    wxDataViewTreeLeaves leaves = node->GetChildren();
+
+    int len_nodes = nodes.GetCount();
+    int len = leaves.GetCount();
+    int i = 0, nodes_i = 0;

     for( ; i < len ; i ++ )
     {
     for( ; i < len ; i ++ )
     {

-        wxDataViewTreeNode * n = nodes[i];
-        switch( func( n ) )
+        void * n = leaves[i];
+        if( nodes_i < len_nodes && n == nodes[nodes_i]->GetItem().GetID() )

         {
         {

-            case DoJob::OK :
-                return true ;
-            case DoJob::IGR:
-                continue;
-            case DoJob::CONT:
-            default:
-                ;
+            wxDataViewTreeNode * nd = nodes[nodes_i];
+            nodes_i++;
+
+            switch( func( nd ) )
+            {
+                case DoJob::OK :
+                    return true ;
+                case DoJob::IGR:
+                    continue;
+                case DoJob::CONT:
+                default:
+                    ;
+            }
+
+            if( Walker( nd , func ) )
+                return true;
+

         }
         }

-        
-        if( Walker( n , func ) )
-            return true;
+        else
+            switch( func( n ) )
+            {
+                case DoJob::OK :
+                    return true ;
+                case DoJob::IGR:
+                    continue;
+                case DoJob::CONT:
+                default:
+                    ;
+            }

     }
     return false;
 }
 
     }
     return false;
 }
 

-
-

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

-    ItemAddJob job( parent, item); 
-    Walker( m_root , job);
+    g_model = GetOwner()->GetModel();
+
+    wxDataViewTreeNode * node;
+    node = FindNode(parent);
+
+    if( node == NULL )
+        return false;
+
+    node->SetHasChildren( true );
+
+    if( g_model->IsContainer( item ) )
+    {
+        wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node );
+        newnode->SetItem(item);
+        node->AddNode( newnode);
+    }
+    else
+        node->AddLeaf( item.GetID() );
+
+    node->ChangeSubTreeCount(1);
+
+    m_count = -1;

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

-bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem & item)
+#if 0
+class ItemDeleteJob: public DoJob
+{
+public:
+    ItemDeleteJob( const wxDataViewItem & item, int * count ) { m_item = item; m_count = count; }
+    virtual ~ItemDeleteJob(){}
+    virtual int operator() ( wxDataViewTreeNode * node )
+    {
+        if( node->GetItem() == m_item )
+        {
+            node->GetParent()->GetChildren().Remove( node );
+            delete node;
+            *m_count = -1;
+            return DoJob::OK;
+        }
+        return DoJob::CONT;
+    }
+
+private:
+    int * m_count;
+    wxDataViewItem m_item;
+};
+#endif
+
+void DestroyTreeHelper( wxDataViewTreeNode * node);
+
+bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
+                                       const wxDataViewItem& item)

 {
 {

+    g_model = GetOwner()->GetModel();
+
+    wxDataViewTreeNode * node;
+    wxDataViewItem parent_item = g_model->GetParent( item );
+    node = FindNode(parent_item);
+
+    if( node == NULL || node->GetChildren().Index( item.GetID() ) == wxNOT_FOUND )
+    {
+        return false;
+    }
+
+    int sub = -1;
+    node->GetChildren().Remove( item.GetID() );
+    if( GetOwner()->GetModel()->IsContainer( item ) )
+    {
+        wxDataViewTreeNode * n ;
+        wxDataViewTreeNodes nodes = node->GetNodes();
+        int len = nodes.GetCount();
+        for( int i = 0 ; i < len; i ++)
+        {
+            if( nodes[i]->GetItem() == item )
+            {
+                n = nodes[i];
+                break;
+            }
+        }
+        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);
+    //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)
 {
     UpdateDisplay();
     return true;
 }
 
 bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
 {

-    UpdateDisplay();
+    g_model = GetOwner()->GetModel();
+
+    unsigned int row = GetRowByItem(item);
+    RefreshRow( row );

     return true;
 }
 
     return true;
 }
 


@@ -1785,12 +1985,18 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
 
     return true;
 */
 
     return true;
 */

-    UpdateDisplay();
+    g_model = GetOwner()->GetModel();
+
+    unsigned int row = GetRowByItem(item);
+    RefreshRow( row );

     return true;
 }
 
 bool wxDataViewMainWindow::Cleared()
 {
     return true;
 }
 
 bool wxDataViewMainWindow::Cleared()
 {

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

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


@@ -1968,8 +2174,10 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             wxVariant value;
             wxDataViewTreeNode * node = GetTreeNodeByRow(item);
             if( node == NULL )
             wxVariant value;
             wxDataViewTreeNode * node = GetTreeNodeByRow(item);
             if( node == NULL )

+            {

                 continue;
                 continue;

-                
+            }
+

             wxDataViewItem dataitem = node->GetItem();
             model->GetValue( value, dataitem, col->GetModelColumn());
             cell->SetValue( value );
             wxDataViewItem dataitem = node->GetItem();
             model->GetValue( value, dataitem, col->GetModelColumn());
             cell->SetValue( value );


@@ -1977,8 +2185,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             // update the y offset
             cell_rect.y = item * m_lineHeight;
 
             // update the y offset
             cell_rect.y = item * m_lineHeight;
 

-            //Draw the expander here. Please notice that I use const number for all pixel data. When the final API are determined
-            //I will change this to the data member of the class wxDataViewCtrl
+            //Draw the expander here.

             int indent = node->GetIndentLevel();
             if( col->GetModelColumn() == GetOwner()->GetExpanderColumn() )
             {
             int indent = node->GetIndentLevel();
             if( col->GetModelColumn() == GetOwner()->GetExpanderColumn() )
             {


@@ -2003,15 +2210,17 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                 }
                 else
                 {
                 }
                 else
                 {

-                 // I am wandering whether we should draw dot lines between tree nodes
+                     // I am wandering whether we should draw dot lines between tree nodes
+                     delete node;
+                     //Yes, if the node does not have any child, it must be a leaf which mean that it is a temporarily created by GetTreeNodeByRow

                 }
 
                  //force the expander column to left-center align
                  cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
             }
                 }
 
                  //force the expander column to left-center align
                  cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
             }

-            

 
 

-            // cannot be bigger than allocated space 
+
+            // cannot be bigger than allocated space

             wxSize size = cell->GetSize();
             // Because of the tree structure indent, here we should minus the width of the cell for drawing
             size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent );
             wxSize size = cell->GetSize();
             // Because of the tree structure indent, here we should minus the width of the cell for drawing
             size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent );


@@ -2044,7 +2253,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
             //Here we add the tree indent
             item_rect.x += indent;
 
             //Here we add the tree indent
             item_rect.x += indent;

-                  
+

             int state = 0;
             if (m_selection.Index(item) != wxNOT_FOUND)
                 state |= wxDATAVIEW_CELL_SELECTED;
             int state = 0;
             if (m_selection.Index(item) != wxNOT_FOUND)
                 state |= wxDATAVIEW_CELL_SELECTED;


@@ -2095,7 +2304,7 @@ unsigned int wxDataViewMainWindow::GetFirstVisibleRow() const
     return y / m_lineHeight;
 }
 
     return y / m_lineHeight;
 }
 

-unsigned int wxDataViewMainWindow::GetLastVisibleRow() 
+unsigned int wxDataViewMainWindow::GetLastVisibleRow()

 {
     wxSize client_size = GetClientSize();
     m_owner->CalcUnscrolledPosition( client_size.x, client_size.y,
 {
     wxSize client_size = GetClientSize();
     m_owner->CalcUnscrolledPosition( client_size.x, client_size.y,


@@ -2104,7 +2313,7 @@ unsigned int wxDataViewMainWindow::GetLastVisibleRow()
     return wxMin( GetRowCount()-1, ((unsigned)client_size.y/m_lineHeight)+1 );
 }
 
     return wxMin( GetRowCount()-1, ((unsigned)client_size.y/m_lineHeight)+1 );
 }
 

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

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


@@ -2335,19 +2544,33 @@ public:
     virtual ~RowToItemJob(){};
 
     virtual int operator() ( wxDataViewTreeNode * node )
     virtual ~RowToItemJob(){};
 
     virtual int operator() ( wxDataViewTreeNode * node )

-       {
-           if( current == row)
-           {
-               ret = node->GetItem() ;
-               return DoJob::OK;
-           }
-           current ++;
-           if ( node->IsOpen())
-               return DoJob::CONT;
-           else
-               return DoJob::IGR;
-       }
+    {
+        current ++;
+        if( current == static_cast<int>(row))
+        {
+            ret = node->GetItem() ;
+            return DoJob::OK;
+        }

 
 

+        if( node->GetSubTreeCount() + current < static_cast<int>(row) )
+        {
+            current += node->GetSubTreeCount();
+            return  DoJob::IGR;
+        }
+        else
+            return DoJob::CONT;
+    }
+
+    virtual int operator() ( void * n )
+    {
+        current ++;
+        if( current == static_cast<int>(row))
+        {
+            ret = wxDataViewItem( n ) ;
+            return DoJob::OK;
+        }
+        return DoJob::CONT;
+    }

     wxDataViewItem GetResult(){ return ret; }
 private:
     unsigned int row;
     wxDataViewItem GetResult(){ return ret; }
 private:
     unsigned int row;


@@ -2357,7 +2580,7 @@ private:
 
 wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row)
 {
 
 wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row)
 {

-    RowToItemJob job( row, 0 );
+    RowToItemJob job( row, -1 );

     Walker( m_root , job );
     return job.GetResult();
 }
     Walker( m_root , job );
     return job.GetResult();
 }


@@ -2365,44 +2588,73 @@ wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row)
 class RowToTreeNodeJob: public DoJob
 {
 public:
 class RowToTreeNodeJob: public DoJob
 {
 public:

-    RowToTreeNodeJob( unsigned int row , int current ) { this->row = row; this->current = current ; ret = NULL ; }
+    RowToTreeNodeJob( unsigned int row , int current, wxDataViewTreeNode * node )
+    {
+        this->row = row;
+        this->current = current ;
+        ret = NULL ;
+        parent = node;
+    }

     virtual ~RowToTreeNodeJob(){};
 
     virtual int operator() ( wxDataViewTreeNode * node )
     {
     virtual ~RowToTreeNodeJob(){};
 
     virtual int operator() ( wxDataViewTreeNode * node )
     {

-        if( current == row)
+        current ++;
+        if( current == static_cast<int>(row))

         {
             ret = node ;
             return DoJob::OK;
         }
         {
             ret = node ;
             return DoJob::OK;
         }

-        current ++;
-        if ( node->IsOpen())
-            return DoJob::CONT;
+
+        if( node->GetSubTreeCount() + current < static_cast<int>(row) )
+        {
+            current += node->GetSubTreeCount();
+            return  DoJob::IGR;
+        }

         else
         else

-            return DoJob::IGR;
+        {
+            parent = node;
+            return DoJob::CONT;
+        }
+

     }
 
     }
 

+    virtual int operator() ( void * n )
+    {
+        current ++;
+        if( current == static_cast<int>(row))
+        {
+            ret = new wxDataViewTreeNode( parent ) ;
+            ret->SetItem( wxDataViewItem( n ));
+            ret->SetHasChildren(false);
+            return DoJob::OK;
+        }
+
+        return DoJob::CONT;
+    }

     wxDataViewTreeNode * GetResult(){ return ret; }
 private:
     unsigned int row;
     int current ;
     wxDataViewTreeNode * ret;
     wxDataViewTreeNode * GetResult(){ return ret; }
 private:
     unsigned int row;
     int current ;
     wxDataViewTreeNode * ret;

+    wxDataViewTreeNode * parent ;

 };
 
 
 wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row)
 {
 };
 
 
 wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row)
 {

-    RowToTreeNodeJob job( row , 0 );
+    RowToTreeNodeJob job( row , -1, m_root );

     Walker( m_root , job );
     return job.GetResult();
 }
 
     Walker( m_root , job );
     return job.GetResult();
 }
 

+#if 0

 class CountJob : public DoJob
 {
 public:
     CountJob(){ count = 0 ; }
     virtual ~CountJob(){};
 class CountJob : public DoJob
 {
 public:
     CountJob(){ count = 0 ; }
     virtual ~CountJob(){};

-       
+

     virtual int operator () (  wxDataViewTreeNode * node )
     {
          count ++;
     virtual int operator () (  wxDataViewTreeNode * node )
     {
          count ++;


@@ -2419,6 +2671,7 @@ public:
 private:
     unsigned int count;
 };
 private:
     unsigned int count;
 };

+#endif

 
 void wxDataViewMainWindow::OnExpanding( unsigned int row )
 {
 
 void wxDataViewMainWindow::OnExpanding( unsigned int row )
 {


@@ -2429,10 +2682,20 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row )
             if( !node->IsOpen())
             {
                node->ToggleOpen();
             if( !node->IsOpen())
             {
                node->ToggleOpen();

+               //Here I build the children of current node
+               if( node->GetChildrenNumber() == 0 )
+                   BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);

                m_count = -1;
                m_count = -1;

-               Refresh();
-               //RefreshRows(row,GetLastVisibleRow());
+               UpdateDisplay();
+            }
+            else
+            {
+                SelectRow( row, false );
+                SelectRow( row + 1, true );
+                ChangeCurrentRow( row + 1 );

             }
             }

+        else
+            delete node;

     }
 }
 
     }
 }
 


@@ -2441,11 +2704,13 @@ void wxDataViewMainWindow::OnCollapsing(unsigned int row)
     wxDataViewTreeNode * node = GetTreeNodeByRow(row);
     if( node != NULL )
     {
     wxDataViewTreeNode * node = GetTreeNodeByRow(row);
     if( node != NULL )
     {

+        wxDataViewTreeNode * nd = node;
+

         if( node->HasChildren() && node->IsOpen() )
         {
             node->ToggleOpen();
             m_count = -1;
         if( node->HasChildren() && node->IsOpen() )
         {
             node->ToggleOpen();
             m_count = -1;

-            Refresh();
+            UpdateDisplay();

             //RefreshRows(row,GetLastVisibleRow());
          }
          else
             //RefreshRows(row,GetLastVisibleRow());
          }
          else


@@ -2459,82 +2724,180 @@ void wxDataViewMainWindow::OnCollapsing(unsigned int row)
                  ChangeCurrentRow( parent );
              }
          }
                  ChangeCurrentRow( parent );
              }
          }

+         if( !nd->HasChildren())
+             delete nd;

     }
 }
 
     }
 }
 

-int wxDataViewMainWindow::RecalculateCount() 
+wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item )

 {
 {

-    CountJob job;
-    Walker( m_root, job );
-    return job.GetResult();
+    wxDataViewModel * model = GetOwner()->GetModel();
+    if( model == NULL )
+        return NULL;
+
+    //Compose the a parent-chain of the finding item
+    ItemList list;
+    list.DeleteContents( true );
+    wxDataViewItem it( item );
+    while( it.IsOk() )
+    {
+        wxDataViewItem * pItem = new wxDataViewItem( it );
+        list.Insert( pItem );
+        it = model->GetParent( it );
+    }
+
+    //Find the item along the parent-chain.
+    //This algorithm is designed to speed up the node-finding method
+    bool found = true;
+    wxDataViewTreeNode * node = m_root;
+    for( ItemList::Node * n = list.GetFirst(); n; n = n->GetNext() )
+    {
+        if( node->HasChildren() )
+        {
+            if( node->GetChildrenNumber() == 0 )
+                BuildTreeHelper(model, node->GetItem(), node);
+
+            int len = node->GetNodeNumber();
+            wxDataViewTreeNodes nodes = node->GetNodes();
+            int j = 0;
+            for( ; j < len; j ++)
+            {
+                if( nodes[j]->GetItem() == *(n->GetData()))
+                 {
+                    node = nodes[j];
+                    break;
+                }
+            }
+            // Whenever we can't find the node in any level, return NULL to indicate the item can't be found
+            if( j == len )
+            {
+                found = false;
+                return NULL;
+            }
+        }
+        else
+            return NULL;
+    }
+    return node;
+}
+
+int wxDataViewMainWindow::RecalculateCount()
+{
+    return m_root->GetSubTreeCount();

 }
 
 class ItemToRowJob : public DoJob
 {
 public:
 }
 
 class ItemToRowJob : public DoJob
 {
 public:

-    ItemToRowJob(const wxDataViewItem & item){ this->item = item ; ret = 0 ; }
+    ItemToRowJob(const wxDataViewItem & item, ItemList::Node * node )
+    { this->item = item ; ret = 0 ; nd = node ; }

     virtual ~ItemToRowJob(){};
 
     virtual int operator() ( wxDataViewTreeNode * node)
     {
          ret ++;
          if( node->GetItem() == item )
     virtual ~ItemToRowJob(){};
 
     virtual int operator() ( wxDataViewTreeNode * node)
     {
          ret ++;
          if( node->GetItem() == item )

+         {

              return DoJob::OK;
              return DoJob::OK;

+         }

 
 

-         if( node->IsOpen())
+         if( nd && node->GetItem() == *(nd->GetData()))
+         {
+             nd = nd->GetNext();

              return DoJob::CONT;
              return DoJob::CONT;

+         }

          else
          else

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

              return DoJob::IGR;
              return DoJob::IGR;

+         }
+

     }
 
     }
 

+    virtual int operator() ( void * n )
+    {
+        ret ++;
+        if( n == item.GetID() )
+            return DoJob::OK;
+        return DoJob::CONT;
+    }

     //the row number is begin from zero
     int GetResult(){ return ret -1 ; }
 private:
     //the row number is begin from zero
     int GetResult(){ return ret -1 ; }
 private:

+    ItemList::Node * nd;

     wxDataViewItem item;
     int ret;
     wxDataViewItem item;
     int ret;

+

 };
 
 unsigned int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item)
 {
 };
 
 unsigned int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item)
 {

-    ItemToRowJob job( item );
+    wxDataViewModel * model = GetOwner()->GetModel();
+    if( model == NULL )
+        return 0;
+
+    //Compose the a parent-chain of the finding item
+    ItemList list;
+    list.DeleteContents( true );
+    wxDataViewItem it( item );
+    while( it.IsOk() )
+    {
+        wxDataViewItem * pItem = new wxDataViewItem( it );
+        list.Insert( pItem );
+        it = model->GetParent( it );
+    }
+
+    ItemToRowJob job( item, list.GetFirst() );

     Walker(m_root , job );
     return job.GetResult();
 }
 
     Walker(m_root , job );
     return job.GetResult();
 }
 

-unsigned int BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataViewTreeNode * node)
+void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataViewTreeNode * node)

 {
 {

-    int sum = 0 ;
-    if( !model->HasChildren( item ) )
-        return 0;
-    
+    if( !model->IsContainer( item ) )
+        return ;
+

     wxDataViewItem i = model->GetFirstChild( item );
     wxDataViewItem i = model->GetFirstChild( item );

+    int num = 0;

     while( i.IsOk() )
     {
     while( i.IsOk() )
     {

-        wxDataViewTreeNode * n = new wxDataViewTreeNode( node );
-        n->SetItem(i);
-        node->AppendChild(n);
-        int num = BuildTreeHelper( model, i, n) + 1;
-        sum += num ;
+        num ++;
+        if( model->IsContainer( i ) )
+        {
+            wxDataViewTreeNode * n = new wxDataViewTreeNode( node );
+            n->SetItem(i);
+            n->SetHasChildren( true ) ;
+            node->AddNode( n );
+        }
+        else
+        {
+            node->AddLeaf( i.GetID() );
+        }

         i = model->GetNextSibling( i );
     }
         i = model->GetNextSibling( i );
     }

-    return sum;
+    node->SetSubTreeCount( num );
+    wxDataViewTreeNode * n = node->GetParent();
+    if( n != NULL)
+        n->ChangeSubTreeCount(num);
+

 }
 
 void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
 {
     //First we define a invalid item to fetch the top-level elements
     wxDataViewItem item;
 }
 
 void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
 {
     //First we define a invalid item to fetch the top-level elements
     wxDataViewItem item;

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

     BuildTreeHelper( model, item, m_root);
     m_count = -1 ;
 }
 
 void DestroyTreeHelper( wxDataViewTreeNode * node )
 {
     BuildTreeHelper( model, item, m_root);
     m_count = -1 ;
 }
 
 void DestroyTreeHelper( wxDataViewTreeNode * node )
 {

-    if( node->HasChildren() )
+    if( node->GetNodeNumber() != 0 )

     {
     {

-        int len = node->GetChildrenNumber();
+        int len = node->GetNodeNumber();

         int i = 0 ;
         int i = 0 ;

-        wxDataViewTreeNodes nodes = node->GetChildren();
+        wxDataViewTreeNodes nodes = node->GetNodes();

         for( ; i < len; i ++ )
         {
             DestroyTreeHelper(nodes[i]);
         for( ; i < len; i ++ )
         {
             DestroyTreeHelper(nodes[i]);


@@ -2546,6 +2909,7 @@ void DestroyTreeHelper( wxDataViewTreeNode * node )
 void wxDataViewMainWindow::DestroyTree()
 {
     DestroyTreeHelper(m_root);
 void wxDataViewMainWindow::DestroyTree()
 {
     DestroyTreeHelper(m_root);

+    m_root->SetSubTreeCount(0);

     m_count = 0 ;
 }
 
     m_count = 0 ;
 }
 


@@ -2714,13 +3078,13 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         {
             if (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE)
             {
         {
             if (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE)
             {

+                wxDataViewItem item = GetItemByRow(current);

                 wxVariant value;
                 wxVariant value;

-                model->GetValue( value, col->GetModelColumn(), current );
+                model->GetValue( value, item, col->GetModelColumn() );

                 cell->SetValue( value );
                 wxRect cell_rect( xpos, current * m_lineHeight,
                                   col->GetWidth(), m_lineHeight );
                 cell->SetValue( value );
                 wxRect cell_rect( xpos, current * m_lineHeight,
                                   col->GetWidth(), m_lineHeight );

-                 wxDataViewItem dataitem = GetItemByRow(current);
-                cell->Activate( cell_rect, model, dataitem, col->GetModelColumn() );
+                cell->Activate( cell_rect, model, item, col->GetModelColumn() );

             }
             return;
         }
             }
             return;
         }


@@ -2752,12 +3116,10 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             if( rect.Contains( x, y) )
             {
                 expander = true;
             if( rect.Contains( x, y) )
             {
                 expander = true;

-                node->ToggleOpen();
-                m_count = -1;   //make the current row number fail
-                
-                Refresh();
-                //int last_row = GetLastVisibleRow();
-                //RefreshRows( current, last_row );
+                if( node->IsOpen() )
+                    OnCollapsing(current);
+                else
+                    OnExpanding( current );

             }
         }
 
             }
         }
 


@@ -2900,6 +3262,14 @@ void wxDataViewMainWindow::OnKillFocus( wxFocusEvent &event )
     event.Skip();
 }
 
     event.Skip();
 }
 

+wxDataViewItem wxDataViewMainWindow::GetSelection()
+{
+    if( m_selection.GetCount() != 1 )
+        return wxDataViewItem();
+
+    return GetItemByRow( m_selection.Item(0));
+}
+

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


@@ -3029,6 +3399,10 @@ void wxDataViewCtrl::DoSetIndent()
     m_clientArea->UpdateDisplay();
 }
 
     m_clientArea->UpdateDisplay();
 }
 

+wxDataViewItem wxDataViewCtrl::GetSelection()
+{
+    return m_clientArea->GetSelection();
+}

 
 /********************************************************************
 void wxDataViewCtrl::SetSelection( int row )
 
 /********************************************************************
 void wxDataViewCtrl::SetSelection( int row )