miscellaneous small enhancements

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index dfc95dbb3facb92cc0baac8a838dd0968bc0c61c..388cd1b52ff26b154decd61de44674e9b2ac6eee 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -44,6 +44,8 @@
 #include "wx/icon.h"
 #include "wx/list.h"
 #include "wx/listimpl.cpp"
 #include "wx/icon.h"
 #include "wx/list.h"
 #include "wx/listimpl.cpp"

+#include "wx/imaglist.h"
+#include "wx/headerctrl.h"

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


@@ -59,11 +61,11 @@ static const int PADDING_RIGHTLEFT = 3;
 // the expander space margin
 static const int EXPANDER_MARGIN = 4;
 
 // the expander space margin
 static const int EXPANDER_MARGIN = 4;
 

-//-----------------------------------------------------------------------------
-// wxDataViewHeaderWindow
-//-----------------------------------------------------------------------------
-
-#define USE_NATIVE_HEADER_WINDOW    0
+#ifdef __WXMSW__
+static const int EXPANDER_OFFSET = 4;
+#else
+static const int EXPANDER_OFFSET = 1;
+#endif

 
 //Below is the compare stuff
 //For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed
 
 //Below is the compare stuff
 //For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed


@@ -71,175 +73,135 @@ static wxDataViewModel * g_model;
 static int g_column = -2;
 static bool g_asending = true;
 
 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
+//-----------------------------------------------------------------------------
+// wxDataViewHeaderWindow
+//-----------------------------------------------------------------------------
+
+class wxDataViewHeaderWindow : public wxHeaderCtrl

 {
 public:
 {
 public:

-    wxDataViewHeaderWindowBase()
-        { m_owner = NULL; }
-
-    bool Create(wxDataViewCtrl *parent, wxWindowID id,
-                const wxPoint &pos, const wxSize &size,
-                const wxString &name)
+    wxDataViewHeaderWindow(wxDataViewCtrl *parent)
+        : wxHeaderCtrl(parent)

     {
     {

-        return wxWindow::Create(parent, id, pos, size, wxNO_BORDER, name);

     }
 
     }
 

-    void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; }
-    wxDataViewCtrl *GetOwner() { return m_owner; }
-
-    // called on column addition/removal
-    virtual void UpdateDisplay() { /* by default, do nothing */ }
-
-    // returns the n-th column
-    virtual wxDataViewColumn *GetColumn(unsigned int n)
-    {
-        wxASSERT(m_owner);
-        wxDataViewColumn *ret = m_owner->GetColumn(n);
-        wxASSERT(ret);
-
-        return ret;
-    }
+    wxDataViewCtrl *GetOwner() const
+        { return static_cast<wxDataViewCtrl *>(GetParent()); }

 
 protected:
 
 protected:

-    wxDataViewCtrl      *m_owner;
-
-    // sends an event generated from the n-th wxDataViewColumn
-    void SendEvent(wxEventType type, unsigned int n);
-};
-
-// on wxMSW the header window (only that part however) can be made native!
-#if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW
-
-#define COLUMN_WIDTH_OFFSET         2
-#define wxDataViewHeaderWindowMSW   wxDataViewHeaderWindow
-
-class wxDataViewHeaderWindowMSW : public wxDataViewHeaderWindowBase
-{
-public:
-
-    wxDataViewHeaderWindowMSW( wxDataViewCtrl *parent,
-                               wxWindowID id,
-                               const wxPoint &pos = wxDefaultPosition,
-                               const wxSize &size = wxDefaultSize,
-                               const wxString &name = wxT("wxdataviewctrlheaderwindow") )
+    // implement/override wxHeaderCtrl functions by forwarding them to the main
+    // control
+    virtual const wxHeaderColumn& GetColumn(unsigned int idx) const

     {
     {

-        Create(parent, id, pos, size, name);
+        return *(GetOwner()->GetColumn(idx));

     }
 
     }
 

-    bool Create(wxDataViewCtrl *parent, wxWindowID id,
-                const wxPoint &pos, const wxSize &size,
-                const wxString &name);
-
-    ~wxDataViewHeaderWindowMSW();
-
-    // called when any column setting is changed and/or changed
-    // the column count
-    virtual void UpdateDisplay();
-
-    // called when the main window gets scrolled
-    virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL);
-
-protected:
-    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-    virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags);
+    virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle)
+    {
+        wxDataViewCtrl * const owner = GetOwner();

 
 

-    unsigned int GetColumnIdxFromHeader(NMHEADER *nmHDR);
+        int widthContents = owner->GetBestColumnWidth(idx);
+        owner->GetColumn(idx)->SetWidth(wxMax(widthTitle, widthContents));
+        owner->OnColumnChange(idx);

 
 

-    wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR)
-        { return GetColumn(GetColumnIdxFromHeader(nmHDR)); }
+        return true;
+    }

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindowMSW)
-};
-
-#else       // !defined(__WXMSW__)
-
-#define HEADER_WINDOW_HEIGHT            25
-#define HEADER_HORIZ_BORDER             5
-#define HEADER_VERT_BORDER              3
-#define wxGenericDataViewHeaderWindow   wxDataViewHeaderWindow
-
-class wxGenericDataViewHeaderWindow : public wxDataViewHeaderWindowBase
-{
-public:
-    wxGenericDataViewHeaderWindow( wxDataViewCtrl *parent,
-                                    wxWindowID id,
-                                    const wxPoint &pos = wxDefaultPosition,
-                                    const wxSize &size = wxDefaultSize,
-                                    const wxString &name = wxT("wxdataviewctrlheaderwindow") )
+    bool SendEvent(wxEventType type, unsigned int n)

     {
     {

-        Init();
-        Create(parent, id, pos, size, name);
-    }
+        wxDataViewCtrl * const owner = GetOwner();
+        wxDataViewEvent event(type, owner->GetId());

 
 

-    bool Create(wxDataViewCtrl *parent, wxWindowID id,
-                const wxPoint &pos, const wxSize &size,
-                const wxString &name);
+        event.SetEventObject(owner);
+        event.SetColumn(n);
+        event.SetDataViewColumn(owner->GetColumn(n));
+        event.SetModel(owner->GetModel());

 
 

-    ~wxGenericDataViewHeaderWindow()
-    {
-        delete m_resizeCursor;
+        // for events created by wxDataViewHeaderWindow the
+        // row / value fields are not valid
+        return owner->GetEventHandler()->ProcessEvent(event);

     }
 
     }
 

-    virtual void UpdateDisplay() { Refresh(); }
-
-    // event handlers:
-
-    void OnPaint( wxPaintEvent &event );
-    void OnMouse( wxMouseEvent &event );
-    void OnSetFocus( wxFocusEvent &event );
-
-
-protected:
+    void OnClick(wxHeaderCtrlEvent& event)
+    {
+        const unsigned idx = event.GetColumn();

 
 

-    // vars used for column resizing:
+        if ( SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, idx) )
+            return;

 
 

-    wxCursor            *m_resizeCursor;
-    const wxCursor      *m_currentCursor;
-    bool                 m_isDragging;
+        // default handling for the column click is to sort by this column or
+        // toggle its sort order
+        wxDataViewCtrl * const owner = GetOwner();
+        wxDataViewColumn * const col = owner->GetColumn(idx);
+        if ( !col->IsSortable() )
+        {
+            // no default handling for non-sortable columns
+            event.Skip();
+            return;
+        }

 
 

-    bool                 m_dirty;     // needs refresh?
-    int                  m_hover;     // index of the column under the mouse
-    int                  m_column;    // index of the column being resized
-    int                  m_currentX;  // divider line position in logical (unscrolled) coords
-    int                  m_minX;      // minimal position beyond which the divider line
-                                      // can't be dragged in logical coords
+        if ( col->IsSortKey() )
+        {
+            // already using this column for sorting, just change the order
+            col->ToggleSortOrder();
+        }
+        else // not using this column for sorting yet
+        {
+            // first unset the old sort column if any
+            int oldSortKey = owner->GetSortingColumnIndex();
+            if ( oldSortKey != wxNOT_FOUND )
+            {
+                owner->GetColumn(oldSortKey)->UnsetAsSortKey();
+                owner->OnColumnChange(oldSortKey);
+            }

 
 

-    // the pen used to draw the current column width drag line
-    // when resizing the columsn
-    wxPen m_penCurrent;
+            owner->SetSortingColumnIndex(idx);
+            col->SetAsSortKey();
+        }

 
 

+        wxDataViewModel * const model = owner->GetModel();
+        if ( model )
+            model->Resort();

 
 

-    // internal utilities:
+        owner->OnColumnChange(idx);
+    }

 
 

-    void Init()
+    void OnRClick(wxHeaderCtrlEvent& event)

     {
     {

-        m_currentCursor = (wxCursor *) NULL;
-        m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
-
-        m_isDragging = false;
-        m_dirty = false;
+        if ( !SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK,
+                        event.GetColumn()) )
+            event.Skip();
+    }

 
 

-        m_hover = wxNOT_FOUND;
-        m_column = wxNOT_FOUND;
-        m_currentX = 0;
-        m_minX = 0;
+    void OnEndResize(wxHeaderCtrlEvent& event)
+    {
+        wxDataViewCtrl * const owner = GetOwner();

 
 

-        wxColour col = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
-        m_penCurrent = wxPen(col, 1, wxSOLID);
+        const unsigned col = event.GetColumn();
+        owner->GetColumn(col)->SetWidth(event.GetWidth());
+        GetOwner()->OnColumnChange(col);

     }
 
     }
 

-    void DrawCurrent();
-    void AdjustDC(wxDC& dc);
+    void OnEndReorder(wxHeaderCtrlEvent& event)
+    {
+        wxDataViewCtrl * const owner = GetOwner();
+        owner->ColumnMoved(owner->GetColumn(event.GetColumn()),
+                           event.GetNewOrder());
+    }

 
 

-private:
-    DECLARE_DYNAMIC_CLASS(wxGenericDataViewHeaderWindow)

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxDataViewHeaderWindow)

 };
 
 };
 

-#endif      // defined(__WXMSW__)
+BEGIN_EVENT_TABLE(wxDataViewHeaderWindow, wxHeaderCtrl)
+    EVT_HEADER_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnClick)
+    EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnRClick)
+
+    EVT_HEADER_END_RESIZE(wxID_ANY, wxDataViewHeaderWindow::OnEndResize)
+
+    EVT_HEADER_END_REORDER(wxID_ANY, wxDataViewHeaderWindow::OnEndReorder)
+END_EVENT_TABLE()

 
 //-----------------------------------------------------------------------------
 // wxDataViewRenameTimer
 
 //-----------------------------------------------------------------------------
 // wxDataViewRenameTimer


@@ -269,118 +231,117 @@ class wxDataViewTreeNode
 {
 public:
     wxDataViewTreeNode( wxDataViewTreeNode * parent = NULL )
 {
 public:
     wxDataViewTreeNode( wxDataViewTreeNode * parent = NULL )

-        { this->parent = parent;
-          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()

     {
     {

+        m_parent = parent;
+        if (!parent)
+            m_open = true;
+        else
+            m_open = false;
+        m_hasChildren = false;
+        m_subTreeCount  = 0;
+    }

 
 

+    ~wxDataViewTreeNode()
+    {

     }
 
     }
 

-    wxDataViewTreeNode * GetParent() { return parent; }
-    void SetParent( wxDataViewTreeNode * parent ) { this->parent = parent; }
-    wxDataViewTreeNodes &  GetNodes() { return nodes; }
-    wxDataViewTreeLeaves & GetChildren() { return leaves; }
+    wxDataViewTreeNode * GetParent() const { return m_parent; }
+    void SetParent( wxDataViewTreeNode * parent ) { m_parent = parent; }
+    wxDataViewTreeNodes &  GetNodes() { return m_nodes; }
+    wxDataViewTreeLeaves & GetChildren() { return m_leaves; }

 
     void AddNode( wxDataViewTreeNode * node )
     {
 
     void AddNode( wxDataViewTreeNode * node )
     {

-        leaves.Add( node->GetItem().GetID() );
+        m_leaves.Add( node->GetItem().GetID() );

         if (g_column >= -1)
         if (g_column >= -1)

-            leaves.Sort( &wxGenericTreeModelItemCmp );
-        nodes.Add( node );
+            m_leaves.Sort( &wxGenericTreeModelItemCmp );
+        m_nodes.Add( node );

         if (g_column >= -1)
         if (g_column >= -1)

-            nodes.Sort( &wxGenericTreeModelNodeCmp );
+            m_nodes.Sort( &wxGenericTreeModelNodeCmp );

     }
     void AddLeaf( void * leaf )
     {
     }
     void AddLeaf( void * leaf )
     {

-        leaves.Add( leaf );
+        m_leaves.Add( leaf );

         if (g_column >= -1)
         if (g_column >= -1)

-            leaves.Sort( &wxGenericTreeModelItemCmp );
+            m_leaves.Sort( &wxGenericTreeModelItemCmp );

     }
 
     }
 

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

 
 

-    unsigned int GetChildrenNumber() { return leaves.GetCount(); }
-    unsigned int GetNodeNumber() { return nodes.GetCount(); }
-    int GetIndentLevel()
+    unsigned int GetChildrenNumber() const { return m_leaves.GetCount(); }
+    unsigned int GetNodeNumber() const { return m_nodes.GetCount(); }
+    int GetIndentLevel() const

     {
     {

-        int ret = 0 ;
-     wxDataViewTreeNode * node = this;
-     while( node->GetParent()->GetParent() != NULL )
-     {
-         node = node->GetParent();
-         ret ++;
-     }
-     return ret;
+        int ret = 0;
+        const wxDataViewTreeNode * node = this;
+        while( node->GetParent()->GetParent() != NULL )
+        {
+            node = node->GetParent();
+            ret ++;
+        }
+        return ret;

     }
 
     }
 

-    bool IsOpen()
+    bool IsOpen() const

     {
     {

-        return open ;
+        return m_open;

     }
 
     void ToggleOpen()
     {
     }
 
     void ToggleOpen()
     {

-        int len = nodes.GetCount();
+        int len = m_nodes.GetCount();

         int sum = 0;
         int sum = 0;

-        for ( int i = 0 ;i < len ; i ++)
-            sum += nodes[i]->GetSubTreeCount();
+        for ( int i = 0;i < len; i ++)
+            sum += m_nodes[i]->GetSubTreeCount();

 
 

-        sum += leaves.GetCount();
-        if( open )
+        sum += m_leaves.GetCount();
+        if (m_open)

         {
             ChangeSubTreeCount(-sum);
         {
             ChangeSubTreeCount(-sum);

-            open = !open;
+            m_open = !m_open;

         }
         else
         {
         }
         else
         {

-            open = !open;
+            m_open = !m_open;

             ChangeSubTreeCount(sum);
         }
     }
             ChangeSubTreeCount(sum);
         }
     }

-    bool HasChildren() { return hasChildren; }
-    void SetHasChildren( bool has ){ hasChildren = has; }
+    bool HasChildren() const { return m_hasChildren; }
+    void SetHasChildren( bool has ){ m_hasChildren = has; }

 
 

-    void SetSubTreeCount( int num ) { subTreeCount = num; }
-    int GetSubTreeCount() { return subTreeCount; }
+    void SetSubTreeCount( int num ) { m_subTreeCount = num; }
+    int GetSubTreeCount() const { return m_subTreeCount; }

     void ChangeSubTreeCount( int num )
     {
     void ChangeSubTreeCount( int num )
     {

-        if( !open )
-            return ;
-        subTreeCount += num;
-        if( parent )
-            parent->ChangeSubTreeCount(num);
+        if( !m_open )
+            return;
+        m_subTreeCount += num;
+        if( m_parent )
+            m_parent->ChangeSubTreeCount(num);

     }
 
     void Resort()
     {
         if (g_column >= -1)
         {
     }
 
     void Resort()
     {
         if (g_column >= -1)
         {

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

             for (int i = 0; i < len; i ++)
             for (int i = 0; i < len; i ++)

-            {
-                nodes[i]->Resort();
-            }
-            leaves.Sort( &wxGenericTreeModelItemCmp );
+                m_nodes[i]->Resort();
+            m_leaves.Sort( &wxGenericTreeModelItemCmp );

         }
     }
 
 private:
         }
     }
 
 private:

-    wxDataViewTreeNode * parent;
-    wxDataViewTreeNodes  nodes;
-    wxDataViewTreeLeaves leaves;
-    wxDataViewItem  item;
-    bool open;
-    bool hasChildren;
-    int subTreeCount;
+    wxDataViewTreeNode  *m_parent;
+    wxDataViewTreeNodes  m_nodes;
+    wxDataViewTreeLeaves m_leaves;
+    wxDataViewItem       m_item;
+    bool                 m_open;
+    bool                 m_hasChildren;
+    int                  m_subTreeCount;

 };
 
 int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2)
 };
 
 int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2)


@@ -402,7 +363,7 @@ int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2)
 WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection,
                                             WXDLLIMPEXP_ADV);
 WX_DECLARE_LIST(wxDataViewItem, ItemList);
 WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection,
                                             WXDLLIMPEXP_ADV);
 WX_DECLARE_LIST(wxDataViewItem, ItemList);

-WX_DEFINE_LIST(ItemList);
+WX_DEFINE_LIST(ItemList)

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


@@ -414,6 +375,8 @@ public:
                             const wxString &name = wxT("wxdataviewctrlmainwindow") );
     virtual ~wxDataViewMainWindow();
 
                             const wxString &name = wxT("wxdataviewctrlmainwindow") );
     virtual ~wxDataViewMainWindow();
 

+    bool IsVirtualList() const { return m_root == NULL; }
+

     // notifications from wxDataViewModel
     bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
     bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
     // notifications from wxDataViewModel
     bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
     bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );


@@ -422,8 +385,11 @@ public:
     bool Cleared();
     void Resort()
     {
     bool Cleared();
     void Resort()
     {

-        SortPrepare();
-        m_root->Resort();
+        if (!IsVirtualList())
+        {
+            SortPrepare();
+            m_root->Resort();
+        }

         UpdateDisplay();
     }
 
         UpdateDisplay();
     }
 


@@ -476,7 +442,7 @@ public:
     unsigned int GetFirstVisibleRow() const;
     //I change this method to un const because in the tree view, the displaying number of the tree are changing along with the expanding/collapsing of the tree nodes
     unsigned int GetLastVisibleRow();
     unsigned int GetFirstVisibleRow() const;
     //I change this method to un const because in the tree view, the displaying number of the tree are changing along with the expanding/collapsing of the tree nodes
     unsigned int GetLastVisibleRow();

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

 
     wxDataViewItem GetSelection() const;
     wxDataViewSelection GetSelections(){ return m_selection; }
 
     wxDataViewItem GetSelection() const;
     wxDataViewSelection GetSelections(){ return m_selection; }


@@ -501,9 +467,13 @@ public:
 
     wxRect GetLineRect( unsigned int row ) const;
 
 
     wxRect GetLineRect( unsigned int row ) const;
 

+    int GetLineStart( unsigned int row ) const;  // row * m_lineHeight in fixed mode
+    int GetLineHeight( unsigned int row ) const; // m_lineHeight in fixed mode
+    int GetLineAt( unsigned int y ) const;       // y / m_lineHeight in fixed mode
+

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

-    int GetRowByItem( const wxDataViewItem & item );
+    int GetRowByItem( const wxDataViewItem & item ) const;

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


@@ -513,12 +483,13 @@ public:
 
     void Expand( unsigned int row ) { OnExpanding( row ); }
     void Collapse( unsigned int row ) { OnCollapsing( row ); }
 
     void Expand( unsigned int row ) { OnExpanding( row ); }
     void Collapse( unsigned int row ) { OnCollapsing( row ); }

+    bool IsExpanded( unsigned int row ) const;

 private:
 private:

-    wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row );
+    wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const;

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

-    int RecalculateCount() ;
+    int RecalculateCount();

 
     wxDataViewEvent SendExpanderEvent( wxEventType type, const wxDataViewItem & item );
     void OnExpanding( unsigned int row );
 
     wxDataViewEvent SendExpanderEvent( wxEventType type, const wxDataViewItem & item );
     void OnExpanding( unsigned int row );


@@ -604,6 +575,8 @@ wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype,
     m_dc = NULL;
     m_align = align;
     m_mode = mode;
     m_dc = NULL;
     m_align = align;
     m_mode = mode;

+    m_wantsAttr = false;
+    m_hasAttr = false;

 }
 
 wxDataViewRenderer::~wxDataViewRenderer()
 }
 
 wxDataViewRenderer::~wxDataViewRenderer()


@@ -626,6 +599,29 @@ wxDC *wxDataViewRenderer::GetDC()
     return m_dc;
 }
 
     return m_dc;
 }
 

+void wxDataViewRenderer::SetAlignment( int align )
+{
+    m_align=align;
+}
+
+int wxDataViewRenderer::GetAlignment() const
+{
+    return m_align;
+}
+
+int wxDataViewRenderer::CalculateAlignment() const
+{
+    if (m_align == wxDVR_DEFAULT_ALIGNMENT)
+    {
+        if (GetOwner() == NULL)
+           return wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL;
+
+        return GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL;
+    }
+
+    return m_align;
+}
+

 // ---------------------------------------------------------
 // wxDataViewCustomRenderer
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxDataViewCustomRenderer
 // ---------------------------------------------------------


@@ -638,6 +634,16 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
 {
 }
 
 {
 }
 

+void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, wxRect cell, wxDC *dc, int state )
+{
+    wxDataViewCtrl *view = GetOwner()->GetOwner();
+    wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ?
+                        wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) :
+                        view->GetForegroundColour();
+    dc->SetTextForeground(col);
+    dc->DrawText( text, cell.x + xoffset, cell.y + ((cell.height - dc->GetCharHeight()) / 2));
+}
+

 // ---------------------------------------------------------
 // wxDataViewTextRenderer
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxDataViewTextRenderer
 // ---------------------------------------------------------


@@ -684,14 +690,7 @@ bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVarian
 
 bool wxDataViewTextRenderer::Render( wxRect cell, wxDC *dc, int state )
 {
 
 bool wxDataViewTextRenderer::Render( wxRect cell, wxDC *dc, int state )
 {

-    wxDataViewCtrl *view = GetOwner()->GetOwner();
-    wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ?
-                        wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) :
-                        view->GetForegroundColour();
-
-    dc->SetTextForeground(col);
-    dc->DrawText( m_text, cell.x, cell.y );
-
+    RenderText( m_text, 0, cell, dc, state );

     return true;
 }
 
     return true;
 }
 


@@ -707,6 +706,60 @@ wxSize wxDataViewTextRenderer::GetSize() const
     return wxSize(80,20);
 }
 
     return wxSize(80,20);
 }
 

+// ---------------------------------------------------------
+// wxDataViewTextRendererAttr
+// ---------------------------------------------------------
+
+IMPLEMENT_CLASS(wxDataViewTextRendererAttr, wxDataViewTextRenderer)
+
+wxDataViewTextRendererAttr::wxDataViewTextRendererAttr( const wxString &varianttype,
+                            wxDataViewCellMode mode, int align ) :
+    wxDataViewTextRenderer( varianttype, mode, align )
+{
+    m_wantsAttr = true;
+}
+
+bool wxDataViewTextRendererAttr::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
+{
+    wxFont font;
+    wxColour colour;
+
+    if (m_hasAttr)
+    {
+        if (m_attr.HasColour())
+        {
+            colour = dc->GetTextForeground();
+            dc->SetTextForeground( m_attr.GetColour() );
+        }
+
+        if (m_attr.GetBold() || m_attr.GetItalic())
+        {
+             font = dc->GetFont();
+             wxFont myfont = font;
+             if (m_attr.GetBold())
+                 myfont.SetWeight( wxFONTWEIGHT_BOLD );
+             if (m_attr.GetItalic())
+                 myfont.SetStyle( wxFONTSTYLE_ITALIC );
+             dc->SetFont( myfont );
+        }
+    }
+
+    dc->DrawText( m_text, cell.x, cell.y + ((cell.height - dc->GetCharHeight()) / 2));
+
+    // restore dc
+    if (m_hasAttr)
+    {
+        if (m_attr.HasColour())
+            dc->SetTextForeground( colour );
+
+        if (m_attr.GetBold() || m_attr.GetItalic())
+            dc->SetFont( font );
+    }
+
+    return true;
+}
+
+

 // ---------------------------------------------------------
 // wxDataViewBitmapRenderer
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxDataViewBitmapRenderer
 // ---------------------------------------------------------


@@ -952,12 +1005,10 @@ bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const
     return true;
 }
 
     return true;
 }
 

-bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
+bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state )

 {
 {

-    dc->SetFont( GetOwner()->GetOwner()->GetFont() );

     wxString tmp = m_date.FormatDate();
     wxString tmp = m_date.FormatDate();

-    dc->DrawText( tmp, cell.x, cell.y );
-
+    RenderText( tmp, 0, cell, dc, state );

     return true;
 }
 
     return true;
 }
 


@@ -1014,926 +1065,412 @@ bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )
     return true;
 }
 
     return true;
 }
 

-bool wxDataViewIconTextRenderer::GetValue( wxVariant &value ) const
+bool wxDataViewIconTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const

 {
     return false;
 }
 
 bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state )
 {
 {
     return false;
 }
 
 bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state )
 {

-    wxDataViewCtrl *view = GetOwner()->GetOwner();
-    
-    dc->SetFont( view->GetFont() );
-
-    wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ?
-                        wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) :
-                        view->GetForegroundColour();
-
-    dc->SetTextForeground(col);
-
+    int xoffset = 0;

     const wxIcon &icon = m_value.GetIcon();
     if (icon.IsOk())
     {
     const wxIcon &icon = m_value.GetIcon();
     if (icon.IsOk())
     {

-        dc->DrawIcon( icon, cell.x, cell.y ); // TODO centre
-        cell.x += icon.GetWidth()+4;
+        dc->DrawIcon( icon, cell.x, cell.y + ((cell.height - icon.GetHeight()) / 2));
+        xoffset =  icon.GetWidth()+4;

     }
 
     }
 

-    dc->DrawText( m_value.GetText(), cell.x, cell.y );
+    RenderText( m_value.GetText(), xoffset, cell, dc, state );

 
     return true;
 }
 
 wxSize wxDataViewIconTextRenderer::GetSize() const
 {
 
     return true;
 }
 
 wxSize wxDataViewIconTextRenderer::GetSize() const
 {

-    return wxSize(80,16);  // TODO
+    const wxDataViewCtrl *view = GetView();
+    if (!m_value.GetText().empty())
+    {
+        int x,y;
+        view->GetTextExtent( m_value.GetText(), &x, &y );
+
+        if (m_value.GetIcon().IsOk())
+            x += m_value.GetIcon().GetWidth() + 4;
+        return wxSize( x, y );
+    }
+    return wxSize(80,20);

 }
 
 }
 

-wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
+wxControl *
+wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow * WXUNUSED(parent),
+                                             wxRect WXUNUSED(labelRect),
+                                             const wxVariant& WXUNUSED(value))

 {
     return NULL;
 }
 
 {
     return NULL;
 }
 

-bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
+bool
+wxDataViewIconTextRenderer::GetValueFromEditorCtrl(wxControl* WXUNUSED(editor),
+                                                   wxVariant& WXUNUSED(value))

 {
     return false;
 }
 
 {
     return false;
 }
 

-// ---------------------------------------------------------
-// wxDataViewColumn
-// ---------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
-
-wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell,
-                                    unsigned int model_column,
-                                    int width, wxAlignment align, int flags ) :
-    wxDataViewColumnBase( title, cell, model_column, width, align, flags )
-{
-    SetAlignment(align);
-    SetTitle(title);
-    SetFlags(flags);
-
-    Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width);
-}
+//-----------------------------------------------------------------------------
+// wxDataViewRenameTimer
+//-----------------------------------------------------------------------------

 
 

-wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell,
-                                    unsigned int model_column,
-                                    int width, wxAlignment align, int flags ) :
-    wxDataViewColumnBase( bitmap, cell, model_column, width, align, flags )
+wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner )

 {
 {

-    SetAlignment(align);
-    SetFlags(flags);
-
-    Init(width < 0 ? wxDVC_TOGGLE_DEFAULT_WIDTH : width);
+    m_owner = owner;

 }
 
 }
 

-wxDataViewColumn::~wxDataViewColumn()
+void wxDataViewRenameTimer::Notify()

 {
 {

+    m_owner->OnRenameTimer();

 }
 
 }
 

-void wxDataViewColumn::Init( int width )
-{
-    m_width = width;
-    m_minWidth = wxDVC_DEFAULT_MINWIDTH;
-    m_ascending = true;
-}
+//-----------------------------------------------------------------------------
+// wxDataViewMainWindow
+//-----------------------------------------------------------------------------

 
 

-void wxDataViewColumn::SetResizeable( bool resizeable )
-{
-    if (resizeable)
-        m_flags |= wxDATAVIEW_COL_RESIZABLE;
-    else
-        m_flags &= ~wxDATAVIEW_COL_RESIZABLE;
-}
+//The tree building helper, declared firstly
+static void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataViewTreeNode * node);

 
 

-void wxDataViewColumn::SetHidden( bool hidden )
+int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )

 {
 {

-    if (hidden)
-        m_flags |= wxDATAVIEW_COL_HIDDEN;
-    else
-        m_flags &= ~wxDATAVIEW_COL_HIDDEN;
-
-    // tell our owner to e.g. update its scrollbars:
-    if (GetOwner())
-        GetOwner()->OnColumnChange();
+    if (row1 > row2) return 1;
+    if (row1 == row2) return 0;
+    return -1;

 }
 
 }
 

-void wxDataViewColumn::SetSortable( bool sortable )
-{
-    if (sortable)
-        m_flags |= wxDATAVIEW_COL_SORTABLE;
-    else
-        m_flags &= ~wxDATAVIEW_COL_SORTABLE;

 
 

-    // Update header button
-    if (GetOwner())
-        GetOwner()->OnColumnChange();
-}
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow)

 
 

-void wxDataViewColumn::SetSortOrder( bool ascending )
-{
-    m_ascending = ascending;
+BEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow)
+    EVT_PAINT         (wxDataViewMainWindow::OnPaint)
+    EVT_MOUSE_EVENTS  (wxDataViewMainWindow::OnMouse)
+    EVT_SET_FOCUS     (wxDataViewMainWindow::OnSetFocus)
+    EVT_KILL_FOCUS    (wxDataViewMainWindow::OnKillFocus)
+    EVT_CHAR          (wxDataViewMainWindow::OnChar)
+END_EVENT_TABLE()

 
 

-    // Update header button
-    if (GetOwner())
-        GetOwner()->OnColumnChange();
-}
+wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID id,
+    const wxPoint &pos, const wxSize &size, const wxString &name ) :
+    wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE, name ),
+    m_selection( wxDataViewSelectionCmp )

 
 

-bool wxDataViewColumn::IsSortOrderAscending() const

 {
 {

-    return m_ascending;
-}
+    SetOwner( parent );

 
 

-void wxDataViewColumn::SetInternalWidth( int width )
-{
-    m_width = width;
+    m_lastOnSame = false;
+    m_renameTimer = new wxDataViewRenameTimer( this );

 
 

-    // the scrollbars of the wxDataViewCtrl needs to be recalculated!
-    if (m_owner && m_owner->m_clientArea)
-        m_owner->m_clientArea->RecalculateDisplay();
-}
+    // TODO: user better initial values/nothing selected
+    m_currentCol = NULL;
+    m_currentRow = 0;

 
 

-void wxDataViewColumn::SetWidth( int width )
-{
-    m_owner->m_headerArea->UpdateDisplay();
+    m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1

 
 

-    SetInternalWidth(width);
-}
+    m_dragCount = 0;
+    m_dragStart = wxPoint(0,0);
+    m_lineLastClicked = (unsigned int) -1;
+    m_lineBeforeLastClicked = (unsigned int) -1;
+    m_lineSelectSingleOnUp = (unsigned int) -1;

 
 

+    m_hasFocus = false;

 
 

-//-----------------------------------------------------------------------------
-// wxDataViewHeaderWindowBase
-//-----------------------------------------------------------------------------
+    SetBackgroundColour( *wxWHITE );

 
 

-void wxDataViewHeaderWindowBase::SendEvent(wxEventType type, unsigned int n)
-{
-    wxWindow *parent = GetParent();
-    wxDataViewEvent le(type, parent->GetId());
+    SetBackgroundStyle(wxBG_STYLE_CUSTOM);

 
 

-    le.SetEventObject(parent);
-    le.SetColumn(n);
-    le.SetDataViewColumn(GetColumn(n));
-    le.SetModel(GetOwner()->GetModel());
+    m_penRule = wxPen(GetRuleColour());

 
 

-    // for events created by wxDataViewHeaderWindow the
-    // row / value fields are not valid
+    //Here I compose a pen can draw black lines, maybe there are something system colour to use
+    m_penExpander = wxPen(wxColour(0,0,0));
+    //Some new added code to deal with the tree structure
+    m_root = new wxDataViewTreeNode( NULL );
+    m_root->SetHasChildren(true);

 
 

-    parent->GetEventHandler()->ProcessEvent(le);
+    //Make m_count = -1 will cause the class recaculate the real displaying number of rows.
+    m_count = -1;
+    m_underMouse = NULL;
+    UpdateDisplay();

 }
 
 }
 

-#if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW
-
-// implemented in msw/listctrl.cpp:
-int WXDLLIMPEXP_CORE wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick);
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewHeaderWindowMSW, wxWindow)
-
-bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id,
-                                        const wxPoint &pos, const wxSize &size,
-                                        const wxString &name )
+wxDataViewMainWindow::~wxDataViewMainWindow()

 {
 {

-    m_owner = parent;
+    DestroyTree();
+    delete m_renameTimer;
+}

 
 

-    if ( !CreateControl(parent, id, pos, size, 0, wxDefaultValidator, name) )
-        return false;
-
-    int x = pos.x == wxDefaultCoord ? 0 : pos.x,
-        y = pos.y == wxDefaultCoord ? 0 : pos.y,
-        w = size.x == wxDefaultCoord ? 1 : size.x,
-        h = size.y == wxDefaultCoord ? 22 : size.y;
-
-    // create the native WC_HEADER window:
-    WXHWND hwndParent = (HWND)parent->GetHandle();
-    WXDWORD msStyle = WS_CHILD | HDS_BUTTONS | HDS_HORZ | HDS_HOTTRACK | HDS_FULLDRAG;
-    m_hWnd = CreateWindowEx(0,
-                            WC_HEADER,
-                            (LPCTSTR) NULL,
-                            msStyle,
-                            x, y, w, h,
-                            (HWND)hwndParent,
-                            (HMENU)-1,
-                            wxGetInstance(),
-                            (LPVOID) NULL);
-    if (m_hWnd == NULL)
-    {
-        wxLogLastError(_T("CreateWindowEx"));
-        return false;
-    }
-
-    // we need to subclass the m_hWnd to force wxWindow::HandleNotify
-    // to call wxDataViewHeaderWindow::MSWOnNotify
-    SubclassWin(m_hWnd);
-
-    // the following is required to get the default win's font for
-    // header windows and must be done befor sending the HDM_LAYOUT msg
-    SetFont(GetFont());
-
-    RECT rcParent;
-    HDLAYOUT hdl;
-    WINDOWPOS wp;
-
-    // Retrieve the bounding rectangle of the parent window's
-    // client area, and then request size and position values
-    // from the header control.
-    ::GetClientRect((HWND)hwndParent, &rcParent);
-
-    hdl.prc = &rcParent;
-    hdl.pwpos = &wp;
-    if (!SendMessage((HWND)m_hWnd, HDM_LAYOUT, 0, (LPARAM) &hdl))
-    {
-        wxLogLastError(_T("SendMessage"));
-        return false;
-    }
-
-    // Set the size, position, and visibility of the header control.
-    SetWindowPos((HWND)m_hWnd,
-                 wp.hwndInsertAfter,
-                 wp.x, wp.y,
-                 wp.cx, wp.cy,
-                 wp.flags | SWP_SHOWWINDOW);
+void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
+{
+    wxDataViewModel *model = GetOwner()->GetModel();
+    wxAutoBufferedPaintDC dc( this );

 
 

-    // set our size hints: wxDataViewCtrl will put this wxWindow inside
-    // a wxBoxSizer and in order to avoid super-big header windows,
-    // we need to set our height as fixed
-    SetMinSize(wxSize(-1, wp.cy));
-    SetMaxSize(wxSize(-1, wp.cy));
+#ifdef __WXMSW__
+    dc.SetPen( *wxTRANSPARENT_PEN );
+    dc.SetBrush( wxBrush( GetBackgroundColour()) );
+    dc.SetBrush( *wxWHITE_BRUSH );
+    wxSize size( GetClientSize() );
+    dc.DrawRectangle( 0,0,size.x,size.y );
+#endif

 
 

-    return true;
-}
+    // prepare the DC
+    GetOwner()->PrepareDC( dc );
+    dc.SetFont( GetFont() );

 
 

-wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow()
-{
-    UnsubclassWin();
-}
+    wxRect update = GetUpdateRegion().GetBox();
+    m_owner->CalcUnscrolledPosition( update.x, update.y, &update.x, &update.y );

 
 

-void wxDataViewHeaderWindowMSW::UpdateDisplay()
-{
-    // remove old columns
-    for (int j=0, max=Header_GetItemCount((HWND)m_hWnd); j < max; j++)
-        Header_DeleteItem((HWND)m_hWnd, 0);
+    // compute which items needs to be redrawn
+    unsigned int item_start = GetLineAt( wxMax(0,update.y) );
+    unsigned int item_count =
+        wxMin( (int)(  GetLineAt( wxMax(0,update.y+update.height) ) - item_start + 1),
+               (int)(GetRowCount( ) - item_start));
+    unsigned int item_last = item_start + item_count;

 
 

-    // add the updated array of columns to the header control
+    // compute which columns needs to be redrawn

     unsigned int cols = GetOwner()->GetColumnCount();
     unsigned int cols = GetOwner()->GetColumnCount();

-    unsigned int added = 0;
-    wxDataViewModel * model = GetOwner()->GetModel();
-    for (unsigned int i = 0; i < cols; i++)
+    unsigned int col_start = 0;
+    unsigned int x_start;
+    for (x_start = 0; col_start < cols; col_start++)

     {
     {

-        wxDataViewColumn *col = GetColumn( i );
+        wxDataViewColumn *col = GetOwner()->GetColumnAt(col_start);

         if (col->IsHidden())
         if (col->IsHidden())

-            continue;      // don't add it!
-
-        HDITEM hdi;
-        hdi.mask = HDI_TEXT | HDI_FORMAT | HDI_WIDTH;
-        hdi.pszText = (wxChar *) col->GetTitle().wx_str();
-        hdi.cxy = col->GetWidth();
-        hdi.cchTextMax = sizeof(hdi.pszText)/sizeof(hdi.pszText[0]);
-        hdi.fmt = HDF_LEFT | HDF_STRING;
-        //hdi.fmt &= ~(HDF_SORTDOWN|HDF_SORTUP);
-
-        //sorting support
-        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
-            //hdi.fmt |= model->GetSortOrderAscending()? HDF_SORTUP:HDF_SORTDOWN;
-            ;
-        }
-
-        // lParam is reserved for application's use:
-        // we store there the column index to use it later in MSWOnNotify
-        // (since columns may have been hidden)
-        hdi.lParam = (LPARAM)i;
-
-        // the native wxMSW implementation of the header window
-        // draws the column separator COLUMN_WIDTH_OFFSET pixels
-        // on the right: to correct this effect we make the column
-        // exactly COLUMN_WIDTH_OFFSET wider (for the first column):
-        if (i == 0)
-            hdi.cxy += COLUMN_WIDTH_OFFSET;
+            continue;      // skip it!

 
 

-        switch (col->GetAlignment())
-        {
-        case wxALIGN_LEFT:
-            hdi.fmt |= HDF_LEFT;
-            break;
-        case wxALIGN_CENTER:
-        case wxALIGN_CENTER_HORIZONTAL:
-            hdi.fmt |= HDF_CENTER;
-            break;
-        case wxALIGN_RIGHT:
-            hdi.fmt |= HDF_RIGHT;
+        unsigned int w = col->GetWidth();
+        if (x_start+w >= (unsigned int)update.x)

             break;
 
             break;
 

-        default:
-            // such alignment is not allowed for the column header!
-            wxFAIL;
-        }
-
-        SendMessage((HWND)m_hWnd, HDM_INSERTITEM,
-                    (WPARAM)added, (LPARAM)&hdi);
-        added++;
-    }
-}
-
-unsigned int wxDataViewHeaderWindowMSW::GetColumnIdxFromHeader(NMHEADER *nmHDR)
-{
-    unsigned int idx;
-
-    // NOTE: we don't just return nmHDR->iItem because when there are
-    //       hidden columns, nmHDR->iItem may be different from
-    //       nmHDR->pitem->lParam
-
-    if (nmHDR->pitem && nmHDR->pitem->mask & HDI_LPARAM)
-    {
-        idx = (unsigned int)nmHDR->pitem->lParam;
-        return idx;
+        x_start += w;

     }
 
     }
 

-    HDITEM item;
-    item.mask = HDI_LPARAM;
-    Header_GetItem((HWND)m_hWnd, nmHDR->iItem, &item);
-
-    return (unsigned int)item.lParam;
-}
-
-bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
-{
-    NMHDR *nmhdr = (NMHDR *)lParam;
-
-    // is it a message from the header?
-    if ( nmhdr->hwndFrom != (HWND)m_hWnd )
-        return wxWindow::MSWOnNotify(idCtrl, lParam, result);
-
-    NMHEADER *nmHDR = (NMHEADER *)nmhdr;
-    switch ( nmhdr->code )
+    unsigned int col_last = col_start;
+    unsigned int x_last = x_start;
+    for (; col_last < cols; col_last++)

     {
     {

-        case HDN_BEGINTRACK:
-            // user has started to resize a column:
-            // do we need to veto it?
-            if (!GetColumn(nmHDR->iItem)->IsResizeable())
-            {
-                // veto it!
-                *result = TRUE;
-            }
-            break;
-
-        case HDN_BEGINDRAG:
-            // user has started to reorder a column
-            break;
-
-        case HDN_ITEMCHANGING:
-            if (nmHDR->pitem != NULL &&
-                (nmHDR->pitem->mask & HDI_WIDTH) != 0)
-            {
-                int minWidth = GetColumnFromHeader(nmHDR)->GetMinWidth();
-                if (nmHDR->pitem->cxy < minWidth)
-                {
-                    // do not allow the user to resize this column under
-                    // its minimal width:
-                    *result = TRUE;
-                }
-            }
-            break;
-
-        case HDN_ITEMCHANGED:   // user is resizing a column
-        case HDN_ENDTRACK:      // user has finished resizing a column
-        case HDN_ENDDRAG:       // user has finished reordering a column
-
-            // update the width of the modified column:
-            if (nmHDR->pitem != NULL &&
-                (nmHDR->pitem->mask & HDI_WIDTH) != 0)
-            {
-                unsigned int idx = GetColumnIdxFromHeader(nmHDR);
-                unsigned int w = nmHDR->pitem->cxy;
-                wxDataViewColumn *col = GetColumn(idx);
-
-                // see UpdateDisplay() for more info about COLUMN_WIDTH_OFFSET
-                if (idx == 0 && w > COLUMN_WIDTH_OFFSET)
-                    w -= COLUMN_WIDTH_OFFSET;
-
-                if (w >= (unsigned)col->GetMinWidth())
-                    col->SetInternalWidth(w);
-            }
-            break;
-
-        case HDN_ITEMCLICK:
-            {
-                unsigned int idx = GetColumnIdxFromHeader(nmHDR);
-                wxDataViewModel * model = GetOwner()->GetModel();
-
-                if(nmHDR->iButton == 0)
-                {
-                    wxDataViewColumn *col = GetColumn(idx);
-                    if(col->IsSortable())
-                    {
-                        if(model && m_owner->GetSortingColumn() == col)
-                        {
-                            bool order = col->IsSortOrderAscending();
-                            col->SetSortOrder(!order);
-                        }
-                        else if(model)
-                        {
-                            m_owner->SetSortingColumn(col);
-                        }
-                    }
-                    UpdateDisplay();
-                    if(model)
-                        model->Resort();
-                }
-
-                wxEventType evt = nmHDR->iButton == 0 ?
-                        wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK :
-                        wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK;
-                SendEvent(evt, idx);
-            }
-            break;
-
-        case NM_RCLICK:
-            {
-                // NOTE: for some reason (i.e. for a bug in Windows)
-                //       the HDN_ITEMCLICK notification is not sent on
-                //       right clicks, so we need to handle NM_RCLICK
-
-                POINT ptClick;
-                int column = wxMSWGetColumnClicked(nmhdr, &ptClick);
-                if (column != wxNOT_FOUND)
-                {
-                    HDITEM item;
-                    item.mask = HDI_LPARAM;
-                    Header_GetItem((HWND)m_hWnd, column, &item);
-
-                    // 'idx' may be different from 'column' if there are
-                    // hidden columns...
-                    unsigned int idx = (unsigned int)item.lParam;
-                    SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK,
-                              idx);
-                }
-            }
-            break;
-
-        case HDN_GETDISPINFOW:
-            // see wxListCtrl::MSWOnNotify for more info!
-            break;
+        wxDataViewColumn *col = GetOwner()->GetColumnAt(col_last);
+        if (col->IsHidden())
+            continue;      // skip it!

 
 

-        case HDN_ITEMDBLCLICK:
-            {
-                unsigned int idx = GetColumnIdxFromHeader(nmHDR);
-                int w = GetOwner()->GetBestColumnWidth(idx);
-
-                // update the native control:
-                HDITEM hd;
-                ZeroMemory(&hd, sizeof(hd));
-                hd.mask = HDI_WIDTH;
-                hd.cxy = w;
-                Header_SetItem(GetHwnd(),
-                               nmHDR->iItem,  // NOTE: we don't want 'idx' here!
-                               &hd);
-
-                // update the wxDataViewColumn class:
-                GetColumn(idx)->SetInternalWidth(w);
-            }
+        if (x_last > (unsigned int)update.GetRight())

             break;
 
             break;
 

-        default:
-            return wxWindow::MSWOnNotify(idCtrl, lParam, result);
+        x_last += col->GetWidth();

     }
 
     }
 

-    return true;
-}
-
-void wxDataViewHeaderWindowMSW::ScrollWindow(int WXUNUSED(dx), int WXUNUSED(dy),
-                                             const wxRect *WXUNUSED(rect))
-{
-    wxSize ourSz = GetClientSize();
-    wxSize ownerSz = m_owner->GetClientSize();
-
-    // where should the (logical) origin of this window be placed?
-    int x1 = 0, y1 = 0;
-    m_owner->CalcUnscrolledPosition(0, 0, &x1, &y1);
-
-    // put this window on top of our parent and
-    SetWindowPos((HWND)m_hWnd, HWND_TOP, -x1, 0,
-                  ownerSz.GetWidth() + x1, ourSz.GetHeight(),
-                  SWP_SHOWWINDOW);
-}
-
-void wxDataViewHeaderWindowMSW::DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
-                                          int WXUNUSED(w), int WXUNUSED(h),
-                                          int WXUNUSED(f))
-{
-    // the wxDataViewCtrl's internal wxBoxSizer will call this function when
-    // the wxDataViewCtrl window gets resized: the following dummy call
-    // to ScrollWindow() is required in order to get this header window
-    // correctly repainted when it's (horizontally) scrolled:
-
-    ScrollWindow(0, 0);
-}
-
-#else       // !defined(__WXMSW__)
-
-IMPLEMENT_ABSTRACT_CLASS(wxGenericDataViewHeaderWindow, wxWindow)
-BEGIN_EVENT_TABLE(wxGenericDataViewHeaderWindow, wxWindow)
-    EVT_PAINT         (wxGenericDataViewHeaderWindow::OnPaint)
-    EVT_MOUSE_EVENTS  (wxGenericDataViewHeaderWindow::OnMouse)
-    EVT_SET_FOCUS     (wxGenericDataViewHeaderWindow::OnSetFocus)
-END_EVENT_TABLE()
-
-bool wxGenericDataViewHeaderWindow::Create(wxDataViewCtrl *parent, wxWindowID id,
-                                           const wxPoint &pos, const wxSize &size,
-                                           const wxString &name )
-{
-    m_owner = parent;
-
-    if (!wxDataViewHeaderWindowBase::Create(parent, id, pos, size, name))
-        return false;
-
-    wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes();
-    SetBackgroundStyle( wxBG_STYLE_CUSTOM );
-    SetOwnForegroundColour( attr.colFg );
-    SetOwnBackgroundColour( attr.colBg );
-    if (!m_hasFont)
-        SetOwnFont( attr.font );
-
-    // set our size hints: wxDataViewCtrl will put this wxWindow inside
-    // a wxBoxSizer and in order to avoid super-big header windows,
-    // we need to set our height as fixed
-    SetMinSize(wxSize(-1, HEADER_WINDOW_HEIGHT));
-    SetMaxSize(wxSize(-1, HEADER_WINDOW_HEIGHT));
-
-    return true;
-}
-
-void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
-{
-    int w, h;
-    GetClientSize( &w, &h );
+    // Draw horizontal rules if required
+    if ( m_owner->HasFlag(wxDV_HORIZ_RULES) )
+    {
+        dc.SetPen(m_penRule);
+        dc.SetBrush(*wxTRANSPARENT_BRUSH);

 
 

-    wxAutoBufferedPaintDC dc( this );
+        for (unsigned int i = item_start; i <= item_last+1; i++)
+        {
+            int y = GetLineStart( i );
+            dc.DrawLine(x_start, y, x_last, y);
+        }
+    }

 
 

-    dc.SetBackground(GetBackgroundColour());
-    dc.Clear();
+    // Draw vertical rules if required
+    if ( m_owner->HasFlag(wxDV_VERT_RULES) )
+    {
+        dc.SetPen(m_penRule);
+        dc.SetBrush(*wxTRANSPARENT_BRUSH);

 
 

-    int xpix;
-    m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
+        int x = x_start;
+        for (unsigned int i = col_start; i < col_last; i++)
+        {
+            wxDataViewColumn *col = GetOwner()->GetColumnAt(i);
+            if (col->IsHidden())
+                continue;       // skip it

 
 

-    int x;
-    m_owner->GetViewStart( &x, NULL );
+            dc.DrawLine(x, GetLineStart( item_start ),
+                        x, GetLineStart( item_last ) );

 
 

-    // account for the horz scrollbar offset
-    dc.SetDeviceOrigin( -x * xpix, 0 );
+            x += col->GetWidth();
+        }

 
 

-    dc.SetFont( GetFont() );
+        // Draw last vertical rule
+        dc.DrawLine(x, GetLineStart( item_start ),
+                    x, GetLineStart( item_last ) );
+    }

 
 

-    unsigned int cols = GetOwner()->GetColumnCount();
-    unsigned int i;
-    int xpos = 0;
-    for (i = 0; i < cols; i++)
+    // redraw the background for the items which are selected/current
+    for (unsigned int item = item_start; item < item_last; item++)

     {
     {

-        wxDataViewColumn *col = GetColumn( i );
-        if (col->IsHidden())
-            continue;      // skip it!
-
-        int cw = col->GetWidth();
-        int ch = h;
-
-        wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE;
-        if (col->IsSortable() && GetOwner()->GetSortingColumn() == col)
-        {
-            if (col->IsSortOrderAscending())
-                sortArrow = wxHDR_SORT_ICON_UP;
-            else
-                sortArrow = wxHDR_SORT_ICON_DOWN;
-        }
-        
-        int state = 0;
-        if (m_parent->IsEnabled())
-        {
-            if ((int) i == m_hover)
-                state = wxCONTROL_CURRENT;
-        }
-        else
+        bool selected = m_selection.Index( item ) != wxNOT_FOUND;
+        if (selected || item == m_currentRow)

         {
         {

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

 
 

-        wxRendererNative::Get().DrawHeaderButton
+            wxRect rect( x_start, GetLineStart( item ), x_last, GetLineHeight( item ) );
+            wxRendererNative::Get().DrawItemSelectionRect

                                 (
                                     this,
                                     dc,
                                 (
                                     this,
                                     dc,

-                                    wxRect(xpos, 0, cw, ch-1),
-                                    state,
-                                    sortArrow
+                                    rect,
+                                    flags

                                 );
                                 );

-
-        // align as required the column title:
-        int x = xpos;
-        wxSize titleSz = dc.GetTextExtent(col->GetTitle());
-        switch (col->GetAlignment())
-        {
-        case wxALIGN_LEFT:
-            x += HEADER_HORIZ_BORDER;
-            break;
-        case wxALIGN_RIGHT:
-            x += cw - titleSz.GetWidth() - HEADER_HORIZ_BORDER;
-            break;
-        default:
-        case wxALIGN_CENTER:
-        case wxALIGN_CENTER_HORIZONTAL:
-            x += (cw - titleSz.GetWidth() - 2 * HEADER_HORIZ_BORDER)/2;
-            break;

         }
         }

-
-        // always center the title vertically:
-        int y = wxMax((ch - titleSz.GetHeight()) / 2, HEADER_VERT_BORDER);
-
-        dc.SetClippingRegion( xpos+HEADER_HORIZ_BORDER,
-                              HEADER_VERT_BORDER,
-                              wxMax(cw - 2 * HEADER_HORIZ_BORDER, 1),  // width
-                              wxMax(ch - 2 * HEADER_VERT_BORDER, 1));  // height
-        dc.DrawText( col->GetTitle(), x, y );
-        dc.DestroyClippingRegion();
-
-        xpos += cw;

     }
     }

-}
-
-void wxGenericDataViewHeaderWindow::OnSetFocus( wxFocusEvent &event )
-{
-    GetParent()->SetFocus();
-    event.Skip();
-}
-
-void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event )
-{
-    // we want to work with logical coords
-    int x;
-    m_owner->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL);
-    int y = event.GetY();

 
 

-    if (m_isDragging)
+    wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
+    if (!expander)

     {
     {

-        // we don't draw the line beyond our window,
-        // but we allow dragging it there
-        int w = 0;
-        GetClientSize( &w, NULL );
-        m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
-        w -= 6;
-
-        if (event.ButtonUp())
-        {
-            m_isDragging = false;
-            if (HasCapture())
-                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();
-        }
-
+        // TODO-RTL: last column for RTL support
+        expander = GetOwner()->GetColumnAt( 0 );
+        GetOwner()->SetExpanderColumn(expander);

     }
     }

-    else     // not dragging
+
+    // redraw all cells for all rows which must be repainted and all columns
+    wxRect cell_rect;
+    cell_rect.x = x_start;
+    for (unsigned int i = col_start; i < col_last; i++)

     {
     {

-        m_minX = 0;
-        m_column = wxNOT_FOUND;

 
 

-        bool hit_border = false;
+        wxDataViewColumn *col = GetOwner()->GetColumnAt( i );
+        wxDataViewRenderer *cell = col->GetRenderer();
+        cell_rect.width = col->GetWidth();

 
 

-        // end of the current column
-        int xpos = 0;
+        if (col->IsHidden())
+            continue;       // skip it!

 
 

-        // find the column where this event occured
-        int countCol = m_owner->GetColumnCount();
-        for (int column = 0; column < countCol; column++)
+        for (unsigned int item = item_start; item < item_last; item++)

         {
         {

-            wxDataViewColumn *p = GetColumn(column);
-
-            if (p->IsHidden())
-                continue;   // skip if not shown
+            // get the cell value and set it into the renderer
+            wxVariant value;
+            wxDataViewTreeNode *node = NULL;
+            wxDataViewItem dataitem;

 
 

-            xpos += p->GetWidth();
-            m_column = column;
-            if ((abs(x-xpos) < 3) && (y < 22))
+            if (!IsVirtualList())

             {
             {

-                hit_border = true;
-                break;
-            }
+                node = GetTreeNodeByRow(item);
+                if( node == NULL )
+                    continue;

 
 

-            if (x < xpos)
+                dataitem = node->GetItem();
+
+                if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem))
+                    continue;
+            }
+            else

             {
             {

-                // inside the column
-                break;
+                dataitem = wxDataViewItem( wxUIntToPtr(item) );

             }
 
             }
 

-            m_minX = xpos;
-        }
-        
-        int old_hover = m_hover;
-        m_hover = m_column;
-        if (event.Leaving())
-            m_hover = wxNOT_FOUND;
-        if (old_hover != m_hover)
-            Refresh();
-
-        if (m_column == wxNOT_FOUND)
-            return;
+            model->GetValue( value, dataitem, col->GetModelColumn());
+            cell->SetValue( value );

 
 

-        bool resizeable = GetColumn(m_column)->IsResizeable();
-        if (event.LeftDClick() && resizeable)
-        {
-            GetColumn(m_column)->SetWidth(GetOwner()->GetBestColumnWidth(m_column));
-            Refresh();
-        }
-        else if (event.LeftDown() || event.RightUp())
-        {
-            if (hit_border && event.LeftDown() && resizeable)
+            if (cell->GetWantsAttr())

             {
             {

-                m_isDragging = true;
-                CaptureMouse();
-                m_currentX = x;
+                wxDataViewItemAttr attr;
+                bool ret = model->GetAttr( dataitem, col->GetModelColumn(), attr );
+                if (ret)
+                    cell->SetAttr( attr );
+                cell->SetHasAttr( ret );

             }
             }

-            else    // click on a column
+
+            // update cell_rect
+            cell_rect.y = GetLineStart( item );
+            cell_rect.height = GetLineHeight( item );     // -1 is for the horizontal rules (?)
+
+            //Draw the expander here.
+            int indent = 0;
+            if ((!IsVirtualList()) && (col == expander))

             {
             {

-                wxDataViewModel * model = GetOwner()->GetModel();
-                wxEventType evt = event.LeftDown() ?
-                        wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK :
-                        wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK;
-                SendEvent(evt, m_column);
-
-                //Left click the header
-                if(event.LeftDown())
+                indent = node->GetIndentLevel();
+
+                //Calculate the indent first
+                indent = cell_rect.x + GetOwner()->GetIndent() * indent;
+
+                int expander_width = m_lineHeight - 2*EXPANDER_MARGIN;
+                // change the cell_rect.x to the appropriate pos
+                int  expander_x = indent + EXPANDER_MARGIN;
+                int expander_y = cell_rect.y + EXPANDER_MARGIN + (GetLineHeight(item) / 2) - (expander_width/2) - EXPANDER_OFFSET;
+                indent = indent + m_lineHeight;  //try to use the m_lineHeight as the expander space
+                dc.SetPen( m_penExpander );
+                dc.SetBrush( wxNullBrush );
+                if( node->HasChildren() )

                 {
                 {

-                    wxDataViewColumn *col = GetColumn(m_column);
-                    if(col->IsSortable())
+                    wxRect rect( expander_x , expander_y, expander_width, expander_width);
+                    int flag = 0;
+                    if (m_underMouse == node)

                     {
                     {

-                        wxDataViewColumn* sortCol = m_owner->GetSortingColumn();
-                        if(model && sortCol == col)
-                        {
-                            bool order = col->IsSortOrderAscending();
-                            col->SetSortOrder(!order);
-                        }
-                        else if(model)
-                        {
-                            m_owner->SetSortingColumn(col);
-                        }
+                        flag |= wxCONTROL_CURRENT;

                     }
                     }

-                    UpdateDisplay();
-                    if(model)
-                        model->Resort();
-                    //Send the column sorted event
-                    SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, m_column);
+                    if( node->IsOpen() )
+                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag|wxCONTROL_EXPANDED );
+                    else
+                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);

                 }
                 }

+                 //force the expander column to left-center align
+                 cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
+            }
+            if (node && !node->HasChildren())
+            {
+                // Yes, if the node does not have any child, it must be a leaf which
+                // mean that it is a temporarily created by GetTreeNodeByRow
+                wxDELETE(node);

             }
             }

-        }
-        else if (event.Moving())
-        {
-            if (hit_border && resizeable)
-                m_currentCursor = m_resizeCursor;
-            else
-                m_currentCursor = wxSTANDARD_CURSOR;
-
-            SetCursor(*m_currentCursor);
-        }
-    }
-}
-
-//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);
-
-    int x2 = m_currentX-1;
-#ifdef __WXMSW__
-    ++x2; // but why ????
-#endif
-    int y2 = 0;
-    m_owner->GetClientSize( NULL, &y2 );
-    m_owner->ClientToScreen( &x2, &y2 );
-
-    wxScreenDC dc;
-    dc.SetLogicalFunction(wxINVERT);
-    dc.SetPen(m_penCurrent);
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    AdjustDC(dc);
-    dc.DrawLine(x1, y1, x2, y2 );
-#endif
-}
-
-void wxGenericDataViewHeaderWindow::AdjustDC(wxDC& dc)
-{
-    int xpix, x;
-
-    m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
-    m_owner->GetViewStart( &x, NULL );
-
-    // shift the DC origin to match the position of the main window horizontal
-    // scrollbar: this allows us to always use logical coords
-    dc.SetDeviceOrigin( -x * xpix, 0 );
-}
-
-#endif      // defined(__WXMSW__)
-
-//-----------------------------------------------------------------------------
-// wxDataViewRenameTimer
-//-----------------------------------------------------------------------------
-
-wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner )
-{
-    m_owner = owner;
-}
-
-void wxDataViewRenameTimer::Notify()
-{
-    m_owner->OnRenameTimer();
-}
-
-//-----------------------------------------------------------------------------
-// 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;
-    if (row1 == row2) return 0;
-    return -1;
-}
-
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow)
-
-BEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow)
-    EVT_PAINT         (wxDataViewMainWindow::OnPaint)
-    EVT_MOUSE_EVENTS  (wxDataViewMainWindow::OnMouse)
-    EVT_SET_FOCUS     (wxDataViewMainWindow::OnSetFocus)
-    EVT_KILL_FOCUS    (wxDataViewMainWindow::OnKillFocus)
-    EVT_CHAR          (wxDataViewMainWindow::OnChar)
-END_EVENT_TABLE()
-
-wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID id,
-    const wxPoint &pos, const wxSize &size, const wxString &name ) :
-    wxWindow( parent, id, pos, size, wxWANTS_CHARS, name ),
-    m_selection( wxDataViewSelectionCmp )
-
-{
-    SetOwner( parent );
-
-    m_lastOnSame = false;
-    m_renameTimer = new wxDataViewRenameTimer( this );

 
 

-    // TODO: user better initial values/nothing selected
-    m_currentCol = NULL;
-    m_currentRow = 0;
+            // cannot be bigger than allocated space
+            wxSize size = cell->GetSize();
+            // Because of the tree structure indent, here we should minus the width of the cell for drawing
+            size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent );
+            // size.y = wxMin( size.y, cell_rect.height );
+            size.y = cell_rect.height;

 
 

-    // TODO: we need to calculate this smartly
-    m_lineHeight =
-#ifdef __WXMSW__
-        17;
-#else
-        20;
-#endif
+            wxRect item_rect(cell_rect.GetTopLeft(), size);
+            int align = cell->CalculateAlignment();

 
 

-    m_dragCount = 0;
-    m_dragStart = wxPoint(0,0);
-    m_lineLastClicked = (unsigned int) -1;
-    m_lineBeforeLastClicked = (unsigned int) -1;
-    m_lineSelectSingleOnUp = (unsigned int) -1;
+            // horizontal alignment:
+            item_rect.x = cell_rect.x;
+            if (align & wxALIGN_CENTER_HORIZONTAL)
+                item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2);
+            else if (align & wxALIGN_RIGHT)
+                item_rect.x = cell_rect.x + cell_rect.width - size.x;
+            //else: wxALIGN_LEFT is the default

 
 

-    m_hasFocus = false;
+            // vertical alignment:
+            item_rect.y = cell_rect.y;
+            if (align & wxALIGN_CENTER_VERTICAL)
+                item_rect.y = cell_rect.y + (cell_rect.height / 2) - (size.y / 2);
+            else if (align & wxALIGN_BOTTOM)
+                item_rect.y = cell_rect.y + cell_rect.height - size.y;
+            //else: wxALIGN_TOP is the default

 
 

-    SetBackgroundStyle( wxBG_STYLE_CUSTOM );
-    SetBackgroundColour( *wxWHITE );
+            // add padding
+            item_rect.x += PADDING_RIGHTLEFT;
+            item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;

 
 

-    m_penRule = wxPen(GetRuleColour(), 1, wxSOLID);
+            //Here we add the tree indent
+            item_rect.x += indent;

 
 

-    //Here I compose a pen can draw black lines, maybe there are something system colour to use
-    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);
+            int state = 0;
+            if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND))
+                state |= wxDATAVIEW_CELL_SELECTED;

 
 

-    //Make m_count = -1 will cause the class recaculate the real displaying number of rows.
-    m_count = -1 ;
-    m_underMouse = NULL;
-    UpdateDisplay();
-}
+            // TODO: it would be much more efficient to create a clipping
+            //       region for the entire column being rendered (in the OnPaint
+            //       of wxDataViewMainWindow) instead of a single clip region for
+            //       each cell. However it would mean that each renderer should
+            //       respect the given wxRect's top & bottom coords, eventually
+            //       violating only the left & right coords - however the user can
+            //       make its own renderer and thus we cannot be sure of that.
+            dc.SetClippingRegion( item_rect );
+            cell->Render( item_rect, &dc, state );
+            dc.DestroyClippingRegion();
+        }

 
 

-wxDataViewMainWindow::~wxDataViewMainWindow()
-{
-    DestroyTree();
-    delete m_renameTimer;
+        cell_rect.x += cell_rect.width;
+    }

 }
 
 void wxDataViewMainWindow::OnRenameTimer()
 }
 
 void wxDataViewMainWindow::OnRenameTimer()


@@ -1948,7 +1485,7 @@ void wxDataViewMainWindow::OnRenameTimer()
     unsigned int i;
     for (i = 0; i < cols; i++)
     {
     unsigned int i;
     for (i = 0; i < cols; i++)
     {

-        wxDataViewColumn *c = GetOwner()->GetColumn( i );
+        wxDataViewColumn *c = GetOwner()->GetColumnAt( i );

         if (c->IsHidden())
             continue;      // skip it!
 
         if (c->IsHidden())
             continue;      // skip it!
 


@@ -1956,8 +1493,10 @@ void wxDataViewMainWindow::OnRenameTimer()
             break;
         xpos += c->GetWidth();
     }
             break;
         xpos += c->GetWidth();
     }

-    wxRect labelRect( xpos, m_currentRow * m_lineHeight,
-                      m_currentCol->GetWidth(), m_lineHeight );
+    wxRect labelRect( xpos,
+                      GetLineStart( m_currentRow ),
+                      m_currentCol->GetWidth(),
+                      GetLineHeight( m_currentRow ) );

 
     GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y,
                                      &labelRect.x, &labelRect.y);
 
     GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y,
                                      &labelRect.x, &labelRect.y);


@@ -1973,15 +1512,15 @@ void wxDataViewMainWindow::OnRenameTimer()
 class DoJob
 {
 public:
 class DoJob
 {
 public:

-    DoJob(){};
-    virtual ~DoJob(){};
+    DoJob() { }
+    virtual ~DoJob() { }

 
     //The return value control how the tree-walker tranverse the tree
     // 0: Job done, stop tranverse and return
     // 1: Ignore the current node's subtree and continue
     // 2: Job not done, continue
     enum  { OK = 0 , IGR = 1, CONT = 2 };
 
     //The return value control how the tree-walker tranverse the tree
     // 0: Job done, stop tranverse and return
     // 1: Ignore the current node's subtree and continue
     // 2: Job not done, continue
     enum  { OK = 0 , IGR = 1, CONT = 2 };

-    virtual int operator() ( wxDataViewTreeNode * node ) = 0 ;
+    virtual int operator() ( wxDataViewTreeNode * node ) = 0;

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


@@ -1993,12 +1532,12 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func )
     switch( func( node ) )
     {
         case DoJob::OK :
     switch( func( node ) )
     {
         case DoJob::OK :

-            return true ;
+            return true;

         case DoJob::IGR:
             return false;
         case DoJob::CONT:
         case DoJob::IGR:
             return false;
         case DoJob::CONT:

-            default:
-                ;
+        default:
+            ;

     }
 
     wxDataViewTreeNodes nodes = node->GetNodes();
     }
 
     wxDataViewTreeNodes nodes = node->GetNodes();


@@ -2008,7 +1547,7 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func )
     int len = leaves.GetCount();
     int i = 0, nodes_i = 0;
 
     int len = leaves.GetCount();
     int i = 0, nodes_i = 0;
 

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

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


@@ -2024,12 +1563,12 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func )
             switch( func( n ) )
             {
                 case DoJob::OK :
             switch( func( n ) )
             {
                 case DoJob::OK :

-                    return true ;
+                    return true;

                 case DoJob::IGR:
                     continue;
                 case DoJob::CONT:
                 default:
                 case DoJob::IGR:
                     continue;
                 case DoJob::CONT:
                 default:

-                    ;
+                   ;

             }
     }
     return false;
             }
     }
     return false;


@@ -2037,6 +1576,13 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func )
 
 bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item)
 {
 
 bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item)
 {

+    if (!m_root)
+    {
+        m_count++;
+        UpdateDisplay();
+        return true;
+    }
+

     SortPrepare();
 
     wxDataViewTreeNode * node;
     SortPrepare();
 
     wxDataViewTreeNode * node;


@@ -2065,11 +1611,24 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
     return true;
 }
 
     return true;
 }
 

-void DestroyTreeHelper( wxDataViewTreeNode * node);
+static void DestroyTreeHelper( wxDataViewTreeNode * node);

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

+    if (!m_root)
+    {
+        m_count--;
+        if( m_currentRow > GetRowCount() )
+            m_currentRow = m_count - 1;
+
+        m_selection.Empty();
+
+        UpdateDisplay();
+
+        return true;
+    }
+

     wxDataViewTreeNode * node = FindNode(parent);
 
     wxCHECK_MSG( node != NULL, false, "item not found" );
     wxDataViewTreeNode * node = FindNode(parent);
 
     wxCHECK_MSG( node != NULL, false, "item not found" );


@@ -2097,7 +1656,7 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
         wxDataViewTreeNode * n = NULL;
         wxDataViewTreeNodes nodes = node->GetNodes();
         int len = nodes.GetCount();
         wxDataViewTreeNode * n = NULL;
         wxDataViewTreeNodes nodes = node->GetNodes();
         int len = nodes.GetCount();

-        for( int i = 0 ; i < len; i ++)
+        for( int i = 0; i < len; i ++)

         {
             if( nodes[i]->GetItem() == item )
             {
         {
             if( nodes[i]->GetItem() == item )
             {


@@ -2110,16 +1669,11 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
 
         node->GetNodes().Remove( n );
         sub -= n->GetSubTreeCount();
 
         node->GetNodes().Remove( n );
         sub -= n->GetSubTreeCount();

-        DestroyTreeHelper(n);
+        ::DestroyTreeHelper(n);

     }
     //Make the row number invalid and get a new valid one when user call GetRowCount
     m_count = -1;
     node->ChangeSubTreeCount(sub);
     }
     //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() )
 
     //Change the current row to the last row if the current exceed the max row number
     if( m_currentRow > GetRowCount() )


@@ -2142,7 +1696,7 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
     le.SetModel(GetOwner()->GetModel());
     le.SetItem(item);
     parent->GetEventHandler()->ProcessEvent(le);
     le.SetModel(GetOwner()->GetModel());
     le.SetItem(item);
     parent->GetEventHandler()->ProcessEvent(le);

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -2175,9 +1729,11 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
 
 bool wxDataViewMainWindow::Cleared()
 {
 
 bool wxDataViewMainWindow::Cleared()
 {

+    DestroyTree();
+

     SortPrepare();
     SortPrepare();

+    BuildTree( GetOwner()->GetModel() );

 
 

-    DestroyTree();

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


@@ -2209,7 +1765,7 @@ void wxDataViewMainWindow::RecalculateDisplay()
     }
 
     int width = GetEndOfLastCol();
     }
 
     int width = GetEndOfLastCol();

-    int height = GetRowCount() * m_lineHeight;
+    int height = GetLineStart( GetRowCount() );

 
     SetVirtualSize( width, height );
     GetOwner()->SetScrollRate( 10, m_lineHeight );
 
     SetVirtualSize( width, height );
     GetOwner()->SetScrollRate( 10, m_lineHeight );


@@ -2229,278 +1785,37 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column )
 {
     int x, y;
     m_owner->GetScrollPixelsPerUnit( &x, &y );
 {
     int x, y;
     m_owner->GetScrollPixelsPerUnit( &x, &y );

-    int sy = rows*m_lineHeight/y;
+    int sy = GetLineStart( rows )/y;

     int sx = 0;
     if( column != -1 )
     int sx = 0;
     if( column != -1 )

-    {
-        wxRect rect = GetClientRect();
-        int colnum = 0;
-        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) )
-{
-    wxDataViewModel *model = GetOwner()->GetModel();
-    wxAutoBufferedPaintDC dc( this );
-
-    // prepare the DC
-    dc.SetBackground(GetBackgroundColour());
-    dc.Clear();
-    GetOwner()->PrepareDC( dc );
-    dc.SetFont( GetFont() );
-
-    wxRect update = GetUpdateRegion().GetBox();
-    m_owner->CalcUnscrolledPosition( update.x, update.y, &update.x, &update.y );
-
-    // compute which items needs to be redrawn
-    unsigned int item_start = wxMax( 0, (update.y / m_lineHeight) );
-    unsigned int item_count =
-        wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1),
-               (int)(GetRowCount( )- item_start) );
-    unsigned int item_last = item_start + item_count;
-
-    // compute which columns needs to be redrawn
-    unsigned int cols = GetOwner()->GetColumnCount();
-    unsigned int col_start = 0;
-    unsigned int x_start = 0;
-    for (x_start = 0; col_start < cols; col_start++)
-    {
-        wxDataViewColumn *col = GetOwner()->GetColumn(col_start);
-        if (col->IsHidden())
-            continue;      // skip it!
-
-        unsigned int w = col->GetWidth();
-        if (x_start+w >= (unsigned int)update.x)
-            break;
-
-        x_start += w;
-    }
-
-    unsigned int col_last = col_start;
-    unsigned int x_last = x_start;
-    for (; col_last < cols; col_last++)
-    {
-        wxDataViewColumn *col = GetOwner()->GetColumn(col_last);
-        if (col->IsHidden())
-            continue;      // skip it!
-
-        if (x_last > (unsigned int)update.GetRight())
-            break;
-
-        x_last += col->GetWidth();
-    }
-
-    // Draw horizontal rules if required
-    if ( m_owner->HasFlag(wxDV_HORIZ_RULES) )
-    {
-        dc.SetPen(m_penRule);
-        dc.SetBrush(*wxTRANSPARENT_BRUSH);
-
-        for (unsigned int i = item_start; i <= item_last+1; i++)
-        {
-            int y = i * m_lineHeight;
-            dc.DrawLine(x_start, y, x_last, y);
-        }
-    }
-
-    // Draw vertical rules if required
-    if ( m_owner->HasFlag(wxDV_VERT_RULES) )
-    {
-        dc.SetPen(m_penRule);
-        dc.SetBrush(*wxTRANSPARENT_BRUSH);
-
-        int x = x_start;
-        for (unsigned int i = col_start; i < col_last; i++)
-        {
-            wxDataViewColumn *col = GetOwner()->GetColumn(i);
-            if (col->IsHidden())
-                continue;       // skip it
-
-            dc.DrawLine(x, item_start * m_lineHeight,
-                        x, item_last * m_lineHeight);
-
-            x += col->GetWidth();
-        }
-
-        // Draw last vertical rule
-        dc.DrawLine(x, item_start * m_lineHeight,
-                    x, item_last * m_lineHeight);
-    }
-
-    // redraw the background for the items which are selected/current
-    for (unsigned int item = item_start; item < item_last; item++)
-    {
-        bool selected = m_selection.Index( item ) != wxNOT_FOUND;
-        if (selected || item == m_currentRow)
-        {
-            int flags = selected ? (int)wxCONTROL_SELECTED : 0;
-            if (item == m_currentRow)
-                flags |= wxCONTROL_CURRENT;
-            if (m_hasFocus)
-                flags |= wxCONTROL_FOCUSED;
-
-            wxRect rect( x_start, item*m_lineHeight, x_last, m_lineHeight );
-            wxRendererNative::Get().DrawItemSelectionRect
-                                (
-                                    this,
-                                    dc,
-                                    rect,
-                                    flags
-                                );
-        }
-    }
-
-    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;
-    cell_rect.height = m_lineHeight;        // -1 is for the horizontal rules
-    for (unsigned int i = col_start; i < col_last; i++)
-    {
-        wxDataViewColumn *col = GetOwner()->GetColumn( i );
-        wxDataViewRenderer *cell = col->GetRenderer();
-        cell_rect.width = col->GetWidth();
-
-        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;
-         }
-
-            wxDataViewItem dataitem = node->GetItem();
-             model->GetValue( value, dataitem, col->GetModelColumn());
-            cell->SetValue( value );
-
-            // update the y offset
-            cell_rect.y = item * m_lineHeight;
-
-            //Draw the expander here.
-            int indent = node->GetIndentLevel();
-            if( col == expander )
-            {
-                //Calculate the indent first
-                indent = cell_rect.x + GetOwner()->GetIndent() * indent;
-
-                int expander_width = m_lineHeight - 2*EXPANDER_MARGIN;
-                // change the cell_rect.x to the appropriate pos
-                int  expander_x = indent + EXPANDER_MARGIN , expander_y = cell_rect.y + EXPANDER_MARGIN ;
-                indent = indent + m_lineHeight ;  //try to use the m_lineHeight as the expander space
-                dc.SetPen( m_penExpander );
-                dc.SetBrush( wxNullBrush );
-                if( node->HasChildren() )
-                {
-                    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, flag|wxCONTROL_EXPANDED );
-                    else
-                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
-                }
-                else
-                {
-                     // 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 );
-            }
-
-
-            // cannot be bigger than allocated space
-            wxSize size = cell->GetSize();
-            // Because of the tree structure indent, here we should minus the width of the cell for drawing
-            size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent );
-            size.y = wxMin( size.y, cell_rect.height );
-
-            wxRect item_rect(cell_rect.GetTopLeft(), size);
-            int align = cell->GetAlignment();
-
-            // horizontal alignment:
-            item_rect.x = cell_rect.x;
-            if (align & wxALIGN_CENTER_HORIZONTAL)
-                item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2);
-            else if (align & wxALIGN_RIGHT)
-                item_rect.x = cell_rect.x + cell_rect.width - size.x;
-            //else: wxALIGN_LEFT is the default
-
-            // vertical alignment:
-            item_rect.y = cell_rect.y;
-            if (align & wxALIGN_CENTER_VERTICAL)
-                item_rect.y = cell_rect.y + (cell_rect.height / 2) - (size.y / 2);
-            else if (align & wxALIGN_BOTTOM)
-                item_rect.y = cell_rect.y + cell_rect.height - size.y;
-            //else: wxALIGN_TOP is the default
-
-            // add padding
-            item_rect.x += PADDING_RIGHTLEFT;
-            item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;
-
-            //Here we add the tree indent
-            item_rect.x += indent;
-
-            int state = 0;
-            if (m_selection.Index(item) != wxNOT_FOUND)
-                state |= wxDATAVIEW_CELL_SELECTED;
+    {
+        wxRect rect = GetClientRect();
+        int colnum = 0;
+        int x_start, 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()->GetColumnAt(colnum);
+            if (col->IsHidden())
+                continue;      // skip it!

 
 

-            // TODO: it would be much more efficient to create a clipping
-            //       region for the entire column being rendered (in the OnPaint
-            //       of wxDataViewMainWindow) instead of a single clip region for
-            //       each cell. However it would mean that each renderer should
-            //       respect the given wxRect's top & bottom coords, eventually
-            //       violating only the left & right coords - however the user can
-            //       make its own renderer and thus we cannot be sure of that.
-            dc.SetClippingRegion( item_rect );
-            cell->Render( item_rect, &dc, state );
-            dc.DestroyClippingRegion();
+            w = col->GetWidth();
+            x_start += w;

         }
 
         }
 

-        cell_rect.x += cell_rect.width;
+        int 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 );

 }
 
 int wxDataViewMainWindow::GetCountPerPage() const
 }
 
 int wxDataViewMainWindow::GetCountPerPage() const


@@ -2516,7 +1831,7 @@ int wxDataViewMainWindow::GetEndOfLastCol() const
     for (i = 0; i < GetOwner()->GetColumnCount(); i++)
     {
         const wxDataViewColumn *c =
     for (i = 0; i < GetOwner()->GetColumnCount(); i++)
     {
         const wxDataViewColumn *c =

-            wx_const_cast(wxDataViewCtrl*, GetOwner())->GetColumn( i );
+            const_cast<wxDataViewCtrl*>(GetOwner())->GetColumnAt( i );

 
         if (!c->IsHidden())
             width += c->GetWidth();
 
         if (!c->IsHidden())
             width += c->GetWidth();


@@ -2530,7 +1845,7 @@ unsigned int wxDataViewMainWindow::GetFirstVisibleRow() const
     int y = 0;
     m_owner->CalcUnscrolledPosition( x, y, &x, &y );
 
     int y = 0;
     m_owner->CalcUnscrolledPosition( x, y, &x, &y );
 

-    return y / m_lineHeight;
+    return GetLineAt( y );

 }
 
 unsigned int wxDataViewMainWindow::GetLastVisibleRow()
 }
 
 unsigned int wxDataViewMainWindow::GetLastVisibleRow()


@@ -2540,7 +1855,7 @@ unsigned int wxDataViewMainWindow::GetLastVisibleRow()
                                      &client_size.x, &client_size.y );
 
     //we should deal with the pixel here
                                      &client_size.x, &client_size.y );
 
     //we should deal with the pixel here

-    unsigned int row = ((client_size.y)/m_lineHeight) - 1;
+    unsigned int row = GetLineAt(client_size.y) - 1;

 
     return wxMin( GetRowCount()-1, row );
 }
 
     return wxMin( GetRowCount()-1, row );
 }


@@ -2550,11 +1865,7 @@ unsigned int wxDataViewMainWindow::GetRowCount()
     if ( m_count == -1 )
     {
         m_count = RecalculateCount();
     if ( m_count == -1 )
     {
         m_count = RecalculateCount();

-        int width, height;
-        GetVirtualSize( &width, &height );
-        height = m_count * m_lineHeight;
-
-        SetVirtualSize( width, height );
+        UpdateDisplay();

     }
     return m_count;
 }
     }
     return m_count;
 }


@@ -2678,7 +1989,7 @@ void wxDataViewMainWindow::SendSelectionChangedEvent( const wxDataViewItem& item
 
 void wxDataViewMainWindow::RefreshRow( unsigned int row )
 {
 
 void wxDataViewMainWindow::RefreshRow( unsigned int row )
 {

-    wxRect rect( 0, row*m_lineHeight, GetEndOfLastCol(), m_lineHeight );
+    wxRect rect( 0, GetLineStart( row ), GetEndOfLastCol(), GetLineHeight( row ) );

     m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
 
     wxSize client_size = GetClientSize();
     m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
 
     wxSize client_size = GetClientSize();


@@ -2697,7 +2008,7 @@ void wxDataViewMainWindow::RefreshRows( unsigned int from, unsigned int to )
         from = tmp;
     }
 
         from = tmp;
     }
 

-    wxRect rect( 0, from*m_lineHeight, GetEndOfLastCol(), (to-from+1) * m_lineHeight );
+    wxRect rect( 0, GetLineStart( from ), GetEndOfLastCol(), GetLineStart( (to-from+1) ) );

     m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
 
     wxSize client_size = GetClientSize();
     m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
 
     wxSize client_size = GetClientSize();


@@ -2709,18 +2020,14 @@ void wxDataViewMainWindow::RefreshRows( unsigned int from, unsigned int to )
 
 void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow )
 {
 
 void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow )
 {

-    unsigned int count = GetRowCount();
-    if (firstRow > count)
-        return;
+    wxSize client_size = GetClientSize();
+    int start = GetLineStart( firstRow );
+    m_owner->CalcScrolledPosition( start, 0, &start, NULL );
+    if (start > client_size.y) return;

 
 

-    wxRect rect( 0, firstRow*m_lineHeight, GetEndOfLastCol(), count * m_lineHeight );
-    m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+    wxRect rect( 0, start, client_size.x, client_size.y - start );

 
 

-    wxSize client_size = GetClientSize();
-    wxRect client_rect( 0, 0, client_size.x, client_size.y );
-    wxRect intersect_rect = client_rect.Intersect( rect );
-    if (intersect_rect.width > 0)
-        Refresh( true, &intersect_rect );
+    Refresh( true, &rect );

 }
 
 void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event)
 }
 
 void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event)


@@ -2779,25 +2086,189 @@ wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const
 {
     wxRect rect;
     rect.x = 0;
 {
     wxRect rect;
     rect.x = 0;

-    rect.y = m_lineHeight * row;
+    rect.y = GetLineStart( row );

     rect.width = GetEndOfLastCol();
     rect.width = GetEndOfLastCol();

-    rect.height = m_lineHeight;
+    rect.height = GetLineHeight( row );

 
     return rect;
 }
 
 
     return rect;
 }
 

+int wxDataViewMainWindow::GetLineStart( unsigned int row ) const
+{
+    const wxDataViewModel *model = GetOwner()->GetModel();
+
+    if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT)
+    {
+        // TODO make more efficient
+
+        int start = 0;
+
+        unsigned int r;
+        for (r = 0; r < row; r++)
+        {
+            const wxDataViewTreeNode* node = GetTreeNodeByRow(r);
+            if (!node) return start;
+
+            wxDataViewItem item = node->GetItem();
+
+            if (node && !node->HasChildren())
+            {
+                // Yes, if the node does not have any child, it must be a leaf which
+                // mean that it is a temporarily created by GetTreeNodeByRow
+                wxDELETE(node);
+            }
+
+            unsigned int cols = GetOwner()->GetColumnCount();
+            unsigned int col;
+            int height = m_lineHeight;
+            for (col = 0; col < cols; col++)
+            {
+                const wxDataViewColumn *column = GetOwner()->GetColumn(col);
+                if (column->IsHidden())
+                    continue;      // skip it!
+
+                if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item))
+                    continue;      // skip it!
+
+                const wxDataViewRenderer *renderer = column->GetRenderer();
+                wxVariant value;
+                model->GetValue( value, item, column->GetModelColumn() );
+                wxDataViewRenderer *renderer2 = const_cast<wxDataViewRenderer*>(renderer);
+                renderer2->SetValue( value );
+                height = wxMax( height, renderer->GetSize().y );
+            }
+
+
+            start += height;
+        }
+
+        return start;
+    }
+    else
+    {
+        return row * m_lineHeight;
+    }
+}
+
+int wxDataViewMainWindow::GetLineAt( unsigned int y ) const
+{
+    const wxDataViewModel *model = GetOwner()->GetModel();
+
+    // check for the easy case first
+    if ( !GetOwner()->HasFlag(wxDV_VARIABLE_LINE_HEIGHT) )
+        return y / m_lineHeight;
+
+    // TODO make more efficient
+    unsigned int row = 0;
+    unsigned int yy = 0;
+    for (;;)
+    {
+       const wxDataViewTreeNode* node = GetTreeNodeByRow(row);
+       if (!node)
+       {
+           // not really correct...
+           return row + ((y-yy) / m_lineHeight);
+       }
+
+       wxDataViewItem item = node->GetItem();
+
+        if (node && !node->HasChildren())
+        {
+            // Yes, if the node does not have any child, it must be a leaf which
+            // mean that it is a temporarily created by GetTreeNodeByRow
+            wxDELETE(node);
+        }
+
+       unsigned int cols = GetOwner()->GetColumnCount();
+       unsigned int col;
+       int height = m_lineHeight;
+       for (col = 0; col < cols; col++)
+       {
+            const wxDataViewColumn *column = GetOwner()->GetColumn(col);
+            if (column->IsHidden())
+                continue;      // skip it!
+
+            if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item))
+                continue;      // skip it!
+
+            const wxDataViewRenderer *renderer = column->GetRenderer();
+            wxVariant value;
+            model->GetValue( value, item, column->GetModelColumn() );
+            wxDataViewRenderer *renderer2 = const_cast<wxDataViewRenderer*>(renderer);
+            renderer2->SetValue( value );
+            height = wxMax( height, renderer->GetSize().y );
+       }
+
+       yy += height;
+       if (y < yy)
+           return row;
+
+       row++;
+    }
+}
+
+int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
+{
+    const wxDataViewModel *model = GetOwner()->GetModel();
+
+    if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT)
+    {
+        wxASSERT( !IsVirtualList() );
+
+        const wxDataViewTreeNode* node = GetTreeNodeByRow(row);
+        // wxASSERT( node );
+        if (!node) return m_lineHeight;
+
+        wxDataViewItem item = node->GetItem();
+
+        if (node && !node->HasChildren())
+        {
+                // Yes, if the node does not have any child, it must be a leaf which
+                // mean that it is a temporarily created by GetTreeNodeByRow
+             wxDELETE(node);
+        }
+
+        int height = m_lineHeight;
+
+        unsigned int cols = GetOwner()->GetColumnCount();
+        unsigned int col;
+        for (col = 0; col < cols; col++)
+        {
+            const wxDataViewColumn *column = GetOwner()->GetColumn(col);
+            if (column->IsHidden())
+                continue;      // skip it!
+
+            if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item))
+                continue;      // skip it!
+
+            const wxDataViewRenderer *renderer = column->GetRenderer();
+            wxVariant value;
+            model->GetValue( value, item, column->GetModelColumn() );
+            wxDataViewRenderer *renderer2 = const_cast<wxDataViewRenderer*>(renderer);
+            renderer2->SetValue( value );
+            height = wxMax( height, renderer->GetSize().y );
+        }
+
+        return height;
+    }
+    else
+    {
+        return m_lineHeight;
+    }
+}
+

 class RowToItemJob: public DoJob
 {
 public:
 class RowToItemJob: public DoJob
 {
 public:

-    RowToItemJob( unsigned int row , int current ) { this->row = row; this->current = current ;}
-    virtual ~RowToItemJob(){};
+    RowToItemJob( unsigned int row , int current ) { this->row = row; this->current = current;}
+    virtual ~RowToItemJob() { }

 
     virtual int operator() ( wxDataViewTreeNode * node )
     {
         current ++;
         if( current == static_cast<int>(row))
          {
 
     virtual int operator() ( wxDataViewTreeNode * node )
     {
         current ++;
         if( current == static_cast<int>(row))
          {

-            ret = node->GetItem() ;
+            ret = node->GetItem();

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


@@ -2825,7 +2296,7 @@ public:
         current ++;
         if( current == static_cast<int>(row))
          {
         current ++;
         if( current == static_cast<int>(row))
          {

-            ret = wxDataViewItem( n ) ;
+            ret = wxDataViewItem( n );

             return DoJob::OK;
         }
         return DoJob::CONT;
             return DoJob::OK;
         }
         return DoJob::CONT;


@@ -2833,15 +2304,22 @@ public:
     wxDataViewItem GetResult(){ return ret; }
 private:
     unsigned int row;
     wxDataViewItem GetResult(){ return ret; }
 private:
     unsigned int row;

-    int current ;
+    int current;

     wxDataViewItem ret;
 };
 
 wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const
 {
     wxDataViewItem ret;
 };
 
 wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const
 {

-    RowToItemJob job( row, -2 );
-    Walker( m_root , job );
-    return job.GetResult();
+    if (!m_root)
+    {
+        return wxDataViewItem( wxUIntToPtr(row) );
+    }
+    else
+    {
+        RowToItemJob job( row, -2 );
+        Walker( m_root , job );
+        return job.GetResult();
+    }

 }
 
 class RowToTreeNodeJob: public DoJob
 }
 
 class RowToTreeNodeJob: public DoJob


@@ -2850,18 +2328,18 @@ public:
     RowToTreeNodeJob( unsigned int row , int current, wxDataViewTreeNode * node )
     {
         this->row = row;
     RowToTreeNodeJob( unsigned int row , int current, wxDataViewTreeNode * node )
     {
         this->row = row;

-        this->current = current ;
-        ret = NULL ;
+        this->current = current;
+        ret = NULL;

         parent = node;
     }
         parent = node;
     }

-    virtual ~RowToTreeNodeJob(){};
+    virtual ~RowToTreeNodeJob(){ }

 
     virtual int operator() ( wxDataViewTreeNode * node )
     {
         current ++;
         if( current == static_cast<int>(row))
          {
 
     virtual int operator() ( wxDataViewTreeNode * node )
     {
         current ++;
         if( current == static_cast<int>(row))
          {

-            ret = node ;
+            ret = node;

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


@@ -2879,7 +2357,7 @@ public:
             {
                 int index = static_cast<int>(row) - current - 1;
                 void * n = node->GetChildren().Item( index );
             {
                 int index = static_cast<int>(row) - current - 1;
                 void * n = node->GetChildren().Item( index );

-                ret = new wxDataViewTreeNode( parent ) ;
+                ret = new wxDataViewTreeNode( parent );

                 ret->SetItem( wxDataViewItem( n ));
                 ret->SetHasChildren(false);
                 return DoJob::OK;
                 ret->SetItem( wxDataViewItem( n ));
                 ret->SetHasChildren(false);
                 return DoJob::OK;


@@ -2895,7 +2373,7 @@ public:
         current ++;
         if( current == static_cast<int>(row))
          {
         current ++;
         if( current == static_cast<int>(row))
          {

-            ret = new wxDataViewTreeNode( parent ) ;
+            ret = new wxDataViewTreeNode( parent );

             ret->SetItem( wxDataViewItem( n ));
             ret->SetHasChildren(false);
             return DoJob::OK;
             ret->SetItem( wxDataViewItem( n ));
             ret->SetHasChildren(false);
             return DoJob::OK;


@@ -2906,14 +2384,16 @@ public:
     wxDataViewTreeNode * GetResult(){ return ret; }
 private:
     unsigned int row;
     wxDataViewTreeNode * GetResult(){ return ret; }
 private:
     unsigned int row;

-    int current ;
+    int current;

     wxDataViewTreeNode * ret;
     wxDataViewTreeNode * ret;

-    wxDataViewTreeNode * parent ;
+    wxDataViewTreeNode * parent;

 };
 
 
 };
 
 

-wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row)
+wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) const

 {
 {

+    wxASSERT( !IsVirtualList() );
+

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


@@ -2932,8 +2412,28 @@ wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const
     return le;
 }
 
     return le;
 }
 

+
+bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const
+{
+    if (IsVirtualList())
+       return false;
+       
+    wxDataViewTreeNode * node = GetTreeNodeByRow(row);
+    if (!node)
+       return false;
+       
+    if (!node->HasChildren())
+       return false;
+    
+    return node->IsOpen();
+}
+
+

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

+    if (IsVirtualList())
+       return;
+

     wxDataViewTreeNode * node = GetTreeNodeByRow(row);
     if( node != NULL )
     {
     wxDataViewTreeNode * node = GetTreeNodeByRow(row);
     if( node != NULL )
     {


@@ -2951,7 +2451,7 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row )
                if( node->GetChildrenNumber() == 0 )
                {
                    SortPrepare();
                if( node->GetChildrenNumber() == 0 )
                {
                    SortPrepare();

-                   BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);
+                   ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);

                }
                m_count = -1;
                UpdateDisplay();
                }
                m_count = -1;
                UpdateDisplay();


@@ -2973,6 +2473,9 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row )
 
 void wxDataViewMainWindow::OnCollapsing(unsigned int row)
 {
 
 void wxDataViewMainWindow::OnCollapsing(unsigned int row)
 {

+    if (IsVirtualList())
+       return;
+

     wxDataViewTreeNode * node = GetTreeNodeByRow(row);
     if( node != NULL )
     {
     wxDataViewTreeNode * node = GetTreeNodeByRow(row);
     if( node != NULL )
     {


@@ -2993,7 +2496,7 @@ void wxDataViewMainWindow::OnCollapsing(unsigned int row)
             node = node->GetParent();
             if( node != NULL )
             {
             node = node->GetParent();
             if( node != NULL )
             {

-                int  parent = GetRowByItem( node->GetItem() ) ;
+                int  parent = GetRowByItem( node->GetItem() );

                 if( parent >= 0 )
                 {
                     SelectRow( row, false);
                 if( parent >= 0 )
                 {
                     SelectRow( row, false);


@@ -3028,33 +2531,39 @@ 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;
     //Find the item along the parent-chain.
     //This algorithm is designed to speed up the node-finding method
     wxDataViewTreeNode * node = m_root;

-    for( ItemList::const_iterator iter = list.begin(); iter !=list.end() ; iter++ )
+    for( ItemList::const_iterator iter = list.begin(); iter !=list.end(); iter++ )

     {
         if( node->HasChildren() )
         {
             if( node->GetChildrenNumber() == 0 )
             {
                 SortPrepare();
     {
         if( node->HasChildren() )
         {
             if( node->GetChildrenNumber() == 0 )
             {
                 SortPrepare();

-                BuildTreeHelper(model, node->GetItem(), node);
+                ::BuildTreeHelper(model, node->GetItem(), node);

             }
 
             wxDataViewTreeNodes nodes = node->GetNodes();
             }
 
             wxDataViewTreeNodes nodes = node->GetNodes();

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

             {
                 if (nodes[i]->GetItem() == (**iter))
                 {
             {
                 if (nodes[i]->GetItem() == (**iter))
                 {

+                    if (nodes[i]->GetItem() == item)
+                       return nodes[i];
+

                     node = nodes[i];
                     node = nodes[i];

+                    found = true;

                     break;
                 }
             }
                     break;
                 }
             }

-            if (i == nodes.GetCount())
+            if (!found)

                 return NULL;
         }
         else
             return NULL;
     }
                 return NULL;
         }
         else
             return NULL;
     }

-    return node;
+    return NULL;

 }
 
 void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column )
 }
 
 void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column )


@@ -3062,12 +2571,11 @@ void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item
     wxDataViewColumn *col = NULL;
     unsigned int cols = GetOwner()->GetColumnCount();
     unsigned int colnum = 0;
     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 );
     int x, y;
     m_owner->CalcUnscrolledPosition( point.x, point.y, &x, &y );

-    for (x_start = 0; colnum < cols; colnum++)
+    for (unsigned x_start = 0; colnum < cols; colnum++)

     {
     {

-        col = GetOwner()->GetColumn(colnum);
+        col = GetOwner()->GetColumnAt(colnum);

         if (col->IsHidden())
             continue;      // skip it!
 
         if (col->IsHidden())
             continue;      // skip it!
 


@@ -3079,21 +2587,21 @@ void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item
     }
 
     column = col;
     }
 
     column = col;

-    item = GetItemByRow( y/m_lineHeight );
+    item = GetItemByRow( GetLineAt( y ) );

 }
 
 wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column )
 {
     int row = GetRowByItem(item);
 }
 
 wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column )
 {
     int row = GetRowByItem(item);

-    int y = row*m_lineHeight;
-    int h = m_lineHeight;
+    int y = GetLineStart( row );
+    int h = GetLineHeight( m_lineHeight );

     int x = 0;
     wxDataViewColumn *col = NULL;
     for( int i = 0, cols = GetOwner()->GetColumnCount(); i < cols; i ++ )
     {
     int x = 0;
     wxDataViewColumn *col = NULL;
     for( int i = 0, cols = GetOwner()->GetColumnCount(); i < cols; i ++ )
     {

-       col = GetOwner()->GetColumn( i );
+       col = GetOwner()->GetColumnAt( i );

        x += col->GetWidth();
        x += col->GetWidth();

-       if( GetOwner()->GetColumn(i+1) == column )
+       if( GetOwner()->GetColumnAt(i+1) == column )

            break;
     }
     int w = col->GetWidth();
            break;
     }
     int w = col->GetWidth();


@@ -3103,15 +2611,30 @@ wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxD
 
 int wxDataViewMainWindow::RecalculateCount()
 {
 
 int wxDataViewMainWindow::RecalculateCount()
 {

-    return m_root->GetSubTreeCount();
+    if (!m_root)
+    {
+        wxDataViewIndexListModel *list_model = (wxDataViewIndexListModel*) GetOwner()->GetModel();
+#ifndef __WXMAC__
+        return list_model->GetLastIndex() + 1;
+#else
+        return list_model->GetLastIndex() - 1;
+#endif
+    }
+    else
+    {
+        return m_root->GetSubTreeCount();
+    }

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

-    ItemToRowJob(const wxDataViewItem & item, ItemList::const_iterator iter )
-    { this->item = item ; ret = -1 ; m_iter = iter ; }
-    virtual ~ItemToRowJob(){};
+    ItemToRowJob(const wxDataViewItem& item_, ItemList::const_iterator iter)
+        : m_iter(iter),
+          item(item_)
+    {
+        ret = -1;
+    }

 
     //Maybe binary search will help to speed up this process
     virtual int operator() ( wxDataViewTreeNode * node)
 
     //Maybe binary search will help to speed up this process
     virtual int operator() ( wxDataViewTreeNode * node)


@@ -3124,7 +2647,7 @@ public:
 
          if( node->GetItem() == **m_iter )
          {
 
          if( node->GetItem() == **m_iter )
          {

-             m_iter++ ;
+             m_iter++;

              return DoJob::CONT;
          }
          else
              return DoJob::CONT;
          }
          else


@@ -3143,7 +2666,8 @@ public:
         return DoJob::CONT;
     }
     //the row number is begin from zero
         return DoJob::CONT;
     }
     //the row number is begin from zero

-    int GetResult(){ return ret -1 ; }
+    int GetResult() { return ret -1; }
+

 private:
     ItemList::const_iterator  m_iter;
     wxDataViewItem item;
 private:
     ItemList::const_iterator  m_iter;
     wxDataViewItem item;


@@ -3151,38 +2675,45 @@ private:
 
 };
 
 
 };
 

-int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item)
+int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) const

 {
 {

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

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

-    if( !item.IsOk() )
-        return -1;
-
-    //Compose the a parent-chain of the finding item
-    ItemList list;
-    wxDataViewItem * pItem = NULL;
-    list.DeleteContents( true );
-    wxDataViewItem it( item );
-    while( it.IsOk() )
+    if (!m_root)

     {
     {

-        pItem = new wxDataViewItem( it );
-        list.Insert( pItem );
-        it = model->GetParent( it );
+        return wxPtrToUInt( item.GetID() );

     }
     }

-    pItem = new wxDataViewItem( );
-    list.Insert( pItem );
+    else
+    {
+        if( !item.IsOk() )
+            return -1;

 
 

-    ItemToRowJob job( item, list.begin() );
-    Walker(m_root , job );
-    return job.GetResult();
+        //Compose the a parent-chain of the finding item
+        ItemList list;
+        wxDataViewItem * pItem;
+        list.DeleteContents( true );
+        wxDataViewItem it( item );
+        while( it.IsOk() )
+        {
+            pItem = new wxDataViewItem( it );
+            list.Insert( pItem );
+            it = model->GetParent( it );
+        }
+        pItem = new wxDataViewItem( );
+        list.Insert( pItem );
+
+        ItemToRowJob job( item, list.begin() );
+        Walker(m_root , job );
+        return job.GetResult();
+    }

 }
 
 }
 

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

 {
     if( !model->IsContainer( item ) )
 {
     if( !model->IsContainer( item ) )

-        return ;
+        return;

 
     wxDataViewItemArray children;
     unsigned int num = model->GetChildren( item, children);
 
     wxDataViewItemArray children;
     unsigned int num = model->GetChildren( item, children);


@@ -3193,7 +2724,7 @@ void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataVie
         {
             wxDataViewTreeNode * n = new wxDataViewTreeNode( node );
             n->SetItem(children[index]);
         {
             wxDataViewTreeNode * n = new wxDataViewTreeNode( node );
             n->SetItem(children[index]);

-            n->SetHasChildren( true ) ;
+            n->SetHasChildren( true );

             node->AddNode( n );
         }
         else
             node->AddNode( n );
         }
         else


@@ -3211,21 +2742,32 @@ void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataVie
 
 void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
 {
 
 void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
 {

+    DestroyTree();
+
+    if (GetOwner()->GetModel()->IsVirtualListModel())
+    {
+        m_count = -1;
+        return;
+    }
+
+    m_root = new wxDataViewTreeNode( NULL );
+    m_root->SetHasChildren(true);
+

     //First we define a invalid item to fetch the top-level elements
     wxDataViewItem item;
     SortPrepare();
     BuildTreeHelper( model, item, m_root);
     //First we define a invalid item to fetch the top-level elements
     wxDataViewItem item;
     SortPrepare();
     BuildTreeHelper( model, item, m_root);

-    m_count = -1 ;
+    m_count = -1;

 }
 
 }
 

-void DestroyTreeHelper( wxDataViewTreeNode * node )
+static void DestroyTreeHelper( wxDataViewTreeNode * node )

 {
     if( node->GetNodeNumber() != 0 )
     {
         int len = node->GetNodeNumber();
 {
     if( node->GetNodeNumber() != 0 )
     {
         int len = node->GetNodeNumber();

-        int i = 0 ;
-        wxDataViewTreeNodes nodes = node->GetNodes();
-        for( ; i < len; i ++ )
+        int i = 0;
+        wxDataViewTreeNodes& nodes = node->GetNodes();
+        for(; i < len; i ++ )

         {
             DestroyTreeHelper(nodes[i]);
         }
         {
             DestroyTreeHelper(nodes[i]);
         }


@@ -3235,23 +2777,18 @@ void DestroyTreeHelper( wxDataViewTreeNode * node )
 
 void wxDataViewMainWindow::DestroyTree()
 {
 
 void wxDataViewMainWindow::DestroyTree()
 {

-    DestroyTreeHelper(m_root);
-    m_root->SetSubTreeCount(0);
-    m_count = 0 ;
+    if (!IsVirtualList())
+    {
+       ::DestroyTreeHelper(m_root);
+        m_count = 0;
+        m_root = NULL;
+    }

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

-    if (event.GetKeyCode() == WXK_TAB)
-    {
-        wxNavigationKeyEvent nevent;
-        nevent.SetWindowChange( event.ControlDown() );
-        nevent.SetDirection( !event.ShiftDown() );
-        nevent.SetEventObject( GetParent()->GetParent() );
-        nevent.SetCurrentFocus( m_parent );
-        if (GetParent()->GetParent()->GetEventHandler()->ProcessEvent( nevent ))
-            return;
-    }
+    if ( GetParent()->HandleAsNavigationKey(event) )
+        return;

 
     // no item -> nothing to do
     if (!HasCurrentRow())
 
     // no item -> nothing to do
     if (!HasCurrentRow())


@@ -3268,7 +2805,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
     {
         case WXK_RETURN:
         {
     {
         case WXK_RETURN:
         {

-            if (m_currentRow > 0)
+            if (m_currentRow >= 0)

             {
                 wxWindow *parent = GetParent();
                 wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId());
             {
                 wxWindow *parent = GetParent();
                 wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId());


@@ -3353,7 +2890,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     unsigned int i;
     for (i = 0; i < cols; i++)
     {
     unsigned int i;
     for (i = 0; i < cols; i++)
     {

-        wxDataViewColumn *c = GetOwner()->GetColumn( i );
+        wxDataViewColumn *c = GetOwner()->GetColumnAt( i );

         if (c->IsHidden())
             continue;      // skip it!
 
         if (c->IsHidden())
             continue;      // skip it!
 


@@ -3368,8 +2905,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         return;
 
     wxDataViewRenderer *cell = col->GetRenderer();
         return;
 
     wxDataViewRenderer *cell = col->GetRenderer();

-    unsigned int current = y / m_lineHeight;
-    if ((current > GetRowCount()) || (x > GetEndOfLastCol()))
+    unsigned int current = GetLineAt( y );
+    if ((current >= GetRowCount()) || (x > GetEndOfLastCol()))

     {
         // Unselect all if below the last row ?
         return;
     {
         // Unselect all if below the last row ?
         return;


@@ -3377,14 +2914,17 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
     //Test whether the mouse is hovered on the tree item button
     bool hover = false;
 
     //Test whether the mouse is hovered on the tree item button
     bool hover = false;

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

     {
         wxDataViewTreeNode * node = GetTreeNodeByRow(current);
         if( node!=NULL && node->HasChildren() )
         {
             int indent = node->GetIndentLevel();
             indent = GetOwner()->GetIndent()*indent;
     {
         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);
+            wxRect rect( xpos + indent + EXPANDER_MARGIN,
+                         GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET,
+                         m_lineHeight-2*EXPANDER_MARGIN,
+                         m_lineHeight-2*EXPANDER_MARGIN + EXPANDER_OFFSET);

             if( rect.Contains( x, y) )
             {
                 //So the mouse is over the expander
             if( rect.Contains( x, y) )
             {
                 //So the mouse is over the expander


@@ -3392,17 +2932,17 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
                 if (m_underMouse && m_underMouse != node)
                 {
                     //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
                 if (m_underMouse && m_underMouse != node)
                 {
                     //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));

-                    Refresh(GetRowByItem(m_underMouse->GetItem()));
+                    RefreshRow(GetRowByItem(m_underMouse->GetItem()));

                 }
                 if (m_underMouse != node)
                 {
                     //wxLogMessage("Do the row: %d", current);
                 }
                 if (m_underMouse != node)
                 {
                     //wxLogMessage("Do the row: %d", current);

-                    Refresh(current);
+                    RefreshRow(current);

                 }
                 m_underMouse = node;
             }
         }
                 }
                 m_underMouse = node;
             }
         }

-     if (node!=NULL && !node->HasChildren())
+        if (node!=NULL && !node->HasChildren())

             delete node;
     }
     if (!hover)
             delete node;
     }
     if (!hover)


@@ -3410,7 +2950,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         if (m_underMouse != NULL)
         {
             //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
         if (m_underMouse != NULL)
         {
             //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));

-            Refresh(GetRowByItem(m_underMouse->GetItem()));
+            RefreshRow(GetRowByItem(m_underMouse->GetItem()));

             m_underMouse = NULL;
         }
     }
             m_underMouse = NULL;
         }
     }


@@ -3451,18 +2991,23 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         m_lastOnSame = false;
     }
 
         m_lastOnSame = false;
     }
 

+    wxDataViewItem item = GetItemByRow(current);
+    bool ignore_other_columns =
+        ((GetOwner()->GetExpanderColumn() != col) &&
+         (model->IsContainer(item)) &&
+         (!model->HasContainerColumns(item)));
+

     if (event.LeftDClick())
     {
         if ( current == m_lineLastClicked )
         {
     if (event.LeftDClick())
     {
         if ( current == m_lineLastClicked )
         {

-            if (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE)
+            if ((!ignore_other_columns) && (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE))

             {
             {

-                wxDataViewItem item = GetItemByRow(current);

                 wxVariant value;
                 model->GetValue( value, item, col->GetModelColumn() );
                 cell->SetValue( value );
                 wxVariant value;
                 model->GetValue( value, item, col->GetModelColumn() );
                 cell->SetValue( value );

-                wxRect cell_rect( xpos, current * m_lineHeight,
-                                  col->GetWidth(), m_lineHeight );
+                wxRect cell_rect( xpos, GetLineStart( current ),
+                                  col->GetWidth(), GetLineHeight( current ) );

                 cell->Activate( cell_rect, model, item, col->GetModelColumn() );
 
             }
                 cell->Activate( cell_rect, model, item, col->GetModelColumn() );
 
             }


@@ -3470,7 +3015,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             {
                 wxWindow *parent = GetParent();
                 wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId());
             {
                 wxWindow *parent = GetParent();
                 wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId());

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

                 le.SetEventObject(parent);
                 le.SetModel(GetOwner()->GetModel());
 
                 le.SetEventObject(parent);
                 le.SetModel(GetOwner()->GetModel());
 


@@ -3493,18 +3038,23 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             // select single line
             SelectAllRows( false );
             SelectRow( m_lineSelectSingleOnUp, true );
             // select single line
             SelectAllRows( false );
             SelectRow( m_lineSelectSingleOnUp, true );

+            SendSelectionChangedEvent( GetItemByRow(m_lineSelectSingleOnUp) );

         }
 
         //Process the event of user clicking the expander
         bool expander = false;
         }
 
         //Process the event of user clicking the expander
         bool expander = false;

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

         {
             wxDataViewTreeNode * node = GetTreeNodeByRow(current);
             if( node!=NULL && node->HasChildren() )
             {
                 int indent = node->GetIndentLevel();
                 indent = GetOwner()->GetIndent()*indent;
         {
             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);
+                wxRect rect( xpos + indent + EXPANDER_MARGIN,
+                         GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET,
+                         m_lineHeight-2*EXPANDER_MARGIN,
+                         m_lineHeight-2*EXPANDER_MARGIN + EXPANDER_OFFSET);
+

                 if( rect.Contains( x, y) )
                 {
                     expander = true;
                 if( rect.Contains( x, y) )
                 {
                     expander = true;


@@ -3514,12 +3064,14 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
                         OnExpanding( current );
                 }
             }
                         OnExpanding( current );
                 }
             }

+            if (node && !node->HasChildren())
+               delete node;

         }
         //If the user click the expander, we do not do editing even if the column with expander are editable
         }
         //If the user click the expander, we do not do editing even if the column with expander are editable

-        if (m_lastOnSame && !expander )
+        if (m_lastOnSame && !expander && !ignore_other_columns)

         {
             if ((col == m_currentCol) && (current == m_currentRow) &&
         {
             if ((col == m_currentCol) && (current == m_currentRow) &&

-                (cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) )
+                (cell->GetMode() & wxDATAVIEW_CELL_EDITABLE) )

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


@@ -3552,16 +3104,18 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );
         }
 
             SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );
         }
 

-        // notify cell about right click
-        // cell->...
-
-        // Allow generation of context menu event
-        event.Skip();
+        wxVariant value;
+        model->GetValue( value, item, col->GetModelColumn() );
+        wxWindow *parent = GetParent();
+        wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId());
+        le.SetItem( item );
+        le.SetEventObject(parent);
+        le.SetModel(GetOwner()->GetModel());
+        le.SetValue(value);
+        parent->GetEventHandler()->ProcessEvent(le);

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

-        // notify cell about middle click
-        // cell->...

     }
     if (event.LeftDown() || forceClick)
     {
     }
     if (event.LeftDown() || forceClick)
     {


@@ -3630,6 +3184,18 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
         m_lastOnSame = !forceClick && ((col == oldCurrentCol) &&
                         (current == oldCurrentRow)) && oldWasSelected;
 
         m_lastOnSame = !forceClick && ((col == oldCurrentCol) &&
                         (current == oldCurrentRow)) && oldWasSelected;

+
+        // Call LeftClick after everything else as under GTK+
+        if (cell->GetMode() & wxDATAVIEW_CELL_ACTIVATABLE)
+        {
+            // notify cell about right click
+            wxVariant value;
+            model->GetValue( value, item, col->GetModelColumn() );
+            cell->SetValue( value );
+            wxRect cell_rect( xpos, GetLineStart( current ),
+                          col->GetWidth(), GetLineHeight( current ) );
+            /* ignore ret */ cell->LeftClick( event.GetPosition(), cell_rect, model, item, col->GetModelColumn());
+        }

     }
 }
 
     }
 }
 


@@ -3664,7 +3230,7 @@ wxDataViewItem wxDataViewMainWindow::GetSelection() const
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------

-WX_DEFINE_LIST(wxDataViewColumnList);
+WX_DEFINE_LIST(wxDataViewColumnList)

 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
 


@@ -3676,25 +3242,38 @@ wxDataViewCtrl::~wxDataViewCtrl()
 {
     if (m_notifier)
         GetModel()->RemoveNotifier( m_notifier );
 {
     if (m_notifier)
         GetModel()->RemoveNotifier( m_notifier );

+
+    m_cols.Clear();

 }
 
 void wxDataViewCtrl::Init()
 {
 }
 
 void wxDataViewCtrl::Init()
 {

+    m_cols.DeleteContents(true);

     m_notifier = NULL;
     m_notifier = NULL;

+
+    // No sorting column at start
+    m_sortingColumnIdx = wxNOT_FOUND;
+
+    m_headerArea = NULL;

 }
 
 bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator )
 {
 }
 
 bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator )
 {

+    if ( (style & wxBORDER_MASK) == 0)
+        style |= wxBORDER_SUNKEN;
+
+    Init();
+

     if (!wxControl::Create( parent, id, pos, size,
     if (!wxControl::Create( parent, id, pos, size,

-                            style | wxScrolledWindowStyle|wxSUNKEN_BORDER, validator))
+                            style | wxScrolledWindowStyle, validator))

         return false;
 
         return false;
 

-    Init();
+    SetInitialSize(size);

 
 #ifdef __WXMAC__
 
 #ifdef __WXMAC__

-    MacSetClipChildren( true ) ;
+    MacSetClipChildren( true );

 #endif
 
     m_clientArea = new wxDataViewMainWindow( this, wxID_ANY );
 #endif
 
     m_clientArea = new wxDataViewMainWindow( this, wxID_ANY );


@@ -3702,7 +3281,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
     if (HasFlag(wxDV_NO_HEADER))
         m_headerArea = NULL;
     else
     if (HasFlag(wxDV_NO_HEADER))
         m_headerArea = NULL;
     else

-        m_headerArea = new wxDataViewHeaderWindow( this, wxID_ANY );
+        m_headerArea = new wxDataViewHeaderWindow(this);

 
     SetTargetWindow( m_clientArea );
 
 
     SetTargetWindow( m_clientArea );
 


@@ -3711,7 +3290,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
         sizer->Add( m_headerArea, 0, wxGROW );
     sizer->Add( m_clientArea, 1, wxGROW );
     SetSizer( sizer );
         sizer->Add( m_headerArea, 0, wxGROW );
     sizer->Add( m_clientArea, 1, wxGROW );
     SetSizer( sizer );

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -3734,6 +3313,15 @@ WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg,
 }
 #endif
 
 }
 #endif
 

+wxSize wxDataViewCtrl::GetSizeAvailableForScrollTarget(const wxSize& size)
+{
+    wxSize newsize = size;
+    if (!HasFlag(wxDV_NO_HEADER) && (m_headerArea))
+       newsize.y -= m_headerArea->GetSize().y;
+
+    return newsize;
+}
+

 void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
     // We need to override OnSize so that our scrolled
 void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
     // We need to override OnSize so that our scrolled


@@ -3748,6 +3336,12 @@ void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
     AdjustScrollbars();
 }
 
     AdjustScrollbars();
 }
 

+void wxDataViewCtrl::SetFocus()
+{
+    if (m_clientArea)
+        m_clientArea->SetFocus();
+}
+

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


@@ -3757,6 +3351,8 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
 
     model->AddNotifier( m_notifier );
 
 
     model->AddNotifier( m_notifier );
 

+    m_clientArea->DestroyTree();
+

     m_clientArea->BuildTree(model);
 
     m_clientArea->UpdateDisplay();
     m_clientArea->BuildTree(model);
 
     m_clientArea->UpdateDisplay();


@@ -3770,14 +3366,42 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
         return false;
 
     m_cols.Append( col );
         return false;
 
     m_cols.Append( col );

-    OnColumnChange();
+    OnColumnsCountChanged();
+    return true;
+}
+
+bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
+{
+    if (!wxDataViewCtrlBase::PrependColumn(col))
+        return false;
+
+    m_cols.Insert( col );
+    OnColumnsCountChanged();
+    return true;
+}
+
+bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col )
+{
+    if (!wxDataViewCtrlBase::InsertColumn(pos,col))
+        return false;
+
+    m_cols.Insert( pos, col );
+    OnColumnsCountChanged();

     return true;
 }
 
     return true;
 }
 

-void wxDataViewCtrl::OnColumnChange()
+void wxDataViewCtrl::OnColumnChange(unsigned int idx)
+{
+    if ( m_headerArea )
+        m_headerArea->UpdateColumn(idx);
+
+    m_clientArea->UpdateDisplay();
+}
+
+void wxDataViewCtrl::OnColumnsCountChanged()

 {
     if (m_headerArea)
 {
     if (m_headerArea)

-        m_headerArea->UpdateDisplay();
+        m_headerArea->SetColumnCount(GetColumnCount());

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


@@ -3797,55 +3421,75 @@ unsigned int wxDataViewCtrl::GetColumnCount() const
     return m_cols.GetCount();
 }
 
     return m_cols.GetCount();
 }
 

-wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
+wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int idx ) const

 {
 {

-    wxDataViewColumnList::const_iterator iter;
-    unsigned int i = 0;
-    for (iter = m_cols.begin(); iter!=m_cols.end(); iter++)
-    {
-        if (i == pos)
-            return *iter;
+    return m_cols[idx];
+}

 
 

-        if ((*iter)->IsHidden())
-            continue;
-        i ++;
+wxDataViewColumn *wxDataViewCtrl::GetColumnAt(unsigned int pos) const
+{
+    // columns can't be reordered if there is no header window which allows
+    // to do this
+    const unsigned idx = m_headerArea ? m_headerArea->GetColumnsOrder()[pos]
+                                      : pos;
+
+    return GetColumn(idx);
+}
+
+int wxDataViewCtrl::GetColumnIndex(const wxDataViewColumn *column) const
+{
+    const unsigned count = m_cols.size();
+    for ( unsigned n = 0; n < count; n++ )
+    {
+        if ( m_cols[n] == column )
+            return n;

     }
     }

-    return NULL;
+
+    return wxNOT_FOUND;
+}
+
+void wxDataViewCtrl::ColumnMoved(wxDataViewColumn * WXUNUSED(col),
+                                 unsigned int WXUNUSED(new_pos))
+{
+    // do _not_ reorder m_cols elements here, they should always be in the
+    // order in which columns were added, we only display the columns in
+    // different order
+    m_clientArea->UpdateDisplay();

 }
 
 bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
 {
 }
 
 bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
 {

-    wxDataViewColumnList::compatibility_iterator  ret = m_cols.Find( column );
-    if (ret == NULL)
+    wxDataViewColumnList::compatibility_iterator ret = m_cols.Find( column );
+    if (!ret)

         return false;
 
     m_cols.Erase(ret);
         return false;
 
     m_cols.Erase(ret);

-    delete column;
-    OnColumnChange();
+    OnColumnsCountChanged();

 
     return true;
 }
 
 bool wxDataViewCtrl::ClearColumns()
 {
 
     return true;
 }
 
 bool wxDataViewCtrl::ClearColumns()
 {

-    m_cols.clear();
-    OnColumnChange();
+    m_cols.Clear();
+    OnColumnsCountChanged();

     return true;
 }
 
 int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
 {
     return true;
 }
 
 int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
 {

-    int ret = 0, dead = 0;
-    int len = GetColumnCount();
-    for (int i=0; i<len; i++)
+    int ret = 0,
+        dummy = 0;
+    unsigned int len = GetColumnCount();
+    for ( unsigned int i = 0; i < len; i++ )

     {
     {

-        wxDataViewColumn * col = GetColumn(i);
+        wxDataViewColumn * col = GetColumnAt(i);

         if (col->IsHidden())
             continue;
         ret += col->GetWidth();
         if (column==col)
         {
         if (col->IsHidden())
             continue;
         ret += col->GetWidth();
         if (column==col)
         {

-            CalcScrolledPosition( ret, dead, &ret, &dead );
+            CalcScrolledPosition( ret, dummy, &ret, &dummy );

             break;
         }
     }
             break;
         }
     }


@@ -3854,7 +3498,8 @@ int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
 
 wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
 {
 
 wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
 {

-    return NULL;
+    return m_sortingColumnIdx == wxNOT_FOUND ? NULL
+                                             : GetColumn(m_sortingColumnIdx);

 }
 
 //Selection code with wxDataViewItem as parameters
 }
 
 //Selection code with wxDataViewItem as parameters


@@ -3878,19 +3523,34 @@ int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const
 
 void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
 {
 
 void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
 {

-    wxDataViewSelection selection(wxDataViewSelectionCmp) ;
+    wxDataViewSelection selection(wxDataViewSelectionCmp);
+
+    wxDataViewItem last_parent;
+

     int len = sel.GetCount();
     for( int i = 0; i < len; i ++ )
     {
     int len = sel.GetCount();
     for( int i = 0; i < len; i ++ )
     {

-        int row = m_clientArea->GetRowByItem( sel[i] );
+        wxDataViewItem item = sel[i];
+        wxDataViewItem parent = GetModel()->GetParent( item );
+        if (parent)
+        {
+            if (parent != last_parent)
+                ExpandAncestors(item);
+        }
+        
+        last_parent = parent;
+        int row = m_clientArea->GetRowByItem( item );

         if( row >= 0 )
             selection.Add( static_cast<unsigned int>(row) );
     }
         if( row >= 0 )
             selection.Add( static_cast<unsigned int>(row) );
     }

+    

     m_clientArea->SetSelections( selection );
 }
 
 void wxDataViewCtrl::Select( const wxDataViewItem & item )
 {
     m_clientArea->SetSelections( selection );
 }
 
 void wxDataViewCtrl::Select( const wxDataViewItem & item )
 {

+    ExpandAncestors( item );
+    

     int row = m_clientArea->GetRowByItem( item );
     if( row >= 0 )
     {
     int row = m_clientArea->GetRowByItem( item );
     if( row >= 0 )
     {


@@ -3934,7 +3594,7 @@ int wxDataViewCtrl::GetSelections( wxArrayInt & sel ) const
 
 void wxDataViewCtrl::SetSelections( const wxArrayInt & sel )
 {
 
 void wxDataViewCtrl::SetSelections( const wxArrayInt & sel )
 {

-    wxDataViewSelection selection(wxDataViewSelectionCmp) ;
+    wxDataViewSelection selection(wxDataViewSelectionCmp);

     int len = sel.GetCount();
     for( int i = 0; i < len; i ++ )
     {
     int len = sel.GetCount();
     for( int i = 0; i < len; i ++ )
     {


@@ -4014,23 +3674,17 @@ void wxDataViewCtrl::EnsureVisible( int row, int column )
 
 void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn * column )
 {
 
 void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn * column )
 {

+    ExpandAncestors( item );
+  
+    m_clientArea->RecalculateDisplay();
+

     int row = m_clientArea->GetRowByItem(item);
     if( row >= 0 )
     {
         if( column == NULL )
             EnsureVisible(row, -1);
         else
     int row = m_clientArea->GetRowByItem(item);
     if( row >= 0 )
     {
         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 );
-        }
+            EnsureVisible( row, GetColumnIndex(column) );

     }
 
 }
     }
 
 }


@@ -4069,6 +3723,15 @@ void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
         m_clientArea->Collapse(row);
 }
 
         m_clientArea->Collapse(row);
 }
 

+bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
+{
+    int row = m_clientArea->GetRowByItem( item );
+    if (row != -1)
+        return m_clientArea->IsExpanded(row);
+    return false;
+}
+
+

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