Fix history in wxWebViewIE when using a custom file scheme.

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index a054a591503898e7a8e1b5255921650a8e74fb8f..ea10aece5504a5376c2bd7ea60de041c7261792e 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -2,7 +2,7 @@
 // Name:        src/generic/datavgen.cpp
 // Purpose:     wxDataViewCtrl generic implementation
 // Author:      Robert Roebling
 // Name:        src/generic/datavgen.cpp
 // Purpose:     wxDataViewCtrl generic implementation
 // Author:      Robert Roebling

-// Modified by: Francesco Montorsi, Guru Kathiresan, Otto Wyss
+// Modified by: Francesco Montorsi, Guru Kathiresan, Bo Yang

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


@@ -34,6 +34,7 @@
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/dcscreen.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/dcscreen.h"

+    #include "wx/frame.h"

 #endif
 
 #include "wx/stockitem.h"
 #endif
 
 #include "wx/stockitem.h"


@@ -44,197 +45,215 @@
 #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"
+#include "wx/dnd.h"
+#include "wx/stopwatch.h"

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

+class wxDataViewColumn;
+class wxDataViewHeaderWindow;

 class wxDataViewCtrl;
 
 class wxDataViewCtrl;
 

+//-----------------------------------------------------------------------------
+// classes
+//-----------------------------------------------------------------------------
+

 static const int SCROLL_UNIT_X = 15;
 
 // the cell padding on the left/right
 static const int PADDING_RIGHTLEFT = 3;
 
 static const int SCROLL_UNIT_X = 15;
 
 // the cell padding on the left/right
 static const int PADDING_RIGHTLEFT = 3;
 

-// the cell padding on the top/bottom
-static const int PADDING_TOPBOTTOM = 1;
-

 // the expander space margin
 static const int EXPANDER_MARGIN = 4;
 
 // the expander space margin
 static const int EXPANDER_MARGIN = 4;
 

+#ifdef __WXMSW__
+static const int EXPANDER_OFFSET = 4;
+#else
+static const int EXPANDER_OFFSET = 1;
+#endif
+
+// Below is the compare stuff.
+// For the generic implementation, both the leaf nodes and the nodes are sorted for
+// fast search when needed
+static wxDataViewModel* g_model;
+static int g_column = -2;
+static bool g_asending = true;
+

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// wxDataViewHeaderWindow
+// wxDataViewColumn

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-#define USE_NATIVE_HEADER_WINDOW    1
-
-// 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
+void wxDataViewColumn::Init(int width, wxAlignment align, int flags)

 {
 {

-public:
-    wxDataViewHeaderWindowBase()
-        { m_owner = NULL; }
+    m_width = width;
+    m_minWidth = 0;
+    m_align = align;
+    m_flags = flags;
+    m_sort = false;
+    m_sortAscending = true;
+}

 
 

-    bool Create(wxDataViewCtrl *parent, wxWindowID id,
-                const wxPoint &pos, const wxSize &size,
-                const wxString &name)
+int wxDataViewColumn::GetWidth() const
+{
+    switch ( m_width )

     {
     {

-        return wxWindow::Create(parent, id, pos, size, wxNO_BORDER, name);
-    }
+        case wxCOL_WIDTH_DEFAULT:
+            return wxDVC_DEFAULT_WIDTH;

 
 

-    void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; }
-    wxDataViewCtrl *GetOwner() { return m_owner; }
+        case wxCOL_WIDTH_AUTOSIZE:
+            wxCHECK_MSG( m_owner, wxDVC_DEFAULT_WIDTH, "no owner control" );
+            return m_owner->GetBestColumnWidth(m_owner->GetColumnIndex(this));

 
 

-    // called on column addition/removal
-    virtual void UpdateDisplay() { /* by default, do nothing */ }
+        default:
+            return m_width;
+    }
+}

 
 

-    // returns the n-th column
-    virtual wxDataViewColumn *GetColumn(unsigned int n)
+void wxDataViewColumn::UpdateDisplay()
+{
+    if (m_owner)

     {
     {

-        wxASSERT(m_owner);
-        wxDataViewColumn *ret = m_owner->GetColumn(n);
-        wxASSERT(ret);
-
-        return ret;
+        int idx = m_owner->GetColumnIndex( this );
+        m_owner->OnColumnChange( idx );

     }
     }

+}

 
 

-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
+//-----------------------------------------------------------------------------
+// wxDataViewHeaderWindow
+//-----------------------------------------------------------------------------

 
 

-class wxDataViewHeaderWindowMSW : public wxDataViewHeaderWindowBase
+class wxDataViewHeaderWindow : public wxHeaderCtrl

 {
 public:
 {
 public:

-
-    wxDataViewHeaderWindowMSW( wxDataViewCtrl *parent,
-                               wxWindowID id,
-                               const wxPoint &pos = wxDefaultPosition,
-                               const wxSize &size = wxDefaultSize,
-                               const wxString &name = wxT("wxdataviewctrlheaderwindow") )
+    wxDataViewHeaderWindow(wxDataViewCtrl *parent)
+        : wxHeaderCtrl(parent)

     {
     {

-        Create(parent, id, pos, size, name);

     }
 
     }
 

-    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);
+    wxDataViewCtrl *GetOwner() const
+        { return static_cast<wxDataViewCtrl *>(GetParent()); }

 
 protected:
 
 protected:

-    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-    virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags);
-
-    unsigned int GetColumnIdxFromHeader(NMHEADER *nmHDR);
-
-    wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR)
-        { return GetColumn(GetColumnIdxFromHeader(nmHDR)); }
-
-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") )
+    // implement/override wxHeaderCtrl functions by forwarding them to the main
+    // control
+    virtual const wxHeaderColumn& GetColumn(unsigned int idx) const

     {
     {

-        Init();
-        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);
-
-    ~wxGenericDataViewHeaderWindow()
+    virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle)

     {
     {

-        delete m_resizeCursor;
+        wxDataViewCtrl * const owner = GetOwner();
+
+        int widthContents = owner->GetBestColumnWidth(idx);
+        owner->GetColumn(idx)->SetWidth(wxMax(widthTitle, widthContents));
+        owner->OnColumnChange(idx);
+
+        return true;

     }
 
     }
 

-    virtual void UpdateDisplay() { Refresh(); }
+private:
+    bool SendEvent(wxEventType type, unsigned int n)
+    {
+        wxDataViewCtrl * const owner = GetOwner();
+        wxDataViewEvent event(type, owner->GetId());

 
 

-    // event handlers:
+        event.SetEventObject(owner);
+        event.SetColumn(n);
+        event.SetDataViewColumn(owner->GetColumn(n));
+        event.SetModel(owner->GetModel());

 
 

-    void OnPaint( wxPaintEvent &event );
-    void OnMouse( wxMouseEvent &event );
-    void OnSetFocus( wxFocusEvent &event );
+        // for events created by wxDataViewHeaderWindow the
+        // row / value fields are not valid
+        return owner->GetEventHandler()->ProcessEvent(event);
+    }

 
 

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

 
 

-protected:
+        if ( SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, idx) )
+            return;

 
 

-    // vars used for column resizing:
+        // 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;
+        }

 
 

-    wxCursor            *m_resizeCursor;
-    const wxCursor      *m_currentCursor;
-    bool                 m_isDragging;
+        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);
+            }

 
 

-    bool                 m_dirty;     // needs refresh?
-    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
+            owner->SetSortingColumnIndex(idx);
+            col->SetAsSortKey();
+        }

 
 

-    // the pen used to draw the current column width drag line
-    // when resizing the columsn
-    wxPen m_penCurrent;
+        wxDataViewModel * const model = owner->GetModel();
+        if ( model )
+            model->Resort();

 
 

+        owner->OnColumnChange(idx);

 
 

-    // internal utilities:
+        SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, 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_column = wxNOT_FOUND;
-        m_currentX = 0;
-        m_minX = 0;
+    void OnResize(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()

+    wxDECLARE_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_RESIZING(wxID_ANY, wxDataViewHeaderWindow::OnResize)
+    EVT_HEADER_END_RESIZE(wxID_ANY, wxDataViewHeaderWindow::OnResize)
+
+    EVT_HEADER_END_REORDER(wxID_ANY, wxDataViewHeaderWindow::OnEndReorder)
+END_EVENT_TABLE()

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


@@ -253,158 +272,164 @@ public:
 //-----------------------------------------------------------------------------
 // wxDataViewTreeNode
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDataViewTreeNode
 //-----------------------------------------------------------------------------

+

 class wxDataViewTreeNode;
 class wxDataViewTreeNode;

-WX_DEFINE_SORTED_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes );
-WX_DEFINE_SORTED_ARRAY( void* , wxDataViewTreeLeaves);
+WX_DEFINE_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes );
+WX_DEFINE_ARRAY( void* , wxDataViewTreeLeaves);

 
 

-int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode * node1, wxDataViewTreeNode * node2);
-int LINKAGEMODE wxGenericTreeModelItemCmp( void * id1, void * id2);
+int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1,
+                                           wxDataViewTreeNode ** node2);
+int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2);

 
 class wxDataViewTreeNode
 {
 public:
 
 class wxDataViewTreeNode
 {
 public:

-    wxDataViewTreeNode( wxDataViewTreeNode * parent )
-        :leaves( wxGenericTreeModelItemCmp ),
-         nodes(wxGenericTreeModelNodeCmp)
-       { 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()
+    wxDataViewTreeNode( wxDataViewTreeNode * parent = NULL )

     {
     {

+        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 )
     {

-        nodes.Add( node );
-        leaves.Add( node->GetItem().GetID() );
+        m_leaves.Add( node->GetItem().GetID() );
+        if (g_column >= -1)
+            m_leaves.Sort( &wxGenericTreeModelItemCmp );
+        m_nodes.Add( node );
+        if (g_column >= -1)
+            m_nodes.Sort( &wxGenericTreeModelNodeCmp );
+    }
+    void AddLeaf( void * leaf )
+    {
+        m_leaves.Add( leaf );
+        if (g_column >= -1)
+            m_leaves.Sort( &wxGenericTreeModelItemCmp );

     }
     }

-    void AddLeaf( void * leaf ) { leaves.Add( leaf ); }

 
 

-    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()
     {
     }
 
     void Resort()
     {

-        wxDataViewTreeNodes nds = nodes;
-        wxDataViewTreeLeaves lvs = leaves;
-        nodes.Empty();
-        leaves.Empty();
-               
-        int len = nds.GetCount();
-        if(len > 0)
+        if (g_column >= -1)

         {
         {

-            for(int i = 0; i < len; i ++)
-                nodes.Add(nds[i]);
-            for(int i = 0; i < len; i ++)
-                nodes[i]->Resort();
+            m_nodes.Sort( &wxGenericTreeModelNodeCmp );
+            int len = m_nodes.GetCount();
+            for (int i = 0; i < len; i ++)
+                m_nodes[i]->Resort();
+            m_leaves.Sort( &wxGenericTreeModelItemCmp );

         }
         }

+    }

 
 

-        len = lvs.GetCount();
-        if(len > 0)
+    // returns node corresponding to 'item' if its in m_nodes or NULL otherwise
+    wxDataViewTreeNode *FindItemAsNode(const wxDataViewItem& item) const
+    {
+        for ( wxDataViewTreeNodes::const_iterator i = m_nodes.begin();
+              i != m_nodes.end();
+              ++i )

         {
         {

-            for(int i = 0; i < len; i++)
-                leaves.Add(lvs[i]);
+            if( (*i)->GetItem() == item )
+                return *i;

         }
         }

+
+        return NULL;

     }
 
     }
 

+

 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;

 };
 
 };
 

-//Below is the compare stuff
-//For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed
-static wxDataViewModel * g_model;
-
-int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode * node1, wxDataViewTreeNode * node2)
+int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1,
+                                           wxDataViewTreeNode ** node2)

 {
 {

-    return g_model->Compare( node1->GetItem(), node2->GetItem() );
+    return g_model->Compare( (*node1)->GetItem(), (*node2)->GetItem(), g_column, g_asending );

 }
 
 }
 

-int LINKAGEMODE wxGenericTreeModelItemCmp( void * id1, void * id2)
+int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2)

 {
 {

-    return g_model->Compare( id1, id2 );
+    return g_model->Compare( wxDataViewItem(*id1), wxDataViewItem(*id2), g_column, g_asending );

 }
 
 
 }
 
 

-

 //-----------------------------------------------------------------------------
 // wxDataViewMainWindow
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxDataViewMainWindow
 //-----------------------------------------------------------------------------
 

-WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection,
-                                            WXDLLIMPEXP_ADV);
-WX_DECLARE_LIST(wxDataViewItem, ItemList);
-WX_DEFINE_LIST(ItemList);
+WX_DEFINE_SORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection);

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


@@ -416,19 +441,50 @@ public:
                             const wxString &name = wxT("wxdataviewctrlmainwindow") );
     virtual ~wxDataViewMainWindow();
 
                             const wxString &name = wxT("wxdataviewctrlmainwindow") );
     virtual ~wxDataViewMainWindow();
 

+    bool IsList() const { return GetOwner()->GetModel()->IsListModel(); }
+    bool IsVirtualList() const { return m_root == NULL; }
+

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

-    bool ValueChanged( const wxDataViewItem &item, unsigned int col );
+    bool ValueChanged( const wxDataViewItem &item, unsigned int model_column );

     bool Cleared();
     void Resort()
     bool Cleared();
     void Resort()

-        { g_model = GetOwner()->GetModel(); m_root->Resort(); UpdateDisplay(); }
+    {
+        if (!IsVirtualList())
+        {
+            SortPrepare();
+            m_root->Resort();
+        }
+        UpdateDisplay();
+    }
+
+    void SortPrepare()
+    {
+        g_model = GetOwner()->GetModel();
+        wxDataViewColumn* col = GetOwner()->GetSortingColumn();
+        if( !col )
+        {
+            if (g_model->HasDefaultCompare())
+                g_column = -1;
+            else
+                g_column = -2;
+
+            g_asending = true;
+            return;
+        }
+        g_column = col->GetModelColumn();
+        g_asending = col->IsSortOrderAscending();
+    }

 
     void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; }
     wxDataViewCtrl *GetOwner() { return m_owner; }
     const wxDataViewCtrl *GetOwner() const { return m_owner; }
 
 
     void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; }
     wxDataViewCtrl *GetOwner() { return m_owner; }
     const wxDataViewCtrl *GetOwner() const { return m_owner; }
 

+#if wxUSE_DRAG_AND_DROP
+    wxBitmap CreateItemBitmap( unsigned int row, int &indent );
+#endif // wxUSE_DRAG_AND_DROP

     void OnPaint( wxPaintEvent &event );
     void OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event);
     void OnChar( wxKeyEvent &event );
     void OnPaint( wxPaintEvent &event );
     void OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event);
     void OnChar( wxKeyEvent &event );


@@ -443,7 +499,9 @@ public:
     void OnRenameTimer();
 
     void ScrollWindow( int dx, int dy, const wxRect *rect = NULL );
     void OnRenameTimer();
 
     void ScrollWindow( int dx, int dy, const wxRect *rect = NULL );

+    void ScrollTo( int rows, int column );

 
 

+    unsigned GetCurrentRow() const { return m_currentRow; }

     bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; }
     void ChangeCurrentRow( unsigned int row );
 
     bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; }
     void ChangeCurrentRow( unsigned int row );
 


@@ -453,18 +511,24 @@ public:
     int GetCountPerPage() const;
     int GetEndOfLastCol() const;
     unsigned int GetFirstVisibleRow() const;
     int GetCountPerPage() const;
     int GetEndOfLastCol() const;
     unsigned int GetFirstVisibleRow() const;

-    //I change this method to un const because in the tree view, the displaying number of the tree are changing along with the expanding/collapsing of the tree nodes
-    unsigned int GetLastVisibleRow();
-    unsigned int GetRowCount() ;

 
 

-    wxDataViewItem GetSelection();
+    // I change this method to un const because in the tree view,
+    // the displaying number of the tree are changing along with the
+    // expanding/collapsing of the tree nodes
+    unsigned int GetLastVisibleRow();
+    unsigned int GetRowCount();

 
 

+    wxDataViewItem GetSelection() const;
+    wxDataViewSelection GetSelections(){ return m_selection; }
+    void SetSelections( const wxDataViewSelection & sel )
+        { m_selection = sel; UpdateDisplay(); }

     void Select( const wxArrayInt& aSelections );
     void SelectAllRows( bool on );
     void SelectRow( unsigned int row, bool on );
     void SelectRows( unsigned int from, unsigned int to, bool on );
     void ReverseRowSelection( unsigned int row );
     bool IsRowSelected( unsigned int row );
     void Select( const wxArrayInt& aSelections );
     void SelectAllRows( bool on );
     void SelectRow( unsigned int row, bool on );
     void SelectRows( unsigned int from, unsigned int to, bool on );
     void ReverseRowSelection( unsigned int row );
     bool IsRowSelected( unsigned int row );

+    void SendSelectionChangedEvent( const wxDataViewItem& item);

 
     void RefreshRow( unsigned int row );
     void RefreshRows( unsigned int from, unsigned int to );
 
     void RefreshRow( unsigned int row );
     void RefreshRows( unsigned int from, unsigned int to );


@@ -476,25 +540,48 @@ public:
         return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
     }
 
         return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
     }
 

-    //void EnsureVisible( unsigned int row );

     wxRect GetLineRect( unsigned int row ) const;
 
     wxRect GetLineRect( unsigned int row ) const;
 

-    //Some useful functions for row and item mapping
-    wxDataViewItem GetItemByRow( unsigned int row );
-    unsigned int GetRowByItem( const wxDataViewItem & item );
+    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
+
+    void SetRowHeight( int lineHeight ) { m_lineHeight = lineHeight; }

 
 

-    //Methods for building the mapping tree
+    // Some useful functions for row and item mapping
+    wxDataViewItem GetItemByRow( unsigned int row ) const;
+    int GetRowByItem( const wxDataViewItem & item ) const;
+
+    // Methods for building the mapping tree

     void BuildTree( wxDataViewModel  * model );
     void DestroyTree();
     void BuildTree( wxDataViewModel  * model );
     void DestroyTree();

+    void HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column );
+    wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column );
+
+    void Expand( unsigned int row );
+    void Collapse( unsigned int row );
+    bool IsExpanded( unsigned int row ) const;
+    bool HasChildren( unsigned int row ) const;
+
+#if wxUSE_DRAG_AND_DROP
+    bool EnableDragSource( const wxDataFormat &format );
+    bool EnableDropTarget( const wxDataFormat &format );
+
+    void RemoveDropHint();
+    wxDragResult OnDragOver( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def );
+    bool OnDrop( wxDataFormat format, wxCoord x, wxCoord y );
+    wxDragResult OnData( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def );
+    void OnLeave();
+#endif // wxUSE_DRAG_AND_DROP
+

 private:
 private:

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

 
 

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

 
 

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

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


@@ -512,13 +599,23 @@ private:
 
     bool                        m_hasFocus;
 
 
     bool                        m_hasFocus;
 

+#if wxUSE_DRAG_AND_DROP

     int                         m_dragCount;
     wxPoint                     m_dragStart;
 
     int                         m_dragCount;
     wxPoint                     m_dragStart;
 

+    bool                        m_dragEnabled;
+    wxDataFormat                m_dragFormat;
+
+    bool                        m_dropEnabled;
+    wxDataFormat                m_dropFormat;
+    bool                        m_dropHint;
+    unsigned int                m_dropHintLine;
+#endif // wxUSE_DRAG_AND_DROP
+

     // for double click logic
     unsigned int m_lineLastClicked,
     // for double click logic
     unsigned int m_lineLastClicked,

-           m_lineBeforeLastClicked,
-           m_lineSelectSingleOnUp;
+        m_lineBeforeLastClicked,
+        m_lineSelectSingleOnUp;

 
     // the pen used to draw horiz/vertical rules
     wxPen m_penRule;
 
     // the pen used to draw horiz/vertical rules
     wxPen m_penRule;


@@ -526,9 +623,13 @@ private:
     // the pen used to draw the expander and the lines
     wxPen m_penExpander;
 
     // the pen used to draw the expander and the lines
     wxPen m_penExpander;
 

-    //This is the tree structure of the model
+    // This is the tree structure of the model

     wxDataViewTreeNode * m_root;
     int m_count;
     wxDataViewTreeNode * m_root;
     int m_count;

+
+    // This is the tree node under the cursor
+    wxDataViewTreeNode * m_underMouse;
+

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


@@ -555,7 +656,7 @@ public:
     virtual bool Cleared()
         { return m_mainWindow->Cleared(); }
     virtual void Resort()
     virtual bool Cleared()
         { return m_mainWindow->Cleared(); }
     virtual void Resort()

-        { return m_mainWindow->Resort(); }
+        { m_mainWindow->Resort(); }

 
     wxDataViewMainWindow    *m_mainWindow;
 };
 
     wxDataViewMainWindow    *m_mainWindow;
 };


@@ -569,17 +670,17 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase)
 wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype,
                                         wxDataViewCellMode mode,
                                         int align) :
 wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype,
                                         wxDataViewCellMode mode,
                                         int align) :

-    wxDataViewRendererBase( varianttype, mode, align )
+    wxDataViewCustomRendererBase( varianttype, mode, align )

 {
 {

-    m_dc = NULL;

     m_align = align;
     m_mode = mode;
     m_align = align;
     m_mode = mode;

+    m_ellipsizeMode = wxELLIPSIZE_MIDDLE;
+    m_dc = NULL;

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

-    if (m_dc)
-        delete m_dc;
+    delete m_dc;

 }
 
 wxDC *wxDataViewRenderer::GetDC()
 }
 
 wxDC *wxDataViewRenderer::GetDC()


@@ -596,6 +697,16 @@ wxDC *wxDataViewRenderer::GetDC()
     return m_dc;
 }
 
     return m_dc;
 }
 

+void wxDataViewRenderer::SetAlignment( int align )
+{
+    m_align=align;
+}
+
+int wxDataViewRenderer::GetAlignment() const
+{
+    return m_align;
+}
+

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


@@ -603,7 +714,7 @@ wxDC *wxDataViewRenderer::GetDC()
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
 
 wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
 
 wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,

-                          wxDataViewCellMode mode, int align ) :
+                        wxDataViewCellMode mode, int align ) :

     wxDataViewRenderer( varianttype, mode, align )
 {
 }
     wxDataViewRenderer( varianttype, mode, align )
 {
 }


@@ -612,11 +723,11 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
 // wxDataViewTextRenderer
 // ---------------------------------------------------------
 
 // wxDataViewTextRenderer
 // ---------------------------------------------------------
 

-IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewCustomRenderer)
+IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer)

 
 wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype,
                                                 wxDataViewCellMode mode, int align ) :
 
 wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype,
                                                 wxDataViewCellMode mode, int align ) :

-    wxDataViewCustomRenderer( varianttype, mode, align )
+    wxDataViewRenderer( varianttype, mode, align )

 {
 }
 
 {
 }
 


@@ -632,60 +743,55 @@ bool wxDataViewTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const
     return false;
 }
 
     return false;
 }
 

-bool wxDataViewTextRenderer::HasEditorCtrl()
+bool wxDataViewTextRenderer::HasEditorCtrl() const

 {
     return true;
 }
 
 {
     return true;
 }
 

-wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,
+wxWindow* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,

         wxRect labelRect, const wxVariant &value )
 {
         wxRect labelRect, const wxVariant &value )
 {

-    return new wxTextCtrl( parent, wxID_ANY, value,
-                           wxPoint(labelRect.x,labelRect.y),
-                           wxSize(labelRect.width,labelRect.height) );
+    wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, value,
+                                       wxPoint(labelRect.x,labelRect.y),
+                                       wxSize(labelRect.width,labelRect.height) );
+
+    // select the text in the control an place the cursor at the end
+    ctrl->SetInsertionPointEnd();
+    ctrl->SelectAll();
+
+    return ctrl;

 }
 
 }
 

-bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant &value )
+bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxWindow *editor, wxVariant &value )

 {
     wxTextCtrl *text = (wxTextCtrl*) editor;
     value = text->GetValue();
     return true;
 }
 
 {
     wxTextCtrl *text = (wxTextCtrl*) editor;
     value = text->GetValue();
     return true;
 }
 

-bool wxDataViewTextRenderer::Render( wxRect cell, wxDC *dc, int state )
+bool wxDataViewTextRenderer::Render(wxRect rect, 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, rect, dc, state);

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

-    const wxDataViewCtrl *view = GetView();

     if (!m_text.empty())
     if (!m_text.empty())

-    {
-        int x,y;
-        view->GetTextExtent( m_text, &x, &y );
-        return wxSize( x, y );
-    }
-    return wxSize(80,20);
+        return GetTextExtent(m_text);
+    else
+        return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE);

 }
 
 // ---------------------------------------------------------
 // wxDataViewBitmapRenderer
 // ---------------------------------------------------------
 
 }
 
 // ---------------------------------------------------------
 // wxDataViewBitmapRenderer
 // ---------------------------------------------------------
 

-IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewCustomRenderer)
+IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer)

 
 wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype,
                                                     wxDataViewCellMode mode, int align ) :
 
 wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype,
                                                     wxDataViewCellMode mode, int align ) :

-    wxDataViewCustomRenderer( varianttype, mode, align )
+    wxDataViewRenderer( varianttype, mode, align )

 {
 }
 
 {
 }
 


@@ -706,9 +812,9 @@ bool wxDataViewBitmapRenderer::GetValue( wxVariant& WXUNUSED(value) ) const
 
 bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
 {
 
 bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
 {

-    if (m_bitmap.Ok())
+    if (m_bitmap.IsOk())

         dc->DrawBitmap( m_bitmap, cell.x, cell.y );
         dc->DrawBitmap( m_bitmap, cell.x, cell.y );

-    else if (m_icon.Ok())
+    else if (m_icon.IsOk())

         dc->DrawIcon( m_icon, cell.x, cell.y );
 
     return true;
         dc->DrawIcon( m_icon, cell.x, cell.y );
 
     return true;


@@ -716,23 +822,23 @@ bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state
 
 wxSize wxDataViewBitmapRenderer::GetSize() const
 {
 
 wxSize wxDataViewBitmapRenderer::GetSize() const
 {

-    if (m_bitmap.Ok())
+    if (m_bitmap.IsOk())

         return wxSize( m_bitmap.GetWidth(), m_bitmap.GetHeight() );
         return wxSize( m_bitmap.GetWidth(), m_bitmap.GetHeight() );

-    else if (m_icon.Ok())
+    else if (m_icon.IsOk())

         return wxSize( m_icon.GetWidth(), m_icon.GetHeight() );
 
         return wxSize( m_icon.GetWidth(), m_icon.GetHeight() );
 

-    return wxSize(16,16);
+    return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE);

 }
 
 // ---------------------------------------------------------
 // wxDataViewToggleRenderer
 // ---------------------------------------------------------
 
 }
 
 // ---------------------------------------------------------
 // wxDataViewToggleRenderer
 // ---------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer, wxDataViewCustomRenderer)
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer)

 
 wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype,
                         wxDataViewCellMode mode, int align ) :
 
 wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype,
                         wxDataViewCellMode mode, int align ) :

-    wxDataViewCustomRenderer( varianttype, mode, align )
+    wxDataViewRenderer( varianttype, mode, align )

 {
     m_toggle = false;
 }
 {
     m_toggle = false;
 }


@@ -751,63 +857,68 @@ bool wxDataViewToggleRenderer::GetValue( wxVariant &WXUNUSED(value) ) const
 
 bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
 {
 
 bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
 {

-    // User wxRenderer here
-
-    wxRect rect;
-    rect.x = cell.x + cell.width/2 - 10;
-    rect.width = 20;
-    rect.y = cell.y + cell.height/2 - 10;
-    rect.height = 20;
-

     int flags = 0;
     if (m_toggle)
         flags |= wxCONTROL_CHECKED;
     int flags = 0;
     if (m_toggle)
         flags |= wxCONTROL_CHECKED;

-    if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE)
+    if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE ||
+        GetEnabled() == false)

         flags |= wxCONTROL_DISABLED;
 
         flags |= wxCONTROL_DISABLED;
 

+    // check boxes we draw must always have the same, standard size (if it's
+    // bigger than the cell size the checkbox will be truncated because the
+    // caller had set the clipping rectangle to prevent us from drawing outside
+    // the cell)
+    cell.SetSize(GetSize());
+

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

-            rect,
+            cell,

             flags );
 
     return true;
 }
 
             flags );
 
     return true;
 }
 

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

 {
 {

-    bool value = !m_toggle;
-    wxVariant variant = value;
-    model->SetValue( variant, item, col);
-    model->ValueChanged( item, col );
-    return true;
+    // only react to clicks directly on the checkbox, not elsewhere in the same cell:
+    if (!wxRect(GetSize()).Contains(cursor))
+        return false;
+
+    if (model->IsEnabled(item, col))
+    {
+        model->ChangeValue(!m_toggle, item, col);
+        return true;
+    }
+
+    return false;

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

-    return wxSize(20,20);
+    // the window parameter is not used by GetCheckBoxSize() so it's
+    // safe to pass NULL
+    return wxRendererNative::Get().GetCheckBoxSize(NULL);

 }
 
 // ---------------------------------------------------------
 // wxDataViewProgressRenderer
 // ---------------------------------------------------------
 
 }
 
 // ---------------------------------------------------------
 // wxDataViewProgressRenderer
 // ---------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer, wxDataViewCustomRenderer)
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer, wxDataViewRenderer)

 
 wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label,
     const wxString &varianttype, wxDataViewCellMode mode, int align ) :
 
 wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label,
     const wxString &varianttype, wxDataViewCellMode mode, int align ) :

-    wxDataViewCustomRenderer( varianttype, mode, align )
+    wxDataViewRenderer( varianttype, mode, align )

 {
     m_label = label;
     m_value = 0;
 }
 
 {
     m_label = label;
     m_value = 0;
 }
 

-wxDataViewProgressRenderer::~wxDataViewProgressRenderer()
-{
-}
-

 bool wxDataViewProgressRenderer::SetValue( const wxVariant &value )
 {
     m_value = (long) value;
 bool wxDataViewProgressRenderer::SetValue( const wxVariant &value )
 {
     m_value = (long) value;


@@ -824,18 +935,23 @@ bool wxDataViewProgressRenderer::GetValue( wxVariant &value ) const
     return true;
 }
 
     return true;
 }
 

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

 {
 {

-    double pct = (double)m_value / 100.0;
-    wxRect bar = cell;
-    bar.width = (int)(cell.width * pct);
-    dc->SetPen( *wxTRANSPARENT_PEN );
-    dc->SetBrush( *wxBLUE_BRUSH );
-    dc->DrawRectangle( bar );
+    // deflate the rect to leave a small border between bars in adjacent rows
+    wxRect bar = rect.Deflate(0, 1);

 
     dc->SetBrush( *wxTRANSPARENT_BRUSH );
     dc->SetPen( *wxBLACK_PEN );
 
     dc->SetBrush( *wxTRANSPARENT_BRUSH );
     dc->SetPen( *wxBLACK_PEN );

-    dc->DrawRectangle( cell );
+    dc->DrawRectangle( bar );
+
+    bar.width = (int)(bar.width * m_value / 100.);
+    dc->SetPen( *wxTRANSPARENT_PEN );
+
+    const wxDataViewItemAttr& attr = GetAttr();
+    dc->SetBrush( attr.HasColour() ? wxBrush(attr.GetColour())
+                                  : *wxBLUE_BRUSH );
+    dc->DrawRectangle( bar );

 
     return true;
 }
 
     return true;
 }


@@ -892,20 +1008,17 @@ END_EVENT_TABLE()
 
 void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event )
 {
 
 void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event )
 {

-    wxDateTime date = event.GetDate();
-    wxVariant value = date;
-    m_model->SetValue( value, m_item, m_col );
-    m_model->ValueChanged( m_item, m_col );
+    m_model->ChangeValue( event.GetDate(), m_item, m_col );

     DismissAndNotify();
 }
 
 #endif // wxUSE_DATE_RENDERER_POPUP
 
     DismissAndNotify();
 }
 
 #endif // wxUSE_DATE_RENDERER_POPUP
 

-IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer, wxDataViewCustomRenderer)
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer, wxDataViewRenderer)

 
 wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype,
                         wxDataViewCellMode mode, int align ) :
 
 wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype,
                         wxDataViewCellMode mode, int align ) :

-    wxDataViewCustomRenderer( varianttype, mode, align )
+    wxDataViewRenderer( varianttype, mode, align )

 {
 }
 
 {
 }
 


@@ -922,873 +1035,850 @@ 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;
 }
 
 wxSize wxDataViewDateRenderer::GetSize() const
 {
     return true;
 }
 
 wxSize wxDataViewDateRenderer::GetSize() const
 {

-    const wxDataViewCtrl* view = GetView();
-    wxString tmp = m_date.FormatDate();
-    wxCoord x,y,d;
-    view->GetTextExtent( tmp, &x, &y, &d );
-    return wxSize(x,y+d);
+    return GetTextExtent(m_date.FormatDate());

 }
 
 }
 

-bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *model,
-                                       const wxDataViewItem & item, unsigned int col )
+bool wxDataViewDateRenderer::WXOnActivate(const wxRect& WXUNUSED(cell),
+                                          wxDataViewModel *model,
+                                          const wxDataViewItem& item,
+                                          unsigned int col)

 {
 {

-    wxVariant variant;
-    model->GetValue( variant, item, col );
-    wxDateTime value = variant.GetDateTime();
+    wxDateTime dtOld = m_date;

 
 #if wxUSE_DATE_RENDERER_POPUP
     wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient(
 
 #if wxUSE_DATE_RENDERER_POPUP
     wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient(

-        GetOwner()->GetOwner()->GetParent(), &value, model, item, col);
+        GetOwner()->GetOwner()->GetParent(), &dtOld, model, item, col);

     wxPoint pos = wxGetMousePosition();
     popup->Move( pos );
     popup->Layout();
     popup->Popup( popup->m_cal );
 #else // !wxUSE_DATE_RENDERER_POPUP
     wxPoint pos = wxGetMousePosition();
     popup->Move( pos );
     popup->Layout();
     popup->Popup( popup->m_cal );
 #else // !wxUSE_DATE_RENDERER_POPUP

-    wxMessageBox(value.Format());
+    wxMessageBox(dtOld.Format());

 #endif // wxUSE_DATE_RENDERER_POPUP/!wxUSE_DATE_RENDERER_POPUP
 #endif // wxUSE_DATE_RENDERER_POPUP/!wxUSE_DATE_RENDERER_POPUP

+

     return true;
 }
 
 // ---------------------------------------------------------
     return true;
 }
 
 // ---------------------------------------------------------

-// wxDataViewColumn
+// wxDataViewIconTextRenderer

 // ---------------------------------------------------------
 
 // ---------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
+IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewRenderer)

 
 

-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 )
+wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(
+const wxString &varianttype, wxDataViewCellMode mode, int align ) :
+    wxDataViewRenderer( varianttype, mode, align )

 {
 {

+    SetMode(mode);

     SetAlignment(align);
     SetAlignment(align);

-    SetTitle(title);
-    SetFlags(flags);
-
-    Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width);

 }
 
 }
 

-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 )
+bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )

 {
 {

-    SetAlignment(align);
-    SetFlags(flags);
-
-    Init(width < 0 ? wxDVC_TOGGLE_DEFAULT_WIDTH : width);
+    m_value << value;
+    return true;

 }
 
 }
 

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

 {
 {

+    return false;

 }
 
 }
 

-void wxDataViewColumn::Init( int width )
+bool wxDataViewIconTextRenderer::Render(wxRect rect, wxDC *dc, int state)

 {
 {

-    m_width = width;
-    m_minWidth = wxDVC_DEFAULT_MINWIDTH;
-    m_ascending = true;
-}
+    int xoffset = 0;

 
 

-void wxDataViewColumn::SetResizeable( bool resizeable )
-{
-    if (resizeable)
-        m_flags |= wxDATAVIEW_COL_RESIZABLE;
-    else
-        m_flags &= ~wxDATAVIEW_COL_RESIZABLE;
-}
+    const wxIcon& icon = m_value.GetIcon();
+    if ( icon.IsOk() )
+    {
+        dc->DrawIcon(icon, rect.x, rect.y + (rect.height - icon.GetHeight())/2);
+        xoffset = icon.GetWidth()+4;
+    }

 
 

-void wxDataViewColumn::SetHidden( bool hidden )
-{
-    if (hidden)
-        m_flags |= wxDATAVIEW_COL_HIDDEN;
-    else
-        m_flags &= ~wxDATAVIEW_COL_HIDDEN;
+    RenderText(m_value.GetText(), xoffset, rect, dc, state);

 
 

-    // tell our owner to e.g. update its scrollbars:
-    if (GetOwner())
-        GetOwner()->OnColumnChange();
+    return true;

 }
 
 }
 

-void wxDataViewColumn::SetSortable( bool sortable )
+wxSize wxDataViewIconTextRenderer::GetSize() const

 {
 {

-    if (sortable)
-        m_flags |= wxDATAVIEW_COL_SORTABLE;
-    else
-        m_flags &= ~wxDATAVIEW_COL_SORTABLE;
+    if (!m_value.GetText().empty())
+    {
+        wxSize size = GetTextExtent(m_value.GetText());

 
 

-    // Update header button
-    if (GetOwner())
-        GetOwner()->OnColumnChange();
+        if (m_value.GetIcon().IsOk())
+            size.x += m_value.GetIcon().GetWidth() + 4;
+        return size;
+    }
+    return wxSize(80,20);

 }
 
 }
 

-void wxDataViewColumn::SetSortOrder( bool ascending )
+wxWindow* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant& value)

 {
 {

-    m_ascending = ascending;
+    wxDataViewIconText iconText;
+    iconText << value;

 
 

-    // Update header button
-    if (GetOwner())
-        GetOwner()->OnColumnChange();
-}
+    wxString text = iconText.GetText();

 
 

-bool wxDataViewColumn::IsSortOrderAscending() const
-{
-    return m_ascending;
-}
+    // adjust the label rect to take the width of the icon into account
+    if (iconText.GetIcon().IsOk())
+    {
+        int w = iconText.GetIcon().GetWidth() + 4;
+        labelRect.x += w;
+        labelRect.width -= w;
+    }

 
 

-void wxDataViewColumn::SetInternalWidth( int width )
-{
-    m_width = width;
+    wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, text,
+                                       wxPoint(labelRect.x,labelRect.y),
+                                       wxSize(labelRect.width,labelRect.height) );
+
+    // select the text in the control an place the cursor at the end
+    ctrl->SetInsertionPointEnd();
+    ctrl->SelectAll();

 
 

-    // the scrollbars of the wxDataViewCtrl needs to be recalculated!
-    if (m_owner && m_owner->m_clientArea)
-        m_owner->m_clientArea->RecalculateDisplay();
+    return ctrl;

 }
 
 }
 

-void wxDataViewColumn::SetWidth( int width )
+bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxWindow *editor, wxVariant& value )

 {
 {

-    m_owner->m_headerArea->UpdateDisplay();
+    wxTextCtrl *text = (wxTextCtrl*) editor;

 
 

-    SetInternalWidth(width);
+    wxDataViewIconText iconText(text->GetValue(), m_value.GetIcon());
+    value << iconText;
+    return true;

 }
 
 }
 

-

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// wxDataViewHeaderWindowBase
+// wxDataViewDropTarget

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-void wxDataViewHeaderWindowBase::SendEvent(wxEventType type, unsigned int n)
-{
-    wxWindow *parent = GetParent();
-    wxDataViewEvent le(type, parent->GetId());
-
-    le.SetEventObject(parent);
-    le.SetColumn(n);
-    le.SetDataViewColumn(GetColumn(n));
-    le.SetModel(GetOwner()->GetModel());
+#if wxUSE_DRAG_AND_DROP

 
 

-    // for events created by wxDataViewHeaderWindow the
-    // row / value fields are not valid
+class wxBitmapCanvas: public wxWindow
+{
+public:
+    wxBitmapCanvas( wxWindow *parent, const wxBitmap &bitmap, const wxSize &size ) :
+    wxWindow( parent, wxID_ANY, wxPoint(0,0), size )
+    {
+        m_bitmap = bitmap;
+        Connect( wxEVT_PAINT, wxPaintEventHandler(wxBitmapCanvas::OnPaint) );
+    }

 
 

-    parent->GetEventHandler()->ProcessEvent(le);
-}
+    void OnPaint( wxPaintEvent &WXUNUSED(event) )
+    {
+        wxPaintDC dc(this);
+        dc.DrawBitmap( m_bitmap, 0, 0);
+    }

 
 

-#if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW
+    wxBitmap m_bitmap;
+};

 
 

-// implemented in msw/listctrl.cpp:
-int WXDLLIMPEXP_CORE wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick);
+class wxDataViewDropSource: public wxDropSource
+{
+public:
+    wxDataViewDropSource( wxDataViewMainWindow *win, unsigned int row ) :
+        wxDropSource( win )
+    {
+        m_win = win;
+        m_row = row;
+        m_hint = NULL;
+    }

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxDataViewHeaderWindowMSW, wxWindow)
+    ~wxDataViewDropSource()
+    {
+        delete m_hint;
+    }

 
 

-bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id,
-                                        const wxPoint &pos, const wxSize &size,
-                                        const wxString &name )
-{
-    m_owner = parent;
+    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect) )
+    {
+        wxPoint pos = wxGetMousePosition();

 
 

-    if ( !CreateControl(parent, id, pos, size, 0, wxDefaultValidator, name) )
-        return false;
+        if (!m_hint)
+        {
+            int liney = m_win->GetLineStart( m_row );
+            int linex = 0;
+            m_win->GetOwner()->CalcUnscrolledPosition( 0, liney, NULL, &liney );
+            m_win->ClientToScreen( &linex, &liney );
+            m_dist_x = pos.x - linex;
+            m_dist_y = pos.y - liney;
+
+            int indent = 0;
+            wxBitmap ib = m_win->CreateItemBitmap( m_row, indent );
+            m_dist_x -= indent;
+            m_hint = new wxFrame( m_win->GetParent(), wxID_ANY, wxEmptyString,
+                                        wxPoint(pos.x - m_dist_x, pos.y + 5 ),
+                                        ib.GetSize(),
+                                        wxFRAME_TOOL_WINDOW |
+                                        wxFRAME_FLOAT_ON_PARENT |
+                                        wxFRAME_NO_TASKBAR |
+                                        wxNO_BORDER );
+            new wxBitmapCanvas( m_hint, ib, ib.GetSize() );
+            m_hint->Show();
+        }
+        else
+        {
+            m_hint->Move( pos.x - m_dist_x, pos.y + 5  );
+            m_hint->SetTransparent( 128 );
+        }

 
 

-    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;
     }
 
         return false;
     }
 

-    // we need to subclass the m_hWnd to force wxWindow::HandleNotify
-    // to call wxDataViewHeaderWindow::MSWOnNotify
-    SubclassWin(m_hWnd);
+    wxDataViewMainWindow   *m_win;
+    unsigned int            m_row;
+    wxFrame                *m_hint;
+    int m_dist_x,m_dist_y;
+};
+

 
 

-    // 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());
+class wxDataViewDropTarget: public wxDropTarget
+{
+public:
+    wxDataViewDropTarget( wxDataObject *obj, wxDataViewMainWindow *win ) :
+        wxDropTarget( obj )
+    {
+        m_win = win;
+    }

 
 

-    RECT rcParent;
-    HDLAYOUT hdl;
-    WINDOWPOS wp;
+    virtual wxDragResult OnDragOver( wxCoord x, wxCoord y, wxDragResult def )
+    {
+        wxDataFormat format = GetMatchingPair();
+        if (format == wxDF_INVALID)
+            return wxDragNone;
+        return m_win->OnDragOver( format, x, y, def);
+    }

 
 

-    // 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);
+    virtual bool OnDrop( wxCoord x, wxCoord y )
+    {
+        wxDataFormat format = GetMatchingPair();
+        if (format == wxDF_INVALID)
+            return false;
+        return m_win->OnDrop( format, x, y );
+    }

 
 

-    hdl.prc = &rcParent;
-    hdl.pwpos = &wp;
-    if (!SendMessage((HWND)m_hWnd, HDM_LAYOUT, 0, (LPARAM) &hdl))
+    virtual wxDragResult OnData( wxCoord x, wxCoord y, wxDragResult def )

     {
     {

-        wxLogLastError(_T("SendMessage"));
-        return false;
+        wxDataFormat format = GetMatchingPair();
+        if (format == wxDF_INVALID)
+            return wxDragNone;
+        if (!GetData())
+            return wxDragNone;
+        return m_win->OnData( format, x, y, def );

     }
 
     }
 

-    // 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);
+    virtual void OnLeave()
+        { m_win->OnLeave(); }
+
+    wxDataViewMainWindow   *m_win;
+};

 
 

-    // 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));
+#endif // wxUSE_DRAG_AND_DROP

 
 

-    return true;
-}
+//-----------------------------------------------------------------------------
+// wxDataViewRenameTimer
+//-----------------------------------------------------------------------------

 
 

-wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow()
+wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner )

 {
 {

-    UnsubclassWin();
+    m_owner = owner;

 }
 
 }
 

-void wxDataViewHeaderWindowMSW::UpdateDisplay()
+void wxDataViewRenameTimer::Notify()

 {
 {

-    // remove old columns
-    for (int j=0, max=Header_GetItemCount((HWND)m_hWnd); j < max; j++)
-        Header_DeleteItem((HWND)m_hWnd, 0);
-
-    // add the updated array of columns to the header control
-    unsigned int cols = GetOwner()->GetColumnCount();
-    unsigned int added = 0;
-    wxDataViewModel * model = GetOwner()->GetModel();
-    for (unsigned int i = 0; i < cols; i++)
-    {
-        wxDataViewColumn *col = GetColumn( i );
-        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;
-
-        // 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;
-
-        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;
-            break;
+    m_owner->OnRenameTimer();
+}

 
 

-        default:
-            // such alignment is not allowed for the column header!
-            wxFAIL;
-        }
+//-----------------------------------------------------------------------------
+// wxDataViewMainWindow
+//-----------------------------------------------------------------------------

 
 

-        SendMessage((HWND)m_hWnd, HDM_INSERTITEM,
-                    (WPARAM)added, (LPARAM)&hdi);
-        added++;
-    }
-}
+// The tree building helper, declared firstly
+static void BuildTreeHelper( const wxDataViewModel * model,  const wxDataViewItem & item,
+                             wxDataViewTreeNode * node);

 
 

-unsigned int wxDataViewHeaderWindowMSW::GetColumnIdxFromHeader(NMHEADER *nmHDR)
+int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )

 {
 {

-    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 (row1 > row2) return 1;
+    if (row1 == row2) return 0;
+    return -1;
+}

 
 

-    if (nmHDR->pitem && nmHDR->pitem->mask & HDI_LPARAM)
-    {
-        idx = (unsigned int)nmHDR->pitem->lParam;
-        return idx;
-    }
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow)

 
 

-    HDITEM item;
-    item.mask = HDI_LPARAM;
-    Header_GetItem((HWND)m_hWnd, nmHDR->iItem, &item);
+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()

 
 

-    return (unsigned int)item.lParam;
-}
+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 wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)

 {
 {

-    NMHDR *nmhdr = (NMHDR *)lParam;
+    SetOwner( parent );

 
 

-    // is it a message from the header?
-    if ( nmhdr->hwndFrom != (HWND)m_hWnd )
-        return wxWindow::MSWOnNotify(idCtrl, lParam, result);
+    m_lastOnSame = false;
+    m_renameTimer = new wxDataViewRenameTimer( this );

 
 

-    NMHEADER *nmHDR = (NMHEADER *)nmhdr;
-    switch ( nmhdr->code )
-    {
-        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;
+    // TODO: user better initial values/nothing selected
+    m_currentCol = NULL;
+    m_currentRow = 0;

 
 

-        case HDN_BEGINDRAG:
-            // user has started to reorder a column
-            break;
+    m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1

 
 

-        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;
+#if wxUSE_DRAG_AND_DROP
+    m_dragCount = 0;
+    m_dragStart = wxPoint(0,0);

 
 

-        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
+    m_dragEnabled = false;
+    m_dropEnabled = false;
+    m_dropHint = false;
+    m_dropHintLine = (unsigned int) -1;
+#endif // wxUSE_DRAG_AND_DROP

 
 

-            // 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);
+    m_lineLastClicked = (unsigned int) -1;
+    m_lineBeforeLastClicked = (unsigned int) -1;
+    m_lineSelectSingleOnUp = (unsigned int) -1;

 
 

-                // see UpdateDisplay() for more info about COLUMN_WIDTH_OFFSET
-                if (idx == 0 && w > COLUMN_WIDTH_OFFSET)
-                    w -= COLUMN_WIDTH_OFFSET;
+    m_hasFocus = false;

 
 

-                if (w >= (unsigned)col->GetMinWidth())
-                    col->SetInternalWidth(w);
-            }
-            break;
+    SetBackgroundColour( *wxWHITE );

 
 

-        case HDN_ITEMCLICK:
-            {
-                unsigned int idx = GetColumnIdxFromHeader(nmHDR);
-                wxDataViewModel * model = GetOwner()->GetModel();
+    SetBackgroundStyle(wxBG_STYLE_CUSTOM);

 
 

-                if(nmHDR->iButton == 0)
-                {
-                    wxDataViewColumn *col = GetColumn(idx);
-                    if(col->IsSortable())
-                    {
-                        if(model && model->GetSortingColumn() == idx)
-                        {
-                            bool order = col->IsSortOrderAscending();
-                            col->SetSortOrder(!order);
-                            model->SetSortOrderAscending(!order);
-                        }
-                        else if(model)
-                        {
-                            model->SetSortingColumn(idx);
-                            model->SetSortOrderAscending(true);
-                        }
-                    }
-                    UpdateDisplay();
-                    if(model)
-                        model->Resort();
-                }
+    m_penRule = wxPen(GetRuleColour());

 
 

-                wxEventType evt = nmHDR->iButton == 0 ?
-                        wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK :
-                        wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK;
-                SendEvent(evt, idx);
-            }
-            break;
+    // compose a pen whichcan draw black lines
+    // TODO: maybe there is something system colour to use
+    m_penExpander = wxPen(wxColour(0,0,0));

 
 

-        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
+    m_root = new wxDataViewTreeNode( NULL );
+    m_root->SetHasChildren(true);

 
 

-                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;
+    // Make m_count = -1 will cause the class recaculate the real displaying number of rows.
+    m_count = -1;
+    m_underMouse = NULL;
+    UpdateDisplay();
+}

 
 

-        case HDN_GETDISPINFOW:
-            // see wxListCtrl::MSWOnNotify for more info!
-            break;
+wxDataViewMainWindow::~wxDataViewMainWindow()
+{
+    DestroyTree();
+    delete m_renameTimer;
+}

 
 

-        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);
-            }
-            break;

 
 

-        default:
-            return wxWindow::MSWOnNotify(idCtrl, lParam, result);
-    }
+#if wxUSE_DRAG_AND_DROP
+bool wxDataViewMainWindow::EnableDragSource( const wxDataFormat &format )
+{
+    m_dragFormat = format;
+    m_dragEnabled = format != wxDF_INVALID;

 
     return true;
 }
 
 
     return true;
 }
 

-void wxDataViewHeaderWindowMSW::ScrollWindow(int WXUNUSED(dx), int WXUNUSED(dy),
-                                             const wxRect *WXUNUSED(rect))
+bool wxDataViewMainWindow::EnableDropTarget( const wxDataFormat &format )

 {
 {

-    wxSize ourSz = GetClientSize();
-    wxSize ownerSz = m_owner->GetClientSize();
+    m_dropFormat = format;
+    m_dropEnabled = format != wxDF_INVALID;

 
 

-    // where should the (logical) origin of this window be placed?
-    int x1 = 0, y1 = 0;
-    m_owner->CalcUnscrolledPosition(0, 0, &x1, &y1);
+    if (m_dropEnabled)
+        SetDropTarget( new wxDataViewDropTarget( new wxCustomDataObject( format ), this ) );

 
 

-    // put this window on top of our parent and
-    SetWindowPos((HWND)m_hWnd, HWND_TOP, -x1, 0,
-                  ownerSz.GetWidth() + x1, ourSz.GetHeight(),
-                  SWP_SHOWWINDOW);
+    return true;

 }
 
 }
 

-void wxDataViewHeaderWindowMSW::DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
-                                          int WXUNUSED(w), int WXUNUSED(h),
-                                          int WXUNUSED(f))
+void wxDataViewMainWindow::RemoveDropHint()

 {
 {

-    // 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);
+    if (m_dropHint)
+    {
+            m_dropHint = false;
+            RefreshRow( m_dropHintLine );
+            m_dropHintLine = (unsigned int) -1;
+    }

 }
 
 }
 

-#else       // !defined(__WXMSW__)
+wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x,
+                                               wxCoord y, wxDragResult def )
+{
+    int xx = x;
+    int yy = y;
+    m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy );
+    unsigned int row = GetLineAt( yy );

 
 

-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()
+    if ((row >= GetRowCount()) || (xx > GetEndOfLastCol()))
+    {
+        RemoveDropHint();
+        return wxDragNone;
+    }
+
+    wxDataViewItem item = GetItemByRow( row );

 
 

-bool wxGenericDataViewHeaderWindow::Create(wxDataViewCtrl *parent, wxWindowID id,
-                                           const wxPoint &pos, const wxSize &size,
-                                           const wxString &name )
+    wxDataViewModel *model = GetOwner()->GetModel();
+
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
+    event.SetEventObject( m_owner );
+    event.SetItem( item );
+    event.SetModel( model );
+    event.SetDataFormat( format );
+    if (!m_owner->HandleWindowEvent( event ))
+    {
+        RemoveDropHint();
+        return wxDragNone;
+    }
+
+    if (!event.IsAllowed())
+    {
+        RemoveDropHint();
+        return wxDragNone;
+    }
+
+
+    if (m_dropHint && (row != m_dropHintLine))
+        RefreshRow( m_dropHintLine );
+    m_dropHint = true;
+    m_dropHintLine = row;
+    RefreshRow( row );
+
+    return def;
+}
+
+bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y )

 {
 {

-    m_owner = parent;
+    RemoveDropHint();
+
+    int xx = x;
+    int yy = y;
+    m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy );
+    unsigned int row = GetLineAt( yy );

 
 

-    if (!wxDataViewHeaderWindowBase::Create(parent, id, pos, size, name))
+    if ((row >= GetRowCount()) || (xx > GetEndOfLastCol()))

         return false;
 
         return false;
 

-    wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes();
-    SetBackgroundStyle( wxBG_STYLE_CUSTOM );
-    SetOwnForegroundColour( attr.colFg );
-    SetOwnBackgroundColour( attr.colBg );
-    if (!m_hasFont)
-        SetOwnFont( attr.font );
+    wxDataViewItem item = GetItemByRow( row );

 
 

-    // 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));
+    wxDataViewModel *model = GetOwner()->GetModel();
+
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
+    event.SetEventObject( m_owner );
+    event.SetItem( item );
+    event.SetModel( model );
+    event.SetDataFormat( format );
+    if (!m_owner->HandleWindowEvent( event ))
+        return false;
+
+    if (!event.IsAllowed())
+        return false;

 
     return true;
 }
 
 
     return true;
 }
 

-void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
+wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoord y,
+                                           wxDragResult def )

 {
 {

-    int w, h;
-    GetClientSize( &w, &h );
+    int xx = x;
+    int yy = y;
+    m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy );
+    unsigned int row = GetLineAt( yy );

 
 

-    wxAutoBufferedPaintDC dc( this );
+    if ((row >= GetRowCount()) || (xx > GetEndOfLastCol()))
+        return wxDragNone;

 
 

-    dc.SetBackground(GetBackgroundColour());
-    dc.Clear();
+    wxDataViewItem item = GetItemByRow( row );

 
 

-    int xpix;
-    m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
+    wxDataViewModel *model = GetOwner()->GetModel();

 
 

-    int x;
-    m_owner->GetViewStart( &x, NULL );
+    wxCustomDataObject *obj = (wxCustomDataObject *) GetDropTarget()->GetDataObject();

 
 

-    // account for the horz scrollbar offset
-    dc.SetDeviceOrigin( -x * xpix, 0 );
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, m_owner->GetId() );
+    event.SetEventObject( m_owner );
+    event.SetItem( item );
+    event.SetModel( model );
+    event.SetDataFormat( format );
+    event.SetDataSize( obj->GetSize() );
+    event.SetDataBuffer( obj->GetData() );
+    if (!m_owner->HandleWindowEvent( event ))
+        return wxDragNone;

 
 

-    dc.SetFont( GetFont() );
+    if (!event.IsAllowed())
+        return wxDragNone;
+
+    return def;
+}
+
+void wxDataViewMainWindow::OnLeave()
+{
+    RemoveDropHint();
+}

 
 

+wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent )
+{
+    int height = GetLineHeight( row );
+    int width = 0;

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

-    unsigned int i;
-    int xpos = 0;
-    for (i = 0; i < cols; i++)
+    unsigned int col;
+    for (col = 0; col < cols; col++)

     {
     {

-        wxDataViewColumn *col = GetColumn( i );
-        if (col->IsHidden())
+        wxDataViewColumn *column = GetOwner()->GetColumnAt(col);
+        if (column->IsHidden())

             continue;      // skip it!
             continue;      // skip it!

+        width += column->GetWidth();
+    }

 
 

-        int cw = col->GetWidth();
-        int ch = h;
+    indent = 0;
+    if (!IsList())
+    {
+        wxDataViewTreeNode *node = GetTreeNodeByRow(row);
+        indent = GetOwner()->GetIndent() * node->GetIndentLevel();
+        indent = indent + m_lineHeight;
+            // try to use the m_lineHeight as the expander space

 
 

-        wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE;
-        if (col->IsSortable())
-        {
-            if (col->IsSortOrderAscending())
-                sortArrow = wxHDR_SORT_ICON_UP;
-            else
-                sortArrow = wxHDR_SORT_ICON_DOWN;
-        }
+        if(!node->HasChildren())
+            delete node;
+    }
+    width -= indent;

 
 

-        wxRendererNative::Get().DrawHeaderButton
-                                (
-                                    this,
-                                    dc,
-                                    wxRect(xpos, 0, cw, ch-1),
-                                    m_parent->IsEnabled() ? 0
-                                                          : (int)wxCONTROL_DISABLED,
-                                    sortArrow
-                                );
+    wxBitmap bitmap( width, height );
+    wxMemoryDC dc( bitmap );
+    dc.SetFont( GetFont() );
+    dc.SetPen( *wxBLACK_PEN );
+    dc.SetBrush( *wxWHITE_BRUSH );
+    dc.DrawRectangle( 0,0,width,height );

 
 

-        // 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_CENTER:
-        case wxALIGN_CENTER_HORIZONTAL:
-            x += (cw - titleSz.GetWidth() - 2 * HEADER_HORIZ_BORDER)/2;
-            break;
-        case wxALIGN_RIGHT:
-            x += cw - titleSz.GetWidth() - HEADER_HORIZ_BORDER;
-            break;
-        }
+    wxDataViewModel *model = m_owner->GetModel();
+
+    wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
+    if (!expander)
+    {
+        // TODO-RTL: last column for RTL support
+        expander = GetOwner()->GetColumnAt( 0 );
+        GetOwner()->SetExpanderColumn(expander);
+    }
+
+
+    int x = 0;
+    for (col = 0; col < cols; col++)
+    {
+        wxDataViewColumn *column = GetOwner()->GetColumnAt( col );
+        wxDataViewRenderer *cell = column->GetRenderer();
+
+        if (column->IsHidden())
+            continue;       // skip it!
+
+        width = column->GetWidth();
+
+        if (column == expander)
+            width -= indent;

 
 

-        // always center the title vertically:
-        int y = wxMax((ch - titleSz.GetHeight()) / 2, HEADER_VERT_BORDER);
+        wxDataViewItem item = GetItemByRow( row );
+        cell->PrepareForItem(model, item, column->GetModelColumn());

 
 

-        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();
+        wxRect item_rect(x, 0, width, height);
+        item_rect.Deflate(PADDING_RIGHTLEFT, 0);

 
 

-        xpos += cw;
+        // dc.SetClippingRegion( item_rect );
+        cell->WXCallRender(item_rect, &dc, 0);
+        // dc.DestroyClippingRegion();
+
+        x += width;

     }
     }

-}

 
 

-void wxGenericDataViewHeaderWindow::OnSetFocus( wxFocusEvent &event )
-{
-    GetParent()->SetFocus();
-    event.Skip();
+    return bitmap;

 }
 
 }
 

-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();
+#endif // wxUSE_DRAG_AND_DROP

 
 

-    if (m_isDragging)
-    {
-        // 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;

 
 

-        // erase the line if it was drawn
-        if (m_currentX < w)
-            DrawCurrent();
+void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
+{
+    wxDataViewModel *model = GetOwner()->GetModel();
+    wxAutoBufferedPaintDC dc( this );

 
 

-        if (event.ButtonUp())
-        {
-            m_isDragging = false;
-            if (HasCapture())
-                ReleaseMouse();
+#ifdef __WXMSW__
+    dc.SetBrush(GetOwner()->GetBackgroundColour());
+    dc.SetPen( *wxTRANSPARENT_PEN );
+    dc.DrawRectangle(GetClientSize());
+#endif

 
 

-            m_dirty = true;
+    if ( IsEmpty() )
+    {
+        // No items to draw.
+        return;
+    }

 
 

-            GetColumn(m_column)->SetWidth(m_currentX - m_minX);
+    // prepare the DC
+    GetOwner()->PrepareDC( dc );
+    dc.SetFont( GetFont() );

 
 

-            Refresh();
-            GetOwner()->Refresh();
-        }
-        else
-        {
-            m_currentX = wxMax(m_minX + 7, x);
+    wxRect update = GetUpdateRegion().GetBox();
+    m_owner->CalcUnscrolledPosition( update.x, update.y, &update.x, &update.y );

 
 

-            // draw in the new location
-            if (m_currentX < w) DrawCurrent();
-        }
+    // 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;
+
+    // Send the event to wxDataViewCtrl itself.
+    wxWindow * const parent = GetParent();
+    wxDataViewEvent cache_event(wxEVT_COMMAND_DATAVIEW_CACHE_HINT, parent->GetId());
+    cache_event.SetEventObject(parent);
+    cache_event.SetCache(item_start, item_last - 1);
+    parent->ProcessWindowEvent(cache_event);

 
 

+    // compute which columns needs to be redrawn
+    unsigned int cols = GetOwner()->GetColumnCount();
+    if ( !cols )
+    {
+        // we assume that we have at least one column below and painting an
+        // empty control is unnecessary anyhow
+        return;

     }
     }

-    else     // not dragging
+
+    unsigned int col_start = 0;
+    unsigned int x_start;
+    for (x_start = 0; col_start < cols; col_start++)

     {
     {

-        m_minX = 0;
-        m_column = wxNOT_FOUND;
+        wxDataViewColumn *col = GetOwner()->GetColumnAt(col_start);
+        if (col->IsHidden())
+            continue;      // skip it!

 
 

-        bool hit_border = false;
+        unsigned int w = col->GetWidth();
+        if (x_start+w >= (unsigned int)update.x)
+            break;

 
 

-        // end of the current column
-        int xpos = 0;
+        x_start += w;
+    }

 
 

-        // find the column where this event occured
-        int countCol = m_owner->GetColumnCount();
-        for (int column = 0; column < countCol; column++)
-        {
-            wxDataViewColumn *p = GetColumn(column);
+    unsigned int col_last = col_start;
+    unsigned int x_last = x_start;
+    for (; col_last < cols; col_last++)
+    {
+        wxDataViewColumn *col = GetOwner()->GetColumnAt(col_last);
+        if (col->IsHidden())
+            continue;      // skip it!

 
 

-            if (p->IsHidden())
-                continue;   // skip if not shown
+        if (x_last > (unsigned int)update.GetRight())
+            break;

 
 

-            xpos += p->GetWidth();
-            m_column = column;
-            if ((abs(x-xpos) < 3) && (y < 22))
-            {
-                hit_border = true;
-                break;
-            }
+        x_last += col->GetWidth();
+    }

 
 

-            if (x < xpos)
-            {
-                // inside the column
-                break;
-            }
+    // Draw horizontal rules if required
+    if ( m_owner->HasFlag(wxDV_HORIZ_RULES) )
+    {
+        dc.SetPen(m_penRule);
+        dc.SetBrush(*wxTRANSPARENT_BRUSH);

 
 

-            m_minX = xpos;
+        for (unsigned int i = item_start; i <= item_last; i++)
+        {
+            int y = GetLineStart( i );
+            dc.DrawLine(x_start, y, x_last, y);

         }
         }

+    }

 
 

-        if (m_column == wxNOT_FOUND)
-            return;
+    // Draw vertical rules if required
+    if ( m_owner->HasFlag(wxDV_VERT_RULES) )
+    {
+        dc.SetPen(m_penRule);
+        dc.SetBrush(*wxTRANSPARENT_BRUSH);

 
 

-        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())
+        // NB: Vertical rules are drawn in the last pixel of a column so that
+        //     they align perfectly with native MSW wxHeaderCtrl as well as for
+        //     consistency with MSW native list control. There's no vertical
+        //     rule at the most-left side of the control.
+
+        int x = x_start - 1;
+        for (unsigned int i = col_start; i < col_last; i++)

         {
         {

-            if (hit_border && event.LeftDown() && resizeable)
-            {
-                m_isDragging = true;
-                CaptureMouse();
-                m_currentX = x;
-                DrawCurrent();
-            }
-            else    // click on a column
-            {
-                wxEventType evt = event.LeftDown() ?
-                        wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK :
-                        wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK;
-                SendEvent(evt, m_column);
-            }
+            wxDataViewColumn *col = GetOwner()->GetColumnAt(i);
+            if (col->IsHidden())
+                continue;       // skip it
+
+            x += col->GetWidth();
+
+            dc.DrawLine(x, GetLineStart( item_start ),
+                        x, GetLineStart( item_last ) );

         }
         }

-        else if (event.Moving())
+    }
+
+    // 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)

         {
         {

-            if (hit_border && resizeable)
-                m_currentCursor = m_resizeCursor;
-            else
-                m_currentCursor = wxSTANDARD_CURSOR;
+            int flags = selected ? (int)wxCONTROL_SELECTED : 0;
+            if (item == m_currentRow)
+                flags |= wxCONTROL_CURRENT;
+            if (m_hasFocus)
+                flags |= wxCONTROL_FOCUSED;

 
 

-            SetCursor(*m_currentCursor);
+            wxRect rect( x_start, GetLineStart( item ),
+                         x_last - x_start, GetLineHeight( item ) );
+            wxRendererNative::Get().DrawItemSelectionRect
+                                (
+                                    this,
+                                    dc,
+                                    rect,
+                                    flags
+                                );

         }
     }
         }
     }

-}
-
-void wxGenericDataViewHeaderWindow::DrawCurrent()
-{
-    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 );
+#if wxUSE_DRAG_AND_DROP
+    if (m_dropHint)
+    {
+        wxRect rect( x_start, GetLineStart( m_dropHintLine ),
+                     x_last - x_start, GetLineHeight( m_dropHintLine ) );
+        dc.SetPen( *wxBLACK_PEN );
+        dc.SetBrush( *wxTRANSPARENT_BRUSH );
+        dc.DrawRectangle( rect );
+    }
+#endif // wxUSE_DRAG_AND_DROP

 
 

-    wxScreenDC dc;
-    dc.SetLogicalFunction(wxINVERT);
-    dc.SetPen(m_penCurrent);
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    AdjustDC(dc);
-    dc.DrawLine(x1, y1, x2, y2);
-}
+    wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
+    if (!expander)
+    {
+        // TODO-RTL: last column for RTL support
+        expander = GetOwner()->GetColumnAt( 0 );
+        GetOwner()->SetExpanderColumn(expander);
+    }

 
 

-void wxGenericDataViewHeaderWindow::AdjustDC(wxDC& dc)
-{
-    int xpix, x;
+    // 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++)
+    {
+        wxDataViewColumn *col = GetOwner()->GetColumnAt( i );
+        wxDataViewRenderer *cell = col->GetRenderer();
+        cell_rect.width = col->GetWidth();

 
 

-    m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
-    m_owner->GetViewStart( &x, NULL );
+        if ( col->IsHidden() || cell_rect.width <= 0 )
+            continue;       // skip it!

 
 

-    // 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 );
-}
+        for (unsigned int item = item_start; item < item_last; item++)
+        {
+            // get the cell value and set it into the renderer
+            wxDataViewTreeNode *node = NULL;
+            wxDataViewItem dataitem;

 
 

-#endif      // defined(__WXMSW__)
+            if (!IsVirtualList())
+            {
+                node = GetTreeNodeByRow(item);
+                if( node == NULL )
+                    continue;

 
 

-//-----------------------------------------------------------------------------
-// wxDataViewRenameTimer
-//-----------------------------------------------------------------------------
+                dataitem = node->GetItem();

 
 

-wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner )
-{
-    m_owner = owner;
-}
+                // Skip all columns of "container" rows except the expander
+                // column itself unless HasContainerColumns() overrides this.
+                if ( col != GetOwner()->GetExpanderColumn() &&
+                        model->IsContainer(dataitem) &&
+                            !model->HasContainerColumns(dataitem) )
+                    continue;
+            }
+            else
+            {
+                dataitem = wxDataViewItem( wxUIntToPtr(item+1) );
+            }

 
 

-void wxDataViewRenameTimer::Notify()
-{
-    m_owner->OnRenameTimer();
-}
+            cell->PrepareForItem(model, dataitem, col->GetModelColumn());

 
 

-//-----------------------------------------------------------------------------
-// wxDataViewMainWindow
-//-----------------------------------------------------------------------------
+            // update cell_rect
+            cell_rect.y = GetLineStart( item );
+            cell_rect.height = GetLineHeight( item );

 
 

-//The tree building helper, declared firstly
-void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataViewTreeNode * node);
+            // deal with the expander
+            int indent = 0;
+            if ((!IsList()) && (col == expander))
+            {
+                // Calculate the indent first
+                indent = GetOwner()->GetIndent() * node->GetIndentLevel();

 
 

-int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )
-{
-    if (row1 > row2) return 1;
-    if (row1 == row2) return 0;
-    return -1;
-}
+                // we reserve m_lineHeight of horizontal space for the expander
+                // but leave EXPANDER_MARGIN around the expander itself
+                int exp_x = cell_rect.x + indent + EXPANDER_MARGIN;

 
 

+                indent += m_lineHeight;

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow)
+                // draw expander if needed and visible
+                if ( node->HasChildren() && exp_x < cell_rect.GetRight() )
+                {
+                    dc.SetPen( m_penExpander );
+                    dc.SetBrush( wxNullBrush );

 
 

-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()
+                    int exp_size = m_lineHeight - 2*EXPANDER_MARGIN;
+                    int exp_y = cell_rect.y + (cell_rect.height - exp_size)/2
+                                   + EXPANDER_MARGIN - EXPANDER_OFFSET;

 
 

-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 )
+                    const wxRect rect(exp_x, exp_y, exp_size, exp_size);

 
 

-{
-    SetOwner( parent );
+                    int flag = 0;
+                    if ( m_underMouse == node )
+                        flag |= wxCONTROL_CURRENT;
+                    if ( node->IsOpen() )
+                        flag |= wxCONTROL_EXPANDED;

 
 

-    m_lastOnSame = false;
-    m_renameTimer = new wxDataViewRenameTimer( this );
+                    // ensure that we don't overflow the cell (which might
+                    // happen if the column is very narrow)
+                    wxDCClipper clip(dc, cell_rect);

 
 

-    // TODO: user better initial values/nothing selected
-    m_currentCol = NULL;
-    m_currentRow = 0;
+                    wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
+                }

 
 

-    // TODO: we need to calculate this smartly
-    m_lineHeight =
-#ifdef __WXMSW__
-        17;
-#else
-        20;
-#endif
-    wxASSERT(m_lineHeight > 2*PADDING_TOPBOTTOM);
+                // 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);
+            }

 
 

-    m_dragCount = 0;
-    m_dragStart = wxPoint(0,0);
-    m_lineLastClicked = (unsigned int) -1;
-    m_lineBeforeLastClicked = (unsigned int) -1;
-    m_lineSelectSingleOnUp = (unsigned int) -1;
+            wxRect item_rect = cell_rect;
+            item_rect.Deflate(PADDING_RIGHTLEFT, 0);

 
 

-    m_hasFocus = false;
+            // account for the tree indent (harmless if we're not indented)
+            item_rect.x += indent;
+            item_rect.width -= indent;

 
 

-    SetBackgroundStyle( wxBG_STYLE_CUSTOM );
-    SetBackgroundColour( *wxWHITE );
+            if ( item_rect.width <= 0 )
+                continue;

 
 

-    m_penRule = wxPen(GetRuleColour(), 1, wxSOLID);
+            int state = 0;
+            if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND))
+                state |= wxDATAVIEW_CELL_SELECTED;

 
 

-    //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);
+            // 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.
+            wxDCClipper clip(dc, item_rect);

 
 

-    //Make m_count = -1 will cause the class recaculate the real displaying number of rows.
-    m_count = -1 ;
-    UpdateDisplay();
-}
+            cell->WXCallRender(item_rect, &dc, state);
+        }

 
 

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

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


@@ -1796,89 +1886,61 @@ void wxDataViewMainWindow::OnRenameTimer()
     // We have to call this here because changes may just have
     // been made and no screen update taken place.
     if ( m_dirty )
     // We have to call this here because changes may just have
     // been made and no screen update taken place.
     if ( m_dirty )

-        wxSafeYield();
-
-    int xpos = 0;
-    unsigned int cols = GetOwner()->GetColumnCount();
-    unsigned int i;
-    for (i = 0; i < cols; i++)

     {
     {

-        wxDataViewColumn *c = GetOwner()->GetColumn( i );
-        if (c->IsHidden())
-            continue;      // skip it!
-
-        if (c == m_currentCol)
-            break;
-        xpos += c->GetWidth();
+        // TODO: use wxTheApp->SafeYieldFor(NULL, wxEVT_CATEGORY_UI) instead
+        //       (needs to be tested!)
+        wxSafeYield();

     }
     }

-    wxRect labelRect( xpos, m_currentRow * m_lineHeight,
-                      m_currentCol->GetWidth(), m_lineHeight );
-
-    GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y,
-                                     &labelRect.x, &labelRect.y);

 
     wxDataViewItem item = GetItemByRow( m_currentRow );
 
     wxDataViewItem item = GetItemByRow( m_currentRow );

+
+    wxRect labelRect = GetItemRect(item, m_currentCol);
+

     m_currentCol->GetRenderer()->StartEditing( item, labelRect );
 }
 
     m_currentCol->GetRenderer()->StartEditing( item, labelRect );
 }
 

-//------------------------------------------------------------------
+//-----------------------------------------------------------------------------

 // Helper class for do operation on the tree node
 // Helper class for do operation on the tree node

-//------------------------------------------------------------------
+//-----------------------------------------------------------------------------

 class DoJob
 {
 public:
 class DoJob
 {
 public:

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

 
 

-    //The return value control how the tree-walker tranverse the tree
+    // The return value control how the tree-walker tranverse the tree

     // 0: Job done, stop tranverse and return
     // 1: Ignore the current node's subtree and continue
     // 2: Job not done, continue
     enum  { OK = 0 , IGR = 1, CONT = 2 };
     // 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;
 };
 

-#if 0
-class ItemAddJob: public DoJob
+bool Walker( wxDataViewTreeNode * node, DoJob & func )

 {
 {

-public:
-    ItemAddJob( const wxDataViewItem & parent, const wxDataViewItem & item, int * count )
-       { this->parent = parent ; this->item = item ; m_count = count; }
-    virtual ~ItemAddJob(){};
+    if( node==NULL )
+        return false;

 
 

-    virtual int operator() ( wxDataViewTreeNode * node )
+    switch( func( node ) )

     {
     {

-        if( node->GetItem() == parent )
-        {
-            node->SetHasChildren( true );
-            wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node );
-            newnode->SetItem(item);
-            node->AppendChild( newnode);
-            *m_count = -1;
-            return OK;
-        }
-        return CONT;
+        case DoJob::OK :
+            return true;
+        case DoJob::IGR:
+            return false;
+        case DoJob::CONT:
+        default:
+            ;

     }
 
     }
 

-private:
-    int * m_count;
-    wxDataViewItem parent, item;
-};
-#endif
-
-bool Walker( wxDataViewTreeNode * node, DoJob & func )
-{
-    if( node==NULL ||  !node->HasChildren())
-        return false;
-
-    wxDataViewTreeNodes nodes = node->GetNodes();
-    wxDataViewTreeLeaves leaves = node->GetChildren();
+    const wxDataViewTreeNodes& nodes = node->GetNodes();
+    const wxDataViewTreeLeaves& leaves = node->GetChildren();

 
     int len_nodes = nodes.GetCount();
     int len = leaves.GetCount();
     int i = 0, nodes_i = 0;
 
     int len_nodes = nodes.GetCount();
     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() )


@@ -1886,17 +1948,6 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func )
             wxDataViewTreeNode * nd = nodes[nodes_i];
             nodes_i++;
 
             wxDataViewTreeNode * nd = nodes[nodes_i];
             nodes_i++;
 

-            switch( func( nd ) )
-            {
-                case DoJob::OK :
-                    return true ;
-                case DoJob::IGR:
-                    continue;
-                case DoJob::CONT:
-                default:
-                    ;
-            }
-

             if( Walker( nd , func ) )
                 return true;
 
             if( Walker( nd , func ) )
                 return true;
 


@@ -1905,12 +1956,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;


@@ -1918,7 +1969,18 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func )
 
 bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item)
 {
 
 bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item)
 {

-    g_model = GetOwner()->GetModel();
+    GetOwner()->InvalidateColBestWidths();
+
+    if (IsVirtualList())
+    {
+        wxDataViewVirtualListModel *list_model =
+            (wxDataViewVirtualListModel*) GetOwner()->GetModel();
+        m_count = list_model->GetCount();
+        UpdateDisplay();
+        return true;
+    }
+
+    SortPrepare();

 
     wxDataViewTreeNode * node;
     node = FindNode(parent);
 
     wxDataViewTreeNode * node;
     node = FindNode(parent);


@@ -1932,6 +1994,7 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
     {
         wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node );
         newnode->SetItem(item);
     {
         wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node );
         newnode->SetItem(item);

+        newnode->SetHasChildren( true );

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


@@ -1941,93 +2004,171 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
 
     m_count = -1;
     UpdateDisplay();
 
     m_count = -1;
     UpdateDisplay();

+

     return true;
 }
 
     return true;
 }
 

-#if 0
-class ItemDeleteJob: public DoJob
+static void DestroyTreeHelper( wxDataViewTreeNode * node);
+
+bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
+                                       const wxDataViewItem& item)

 {
 {

-public:
-    ItemDeleteJob( const wxDataViewItem & item, int * count ) { m_item = item; m_count = count; }
-    virtual ~ItemDeleteJob(){}
-    virtual int operator() ( wxDataViewTreeNode * node )
+    GetOwner()->InvalidateColBestWidths();
+
+    if (IsVirtualList())

     {
     {

-        if( node->GetItem() == m_item )
+        wxDataViewVirtualListModel *list_model =
+            (wxDataViewVirtualListModel*) GetOwner()->GetModel();
+        m_count = list_model->GetCount();
+
+        if ( !m_selection.empty() )

         {
         {

-            node->GetParent()->GetChildren().Remove( node );
-            delete node;
-            *m_count = -1;
-            return DoJob::OK;
+            const int row = GetRowByItem(item);
+
+            const size_t selCount = m_selection.size();
+            for ( size_t i = 0; i < selCount; i++ )
+            {
+                if ( m_selection[i] > (unsigned)row )
+                    m_selection[i]--;
+            }
+
+            int itemRow = m_selection.Index(row);
+            if ( itemRow != wxNOT_FOUND )
+                m_selection.RemoveAt(itemRow);

         }
         }

-        return DoJob::CONT;
+

     }
     }

+    else // general case
+    {
+        wxDataViewTreeNode * node = FindNode(parent);
+        int itemPosInNode = node ? node->GetChildren().Index(item.GetID()) : wxNOT_FOUND;

 
 

-private:
-    int * m_count;
-    wxDataViewItem m_item;
-};
-#endif
+        // Notice that it is possible that the item being deleted is not in the
+        // tree at all, for example we could be deleting a never shown (because
+        // collapsed) item in a tree model. So it's not an error if we don't know
+        // about this item, just return without doing anything then.
+        if ( !node || itemPosInNode == wxNOT_FOUND )
+            return false;

 
 

-void DestroyTreeHelper( wxDataViewTreeNode * node);
+        bool isContainer = false;
+        wxDataViewTreeNode *itemNode = NULL;

 
 

-bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
-                                       const wxDataViewItem& item)
-{
-    g_model = GetOwner()->GetModel();
+        const wxDataViewTreeNodes nds = node->GetNodes();
+        for (size_t i = 0; i < nds.GetCount(); i ++)
+        {
+            if (nds[i]->GetItem() == item)
+            {
+                isContainer = true;
+                itemNode = nds[i];
+                break;
+            }
+        }

 
 

-    wxDataViewTreeNode * node;
-    node = FindNode(parent);
+        // Delete the item from wxDataViewTreeNode representation:
+        int itemsDeleted = 1;
+        node->GetChildren().Remove( item.GetID() );

 
 

-    if( node == NULL || node->GetChildren().Index( item.GetID() ) == wxNOT_FOUND )
-    {
-        return false;
-    }
+        if( isContainer )
+        {
+            wxDataViewTreeNode *n = node->FindItemAsNode(item);

 
 

-    int sub = -1;
-    node->GetChildren().Remove( item.GetID() );
-    if( GetOwner()->GetModel()->IsContainer( item ) )
-    {
-        wxDataViewTreeNode * n ;
-        wxDataViewTreeNodes nodes = node->GetNodes();
-        int len = nodes.GetCount();
-        for( int i = 0 ; i < len; i ++)
+            wxCHECK_MSG( n != NULL, false, "item not found" );
+
+            node->GetNodes().Remove( n );
+            itemsDeleted += n->GetSubTreeCount();
+            ::DestroyTreeHelper(n);
+        }
+
+        // Make the row number invalid and get a new valid one when user call GetRowCount
+        m_count = -1;
+        node->ChangeSubTreeCount(-itemsDeleted);
+
+        // Update selection by removing 'item' and its entire children tree from the selection.
+        if ( !m_selection.empty() )

         {
         {

-            if( nodes[i]->GetItem() == item )
+            // we can't call GetRowByItem() on 'item', as it's already deleted, so compute it from
+            // the parent ('node') and position in its list of children
+            int itemRow;
+            if ( itemPosInNode == 0 )

             {
             {

-                n = nodes[i];
-                break;
+                // 1st child, row number is that of the parent node + 1
+                itemRow = GetRowByItem(node->GetItem()) + 1;
+            }
+            else
+            {
+                // row number is that of the sibling above 'item' + its subtree if any + 1
+                const wxDataViewItem sibling = wxDataViewItem(node->GetChildren()[itemPosInNode - 1]);
+                const wxDataViewTreeNode *siblingNode = node->FindItemAsNode(sibling);
+
+                itemRow = GetRowByItem(sibling);
+                if ( siblingNode )
+                    itemRow += siblingNode->GetSubTreeCount();
+                itemRow += 1;
+            }
+
+            wxDataViewSelection newsel(wxDataViewSelectionCmp);
+
+            for ( wxDataViewSelection::const_iterator i = m_selection.begin();
+                  i != m_selection.end();
+                  ++i )
+            {
+                const int s = *i;
+                if ( s < itemRow )
+                    newsel.push_back(s);
+                else if ( s >= itemRow + itemsDeleted )
+                    newsel.push_back(s - itemsDeleted);
+                // else: deleted item, remove from selection

             }
             }

+
+            m_selection = newsel;

         }
         }

-        node->GetNodes().Remove( n );
-        sub -= n->GetSubTreeCount();
-        DestroyTreeHelper(n);

     }
 
     }
 

-    if( node->GetChildrenNumber() == 0)
-        node->SetHasChildren( false );
-
-    //Make the row number invalid and get a new valid one when user call GetRowCount
-    m_count = -1;
-    node->ChangeSubTreeCount(sub);
-    //Change the current row to the last row if the current exceed the max row number
+    // Change the current row to the last row if the current exceed the max row number

     if( m_currentRow > GetRowCount() )
     if( m_currentRow > GetRowCount() )

-        m_currentRow = m_count - 1;
+        ChangeCurrentRow(m_count - 1);

 
     UpdateDisplay();
 
     UpdateDisplay();

+

     return true;
 }
 
 bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
 {
     return true;
 }
 
 bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
 {

-    g_model = GetOwner()->GetModel();
+    GetOwner()->InvalidateColBestWidths();
+
+    SortPrepare();
+    g_model->Resort();
+
+    // Send event
+    wxWindow *parent = GetParent();
+    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
+    le.SetEventObject(parent);
+    le.SetModel(GetOwner()->GetModel());
+    le.SetItem(item);
+    parent->GetEventHandler()->ProcessEvent(le);

 
 

-    unsigned int row = GetRowByItem(item);
-    RefreshRow( row );

     return true;
 }
 
     return true;
 }
 

-bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int WXUNUSED(col) )
+bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int model_column )

 {
 {

+    int view_column = -1;
+    unsigned int n_col = m_owner->GetColumnCount();
+    for (unsigned i = 0; i < n_col; i++)
+    {
+        wxDataViewColumn *column = m_owner->GetColumn( i );
+        if (column->GetModelColumn() == model_column)
+        {
+            view_column = (int) i;
+            break;
+        }
+    }
+    if (view_column == -1)
+        return false;
+
+    GetOwner()->InvalidateColBestWidth(view_column);
+

     // NOTE: to be valid, we cannot use e.g. INT_MAX - 1
 /*#define MAX_VIRTUAL_WIDTH       100000
 
     // NOTE: to be valid, we cannot use e.g. INT_MAX - 1
 /*#define MAX_VIRTUAL_WIDTH       100000
 


@@ -2037,293 +2178,119 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
 
     return true;
 */
 
     return true;
 */

-    g_model = GetOwner()->GetModel();
+    SortPrepare();
+    g_model->Resort();
+
+    // Send event
+    wxWindow *parent = GetParent();
+    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
+    le.SetEventObject(parent);
+    le.SetModel(GetOwner()->GetModel());
+    le.SetItem(item);
+    le.SetColumn(view_column);
+    le.SetDataViewColumn(GetOwner()->GetColumn(view_column));
+    parent->GetEventHandler()->ProcessEvent(le);

 
 

-    unsigned int row = GetRowByItem(item);
-    RefreshRow( row );

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

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

 
     DestroyTree();
 
     DestroyTree();

+    m_selection.Clear();
+
+    SortPrepare();
+    BuildTree( GetOwner()->GetModel() );
+

     UpdateDisplay();
     UpdateDisplay();

+

     return true;
 }
 
 void wxDataViewMainWindow::UpdateDisplay()
 {
     m_dirty = true;
     return true;
 }
 
 void wxDataViewMainWindow::UpdateDisplay()
 {
     m_dirty = true;

+    m_underMouse = NULL;

 }
 
 }
 

-void wxDataViewMainWindow::OnInternalIdle()
-{
-    wxWindow::OnInternalIdle();
-
-    if (m_dirty)
-    {
-        RecalculateDisplay();
-        m_dirty = false;
-    }
-}
-
-void wxDataViewMainWindow::RecalculateDisplay()
-{
-    wxDataViewModel *model = GetOwner()->GetModel();
-    if (!model)
-    {
-        Refresh();
-        return;
-    }
-
-    int width = GetEndOfLastCol();
-    int height = GetRowCount() * m_lineHeight;
-
-    SetVirtualSize( width, height );
-    GetOwner()->SetScrollRate( 10, m_lineHeight );
-
-    Refresh();
-}
-
-void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
-{
-    wxWindow::ScrollWindow( dx, dy, rect );
-
-    if (GetOwner()->m_headerArea)
-        GetOwner()->m_headerArea->ScrollWindow( dx, 0 );
-}
-
-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);
-    }
+void wxDataViewMainWindow::OnInternalIdle()
+{
+    wxWindow::OnInternalIdle();

 
 

-    // redraw the background for the items which are selected/current
-    for (unsigned int item = item_start; item < item_last; item++)
+    if (m_dirty)

     {
     {

-        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
-                                );
-        }
+        RecalculateDisplay();
+        m_dirty = false;

     }
     }

+}

 
 

-    // 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++)
+void wxDataViewMainWindow::RecalculateDisplay()
+{
+    wxDataViewModel *model = GetOwner()->GetModel();
+    if (!model)

     {
     {

-        wxDataViewColumn *col = GetOwner()->GetColumn( i );
-        wxDataViewRenderer *cell = col->GetRenderer();
-        cell_rect.width = col->GetWidth();
-
-        if (col->IsHidden())
-            continue;       // skipt it!
+        Refresh();
+        return;
+    }

 
 

-        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;
-            }
+    int width = GetEndOfLastCol();
+    int height = GetLineStart( GetRowCount() );

 
 

-            wxDataViewItem dataitem = node->GetItem();
-            model->GetValue( value, dataitem, col->GetModelColumn());
-            cell->SetValue( value );
+    SetVirtualSize( width, height );
+    GetOwner()->SetScrollRate( 10, m_lineHeight );

 
 

-            // update the y offset
-            cell_rect.y = item * m_lineHeight;
+    Refresh();
+}

 
 

-            //Draw the expander here.
-            int indent = node->GetIndentLevel();
-            if( col->GetModelColumn() == GetOwner()->GetExpanderColumn() )
-            {
-                //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() )
-                {
-                    //dc.DrawRoundedRectangle( expander_x,expander_y,expander_width,expander_width, 1.0);
-                    //dc.DrawLine( expander_x + 2 , expander_y + expander_width/2, expander_x + expander_width - 2, expander_y + expander_width/2 );
-                    wxRect rect( expander_x , expander_y, expander_width, expander_width);
-                    if( node->IsOpen() )
-                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, wxCONTROL_EXPANDED );
-                    else
-                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect );
-                }
-                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
-                }
+void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
+{
+    m_underMouse = NULL;

 
 

-                 //force the expander column to left-center align
-                 cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
-            }
+    wxWindow::ScrollWindow( dx, dy, rect );

 
 

+    if (GetOwner()->m_headerArea)
+        GetOwner()->m_headerArea->ScrollWindow( dx, 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 + 2*PADDING_TOPBOTTOM, 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.y += PADDING_TOPBOTTOM;
-            item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;
-            item_rect.height = size.y - 2 * PADDING_TOPBOTTOM;
-
-            //Here we add the tree indent
-            item_rect.x += indent;
+void wxDataViewMainWindow::ScrollTo( int rows, int column )
+{
+    m_underMouse = NULL;

 
 

-            int state = 0;
-            if (m_selection.Index(item) != wxNOT_FOUND)
-                state |= wxDATAVIEW_CELL_SELECTED;
+    int x, y;
+    m_owner->GetScrollPixelsPerUnit( &x, &y );
+    int sy = GetLineStart( rows )/y;
+    int sx = 0;
+    if( column != -1 )
+    {
+        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


@@ -2339,7 +2306,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();


@@ -2353,16 +2320,19 @@ 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()
 {
     wxSize client_size = GetClientSize();
     m_owner->CalcUnscrolledPosition( client_size.x, client_size.y,
 }
 
 unsigned int wxDataViewMainWindow::GetLastVisibleRow()
 {
     wxSize client_size = GetClientSize();
     m_owner->CalcUnscrolledPosition( client_size.x, client_size.y,

-                                     &client_size.x, &client_size.y );
+                                    &client_size.x, &client_size.y );
+
+    // we should deal with the pixel here
+    unsigned int row = GetLineAt(client_size.y) - 1;

 
 

-    return wxMin( GetRowCount()-1, ((unsigned)client_size.y/m_lineHeight)+1 );
+    return wxMin( GetRowCount()-1, row );

 }
 
 unsigned int wxDataViewMainWindow::GetRowCount()
 }
 
 unsigned int wxDataViewMainWindow::GetRowCount()


@@ -2370,11 +2340,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;
 }


@@ -2484,9 +2450,21 @@ bool wxDataViewMainWindow::IsRowSelected( unsigned int row )
     return (m_selection.Index( row ) != wxNOT_FOUND);
 }
 
     return (m_selection.Index( row ) != wxNOT_FOUND);
 }
 

+void wxDataViewMainWindow::SendSelectionChangedEvent( const wxDataViewItem& item)
+{
+    wxWindow *parent = GetParent();
+    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, parent->GetId());
+
+    le.SetEventObject(parent);
+    le.SetModel(GetOwner()->GetModel());
+    le.SetItem( item );
+
+    parent->GetEventHandler()->ProcessEvent(le);
+}
+

 void wxDataViewMainWindow::RefreshRow( unsigned int row )
 {
 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();


@@ -2505,7 +2483,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();


@@ -2517,24 +2495,20 @@ 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)
 {
     wxCHECK_RET( newCurrent < GetRowCount(),
 }
 
 void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event)
 {
     wxCHECK_RET( newCurrent < GetRowCount(),

-                 _T("invalid item index in OnArrowChar()") );
+                wxT("invalid item index in OnArrowChar()") );

 
     // if there is no selection, we cannot move it anywhere
     if (!HasCurrentRow())
 
     // if there is no selection, we cannot move it anywhere
     if (!HasCurrentRow())


@@ -2558,6 +2532,8 @@ void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent
         }
 
         SelectRows( oldCurrent, newCurrent, true );
         }
 
         SelectRows( oldCurrent, newCurrent, true );

+        if (oldCurrent!=newCurrent)
+            SendSelectionChangedEvent(GetItemByRow(m_selection[0]));

     }
     else // !shift
     {
     }
     else // !shift
     {


@@ -2570,37 +2546,207 @@ void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent
         ChangeCurrentRow( newCurrent );
 
         if ( !event.ControlDown() )
         ChangeCurrentRow( newCurrent );
 
         if ( !event.ControlDown() )

+        {

             SelectRow( m_currentRow, true );
             SelectRow( m_currentRow, true );

+            SendSelectionChangedEvent(GetItemByRow(m_currentRow));
+        }

         else
             RefreshRow( m_currentRow );
     }
 
         else
             RefreshRow( m_currentRow );
     }
 

-    //EnsureVisible( m_currentRow );
+    GetOwner()->EnsureVisible( m_currentRow, -1 );

 }
 
 wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const
 {
     wxRect rect;
     rect.x = 0;
 }
 
 wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const
 {
     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!
+
+                wxDataViewRenderer *renderer =
+                    const_cast<wxDataViewRenderer*>(column->GetRenderer());
+                renderer->PrepareForItem(model, item, column->GetModelColumn());
+
+                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!
+
+            wxDataViewRenderer *renderer =
+                const_cast<wxDataViewRenderer*>(column->GetRenderer());
+            renderer->PrepareForItem(model, item, column->GetModelColumn());
+
+            height = wxMax( height, renderer->GetSize().y );
+        }
+
+        yy += height;
+        if (y < yy)
+            return row;
+
+        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!
+
+            wxDataViewRenderer *renderer =
+                const_cast<wxDataViewRenderer*>(column->GetRenderer());
+            renderer->PrepareForItem(model, item, column->GetModelColumn());
+
+            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;
         }
 


@@ -2610,31 +2756,53 @@ public:
             return  DoJob::IGR;
         }
         else
             return  DoJob::IGR;
         }
         else

+        {
+            // If the current has no child node, we can find the desired item of the row
+            // number directly.
+            // This if can speed up finding in some case, and will has a very good effect
+            // when it comes to list view
+            if( node->GetNodes().GetCount() == 0)
+            {
+                int index = static_cast<int>(row) - current - 1;
+                ret = wxDataViewItem(node->GetChildren().Item( index ));
+                return DoJob::OK;
+            }

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

+        }

     }
 
     virtual int operator() ( void * n )
     {
         current ++;
         if( current == static_cast<int>(row))
     }
 
     virtual int operator() ( void * n )
     {
         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;
     }

-    wxDataViewItem GetResult(){ return ret; }
+
+    wxDataViewItem GetResult() const
+        { return ret; }
+

 private:
     unsigned int row;
 private:
     unsigned int row;

-    int current ;
+    int current;

     wxDataViewItem ret;
 };
 
     wxDataViewItem ret;
 };
 

-wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row)
+wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const

 {
 {

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

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


@@ -2643,18 +2811,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;
         }
 


@@ -2666,17 +2834,30 @@ public:
         else
         {
             parent = node;
         else
         {
             parent = node;

+
+            // If the current node has no children, we can find the desired item of the
+            // row number directly.
+            // This if can speed up finding in some case, and will have a very good
+            // effect for list views.
+            if( node->GetNodes().GetCount() == 0)
+            {
+                int index = static_cast<int>(row) - current - 1;
+                void * n = node->GetChildren().Item( index );
+                ret = new wxDataViewTreeNode( parent );
+                ret->SetItem( wxDataViewItem( n ));
+                ret->SetHasChildren(false);
+                return DoJob::OK;
+            }

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

-

     }
 
     virtual int operator() ( void * n )
     {
         current ++;
         if( current == static_cast<int>(row))
     }
 
     virtual int operator() ( void * n )
     {
         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;


@@ -2684,185 +2865,399 @@ public:
 
         return DoJob::CONT;
     }
 
         return DoJob::CONT;
     }

-    wxDataViewTreeNode * GetResult(){ return ret; }
+
+    wxDataViewTreeNode * GetResult() const
+        { return ret; }
+

 private:
     unsigned int row;
 private:
     unsigned int row;

-    int current ;
+    int current;

     wxDataViewTreeNode * ret;
     wxDataViewTreeNode * ret;

-    wxDataViewTreeNode * parent ;
+    wxDataViewTreeNode * parent;

 };
 
 };
 

+wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) const
+{
+    wxASSERT( !IsVirtualList() );
+
+    RowToTreeNodeJob job( row , -2, m_root );
+    Walker( m_root , job );
+    return job.GetResult();
+}
+
+wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type,
+                                                         const wxDataViewItem & item )
+{
+    wxWindow *parent = GetParent();
+    wxDataViewEvent le(type, parent->GetId());
+
+    le.SetEventObject(parent);
+    le.SetModel(GetOwner()->GetModel());
+    le.SetItem( item );
+
+    parent->GetEventHandler()->ProcessEvent(le);
+    return le;
+}
+
+bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const
+{
+    if (IsList())
+        return false;
+
+    wxDataViewTreeNode * node = GetTreeNodeByRow(row);
+    if (!node)
+        return false;
+
+    if (!node->HasChildren())
+    {
+        delete node;
+        return false;
+    }
+
+    return node->IsOpen();
+}
+
+bool wxDataViewMainWindow::HasChildren( unsigned int row ) const
+{
+    if (IsList())
+        return false;
+
+    wxDataViewTreeNode * node = GetTreeNodeByRow(row);
+    if (!node)
+        return false;
+
+    if (!node->HasChildren())
+    {
+        delete node;
+        return false;
+    }
+
+    return true;
+}
+
+void wxDataViewMainWindow::Expand( unsigned int row )
+{
+    if (IsList())
+        return;
+
+    wxDataViewTreeNode * node = GetTreeNodeByRow(row);
+    if (!node)
+        return;
+
+    if (!node->HasChildren())
+    {
+        delete node;
+        return;
+    }
+
+            if (!node->IsOpen())
+            {
+                wxDataViewEvent e =
+                    SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, node->GetItem());
+
+                // Check if the user prevent expanding
+                if( e.GetSkipped() )
+                    return;
+
+                node->ToggleOpen();
+
+                // build the children of current node
+                if( node->GetChildrenNumber() == 0 )
+                {
+                    SortPrepare();
+                    ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);
+                }
+
+                // By expanding the node all row indices that are currently in the selection list
+                // and are greater than our node have become invalid. So we have to correct that now.
+                const unsigned rowAdjustment = node->GetSubTreeCount();
+                for(unsigned i=0; i<m_selection.size(); ++i)
+                {
+                    const unsigned testRow = m_selection[i];
+                    // all rows above us are not affected, so skip them
+                    if(testRow <= row)
+                        continue;
+
+                    m_selection[i] += rowAdjustment;
+                }
+
+                if(m_currentRow > row)
+                    ChangeCurrentRow(m_currentRow + rowAdjustment);

 
 

-wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row)
-{
-    RowToTreeNodeJob job( row , -1, m_root );
-    Walker( m_root , job );
-    return job.GetResult();
+                m_count = -1;
+                UpdateDisplay();
+                // Send the expanded event
+                SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem());
+            }

 }
 
 }
 

-#if 0
-class CountJob : public DoJob
+void wxDataViewMainWindow::Collapse(unsigned int row)

 {
 {

-public:
-    CountJob(){ count = 0 ; }
-    virtual ~CountJob(){};
+    if (IsList())
+        return;

 
 

-    virtual int operator () (  wxDataViewTreeNode * node )
-    {
-         count ++;
-         if ( node->IsOpen())
-             return DoJob::CONT;
-         else
-             return DoJob::IGR;
-    }
+    wxDataViewTreeNode *node = GetTreeNodeByRow(row);
+    if (!node)
+        return;

 
 

-    unsigned int GetResult()
+    if (!node->HasChildren())

     {
     {

-        return count ;
+        delete node;
+        return;

     }
     }

-private:
-    unsigned int count;
-};
-#endif

 
 

-void wxDataViewMainWindow::OnExpanding( unsigned int row )
-{
-    wxDataViewTreeNode * node = GetTreeNodeByRow(row);
-    if( node != NULL )
-    {
-        if( node->HasChildren())
-            if( !node->IsOpen())
+        if (node->IsOpen())
+        {
+            wxDataViewEvent e =
+                SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem());
+            if( e.GetSkipped() )
+                return;
+
+            // Find out if there are selected items below the current node.
+            bool selectCollapsingRow = false;
+            const unsigned rowAdjustment = node->GetSubTreeCount();
+            unsigned maxRowToBeTested = row + rowAdjustment;
+            for(unsigned i=0; i<m_selection.size(); ++i)

             {
             {

-               node->ToggleOpen();
-               //Here I build the children of current node
-               if( node->GetChildrenNumber() == 0 )
-                   BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);
-               m_count = -1;
-               UpdateDisplay();
+                const unsigned testRow = m_selection[i];
+                if(testRow > row && testRow <= maxRowToBeTested)
+                {
+                    selectCollapsingRow = true;
+                    // get out as soon as we have found a node that is selected
+                    break;
+                }

             }
             }

-            else
+
+            node->ToggleOpen();
+
+            // If the node to be closed has selected items the user won't see those any longer.
+            // We select the collapsing node in this case.
+            if(selectCollapsingRow)

             {
             {

-                SelectRow( row, false );
-                SelectRow( row + 1, true );
-                ChangeCurrentRow( row + 1 );
+                SelectAllRows(false);
+                ChangeCurrentRow(row);
+                SelectRow(row, true);
+                SendSelectionChangedEvent(GetItemByRow(row));

             }
             }

-        else
-            delete node;
-    }
-}
+            else
+            {
+                // if there were no selected items below our node we still need to "fix" the
+                // selection list to adjust for the changing of the row indices.
+                // We actually do the opposite of what we are doing in Expand().
+                for(unsigned i=0; i<m_selection.size(); ++i)
+                {
+                    const unsigned testRow = m_selection[i];
+                    // all rows above us are not affected, so skip them
+                    if(testRow <= row)
+                        continue;

 
 

-void wxDataViewMainWindow::OnCollapsing(unsigned int row)
-{
-    wxDataViewTreeNode * node = GetTreeNodeByRow(row);
-    if( node != NULL )
-    {
-        wxDataViewTreeNode * nd = node;
+                    m_selection[i] -= rowAdjustment;
+                }
+
+                // if the "current row" is being collapsed away we change it to the current row ;-)
+                if(m_currentRow > row && m_currentRow <= maxRowToBeTested)
+                    ChangeCurrentRow(row);
+                else if(m_currentRow > row)
+                    ChangeCurrentRow(m_currentRow - rowAdjustment);
+            }

 
 

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

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

-            //RefreshRows(row,GetLastVisibleRow());
-         }
-         else
-         {
-             node = node->GetParent();
-             if( node != NULL )
-             {
-                 int  parent = GetRowByItem( node->GetItem()) ;
-                 SelectRow( row, false);
-                 SelectRow(parent , true );
-                 ChangeCurrentRow( parent );
-             }
-         }
-         if( !nd->HasChildren())
-             delete nd;
-    }
+            SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,node->GetItem());
+        }

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

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

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

-    //Compose the a parent-chain of the finding item
-    ItemList list;
-    list.DeleteContents( true );
+    if (!item.IsOk())
+        return m_root;
+
+    // Compose the parent-chain for the item we are looking for
+    wxVector<wxDataViewItem> parentChain;

     wxDataViewItem it( item );
     while( it.IsOk() )
     {
     wxDataViewItem it( item );
     while( it.IsOk() )
     {

-        wxDataViewItem * pItem = new wxDataViewItem( it );
-        list.Insert( pItem );
-        it = model->GetParent( it );
+        parentChain.push_back(it);
+        it = model->GetParent(it);

     }
 
     }
 

-    //Find the item along the parent-chain.
-    //This algorithm is designed to speed up the node-finding method
-    bool found = true;
-    wxDataViewTreeNode * node = m_root;
-    for( ItemList::Node * n = list.GetFirst(); n; n = n->GetNext() )
+    // Find the item along the parent-chain.
+    // This algorithm is designed to speed up the node-finding method
+    wxDataViewTreeNode* node = m_root;
+    for( unsigned iter = parentChain.size()-1; ; --iter )

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

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

 
 

-            int len = node->GetNodeNumber();
-            wxDataViewTreeNodes nodes = node->GetNodes();
-            int j = 0;
-            for( ; j < len; j ++)
+            const wxDataViewTreeNodes& nodes = node->GetNodes();
+            bool found = false;
+
+            for (unsigned i = 0; i < nodes.GetCount(); ++i)

             {
             {

-                if( nodes[j]->GetItem() == *(n->GetData()))
-                 {
-                    node = nodes[j];
+                wxDataViewTreeNode* currentNode = nodes[i];
+                if (currentNode->GetItem() == parentChain[iter])
+                {
+                    if (currentNode->GetItem() == item)
+                        return currentNode;
+
+                    node = currentNode;
+                    found = true;

                     break;
                 }
             }
                     break;
                 }
             }

-            // Whenever we can't find the node in any level, return NULL to indicate the item can't be found
-            if( j == len )
-            {
-                found = false;
+            if (!found)

                 return NULL;
                 return NULL;

-            }

         }
         else
             return NULL;
         }
         else
             return NULL;

+
+        if ( !iter )
+            break;
+    }
+    return NULL;
+}
+
+void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item,
+                                    wxDataViewColumn* &column )
+{
+    wxDataViewColumn *col = NULL;
+    unsigned int cols = GetOwner()->GetColumnCount();
+    unsigned int colnum = 0;
+    int x, y;
+    m_owner->CalcUnscrolledPosition( point.x, point.y, &x, &y );
+    for (unsigned x_start = 0; colnum < cols; colnum++)
+    {
+        col = GetOwner()->GetColumnAt(colnum);
+        if (col->IsHidden())
+            continue;      // skip it!
+
+        unsigned int w = col->GetWidth();
+        if (x_start+w >= (unsigned int)x)
+            break;
+
+        x_start += w;
+    }
+
+    column = col;
+    item = GetItemByRow( GetLineAt( y ) );
+}
+
+wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item,
+                                          const wxDataViewColumn* column )
+{
+    int xpos = 0;
+    int width = 0;
+
+    unsigned int cols = GetOwner()->GetColumnCount();
+    // If column is null the loop will compute the combined width of all columns.
+    // Otherwise, it will compute the x position of the column we are looking for.
+    for (unsigned int i = 0; i < cols; i++)
+    {
+        wxDataViewColumn* col = GetOwner()->GetColumnAt( i );
+
+        if (col == column)
+            break;
+
+        if (col->IsHidden())
+            continue;      // skip it!
+
+        xpos += col->GetWidth();
+        width += col->GetWidth();
+    }
+
+    if(column != 0)
+    {
+        // If we have a column, we need can get its width directly.
+        if(column->IsHidden())
+            width = 0;
+        else
+            width = column->GetWidth();
+
+    }
+    else
+    {
+        // If we have no column, we reset the x position back to zero.
+        xpos = 0;
+    }
+
+    // we have to take an expander column into account and compute its indentation
+    // to get the correct x position where the actual text is
+    int indent = 0;
+    int row = GetRowByItem(item);
+    if (!IsList() && (column == 0 || GetOwner()->GetExpanderColumn() == column) )
+    {
+        wxDataViewTreeNode* node = GetTreeNodeByRow(row);
+        indent = GetOwner()->GetIndent() * node->GetIndentLevel();
+        indent = indent + m_lineHeight; // use m_lineHeight as the width of the expander
+
+        if(!node->HasChildren())
+            delete node;

     }
     }

-    return node;
+
+    wxRect itemRect( xpos + indent,
+                     GetLineStart( row ),
+                     width - indent,
+                     GetLineHeight( row ) );
+
+    GetOwner()->CalcScrolledPosition(  itemRect.x,  itemRect.y,
+                                      &itemRect.x, &itemRect.y );
+
+    return itemRect;

 }
 
 int wxDataViewMainWindow::RecalculateCount()
 {
 }
 
 int wxDataViewMainWindow::RecalculateCount()
 {

-    return m_root->GetSubTreeCount();
+    if (IsVirtualList())
+    {
+        wxDataViewVirtualListModel *list_model =
+            (wxDataViewVirtualListModel*) GetOwner()->GetModel();
+
+        return list_model->GetCount();
+    }
+    else
+    {
+        return m_root->GetSubTreeCount();
+    }

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

-    ItemToRowJob(const wxDataViewItem & item, ItemList::Node * node )
-    { this->item = item ; ret = 0 ; nd = node ; }
-    virtual ~ItemToRowJob(){};
+    ItemToRowJob(const wxDataViewItem& item_, wxVector<wxDataViewItem>::reverse_iterator iter)
+        : m_iter(iter),
+        item(item_)
+    {
+        ret = -1;
+    }

 
 

+    // Maybe binary search will help to speed up this process

     virtual int operator() ( wxDataViewTreeNode * node)
     {
     virtual int operator() ( wxDataViewTreeNode * node)
     {

-         ret ++;
-         if( node->GetItem() == item )
-         {
-             return DoJob::OK;
-         }
+        ret ++;
+        if( node->GetItem() == item )
+        {
+            return DoJob::OK;
+        }

 
 

-         if( nd && node->GetItem() == *(nd->GetData()))
-         {
-             nd = nd->GetNext();
-             return DoJob::CONT;
-         }
-         else
-         {
-             ret += node->GetSubTreeCount();
-             return DoJob::IGR;
-         }
+        if( node->GetItem() == *m_iter )
+        {
+            m_iter++;
+            return DoJob::CONT;
+        }
+        else
+        {
+            ret += node->GetSubTreeCount();
+            return DoJob::IGR;
+        }

 
     }
 
 
     }
 


@@ -2873,59 +3268,77 @@ public:
             return DoJob::OK;
         return DoJob::CONT;
     }
             return DoJob::OK;
         return DoJob::CONT;
     }

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

 private:
 private:

-    ItemList::Node * nd;
+    wxVector<wxDataViewItem>::reverse_iterator m_iter;

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

-unsigned 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 )
     if( model == NULL )

-        return 0;
+        return -1;

 
 

-    //Compose the a parent-chain of the finding item
-    ItemList list;
-    list.DeleteContents( true );
-    wxDataViewItem it( item );
-    while( it.IsOk() )
+    if (IsVirtualList())

     {
     {

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

     }
     }

+    else
+    {
+        if( !item.IsOk() )
+            return -1;

 
 

-    ItemToRowJob job( item, list.GetFirst() );
-    Walker(m_root , job );
-    return job.GetResult();
+        // Compose the parent-chain of the item we are looking for
+        wxVector<wxDataViewItem> parentChain;
+        wxDataViewItem it( item );
+        while( it.IsOk() )
+        {
+            parentChain.push_back(it);
+            it = model->GetParent(it);
+        }
+
+        // add an 'invalid' item to represent our 'invisible' root node
+        parentChain.push_back(wxDataViewItem());
+
+        // the parent chain was created by adding the deepest parent first.
+        // so if we want to start at the root node, we have to iterate backwards through the vector
+        ItemToRowJob job( item, parentChain.rbegin() );
+        Walker( m_root, job );
+        return job.GetResult();
+    }

 }
 
 }
 

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

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

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

 
 

-    wxDataViewItem i = model->GetFirstChild( item );
-    int num = 0;
-    while( i.IsOk() )
+    unsigned int index = 0;
+    while( index < num )

     {
     {

-        num ++;
-        if( model->IsContainer( i ) )
+        if( model->IsContainer( children[index] ) )

         {
             wxDataViewTreeNode * n = new wxDataViewTreeNode( node );
         {
             wxDataViewTreeNode * n = new wxDataViewTreeNode( node );

-            n->SetItem(i);
-            n->SetHasChildren( true ) ;
+            n->SetItem(children[index]);
+            n->SetHasChildren( true );

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

-            node->AddLeaf( i.GetID() );
+            node->AddLeaf( children[index].GetID() );

         }
         }

-        i = model->GetNextSibling( i );
+        index ++;

     }
     node->SetSubTreeCount( num );
     wxDataViewTreeNode * n = node->GetParent();
     }
     node->SetSubTreeCount( num );
     wxDataViewTreeNode * n = node->GetParent();


@@ -2936,47 +3349,58 @@ void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataVie
 
 void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
 {
 
 void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
 {

-    //First we define a invalid item to fetch the top-level elements
+    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;
     wxDataViewItem item;

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

     BuildTreeHelper( model, item, m_root);
     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 ++ )
-        {
+        wxDataViewTreeNodes& nodes = node->GetNodes();
+        for (int i = 0; i < len; i++)

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

-        }

     }
     delete node;
 }
 
 void wxDataViewMainWindow::DestroyTree()
 {
     }
     delete node;
 }
 
 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;
-    }
+    wxWindow * const parent = GetParent();
+
+    // propagate the char event upwards
+    wxKeyEvent eventForParent(event);
+    eventForParent.SetEventObject(parent);
+    if ( parent->ProcessWindowEvent(eventForParent) )
+        return;
+
+    if ( parent->HandleAsNavigationKey(event) )
+        return;

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


@@ -2987,31 +3411,89 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
 
     // don't use m_linesPerPage directly as it might not be computed yet
     const int pageSize = GetCountPerPage();
 
     // don't use m_linesPerPage directly as it might not be computed yet
     const int pageSize = GetCountPerPage();

-    wxCHECK_RET( pageSize, _T("should have non zero page size") );
+    wxCHECK_RET( pageSize, wxT("should have non zero page size") );

 
     switch ( event.GetKeyCode() )
     {
 
     switch ( event.GetKeyCode() )
     {

+        case WXK_RETURN:
+            {
+                wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED,
+                                   parent->GetId());
+                le.SetItem( GetItemByRow(m_currentRow) );
+                le.SetEventObject(parent);
+                le.SetModel(GetOwner()->GetModel());
+
+                parent->GetEventHandler()->ProcessEvent(le);
+            }
+            break;
+

         case WXK_UP:
             if ( m_currentRow > 0 )
                 OnArrowChar( m_currentRow - 1, event );
             break;
 
         case WXK_DOWN:
         case WXK_UP:
             if ( m_currentRow > 0 )
                 OnArrowChar( m_currentRow - 1, event );
             break;
 
         case WXK_DOWN:

-            if ( m_currentRow < GetRowCount() - 1 )
+            if ( m_currentRow + 1 < GetRowCount() )

                 OnArrowChar( m_currentRow + 1, event );
             break;
                 OnArrowChar( m_currentRow + 1, event );
             break;

-        //Add the process for tree expanding/collapsing
+        // Add the process for tree expanding/collapsing

         case WXK_LEFT:
         case WXK_LEFT:

-            OnCollapsing(m_currentRow);
-            break;
-        case WXK_RIGHT:
-            OnExpanding( m_currentRow);
-            break;
+        {
+            if (IsList())
+               break;
+
+            wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
+            if (!node)
+                break;
+
+            if (node->HasChildren() && node->IsOpen())
+            {
+                Collapse(m_currentRow);
+            }
+            else    // if the node is already closed we move the selection to its parent
+            {
+                wxDataViewTreeNode *parent_node = node->GetParent();
+
+                if(!node->HasChildren())
+                    delete node;
+
+                if (parent_node)
+                {
+                    int parent = GetRowByItem( parent_node->GetItem() );
+                    if ( parent >= 0 )
+                    {
+                        unsigned int row = m_currentRow;
+                        SelectRow( row, false);
+                        SelectRow( parent, true );
+                        ChangeCurrentRow( parent );
+                        GetOwner()->EnsureVisible( parent, -1 );
+                        SendSelectionChangedEvent( parent_node->GetItem() );
+                    }
+                }
+            }
+            break;
+        }
+        case WXK_RIGHT:
+        {
+            if (!IsExpanded( m_currentRow ))
+                Expand( m_currentRow );
+            else
+            {
+                unsigned int row = m_currentRow;
+                SelectRow( row, false );
+                SelectRow( row + 1, true );
+                ChangeCurrentRow( row + 1 );
+                GetOwner()->EnsureVisible( row + 1, -1 );
+                SendSelectionChangedEvent( GetItemByRow(row+1) );
+            }
+            break;
+        }

         case WXK_END:
         case WXK_END:

+        {

             if (!IsEmpty())
                 OnArrowChar( GetRowCount() - 1, event );
             break;
             if (!IsEmpty())
                 OnArrowChar( GetRowCount() - 1, event );
             break;

-
+        }

         case WXK_HOME:
             if (!IsEmpty())
                 OnArrowChar( 0, event );
         case WXK_HOME:
             if (!IsEmpty())
                 OnArrowChar( 0, event );


@@ -3040,6 +3522,16 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
             }
             break;
 
             }
             break;
 

+        case WXK_F2:
+            {
+                if(m_selection.size() == 1)
+                {
+                    // TODO: we need to revise that when we have a concept for a 'current column'
+                    GetOwner()->StartEditor(GetItemByRow(m_selection[0]), 0);
+                }
+            }
+            break;
+

         default:
             event.Skip();
     }
         default:
             event.Skip();
     }


@@ -3054,10 +3546,13 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         return;
     }
 
         return;
     }
 

+    // set the focus to ourself if any of the mouse buttons are pressed
+    if(event.ButtonDown() && !HasFocus())
+        SetFocus();
+

     int x = event.GetX();
     int y = event.GetY();
     m_owner->CalcUnscrolledPosition( x, y, &x, &y );
     int x = event.GetX();
     int y = event.GetY();
     m_owner->CalcUnscrolledPosition( x, y, &x, &y );

-

     wxDataViewColumn *col = NULL;
 
     int xpos = 0;
     wxDataViewColumn *col = NULL;
 
     int xpos = 0;


@@ -3065,7 +3560,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!
 


@@ -3077,19 +3572,68 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         xpos += c->GetWidth();
     }
     if (!col)
         xpos += c->GetWidth();
     }
     if (!col)

+    {
+        event.Skip();

         return;
         return;

-    wxDataViewRenderer *cell = col->GetRenderer();
-
-    unsigned int current = y / m_lineHeight;
+    }

 
 

-    if ((current > GetRowCount()) || (x > GetEndOfLastCol()))
+    wxDataViewRenderer *cell = col->GetRenderer();
+    unsigned int current = GetLineAt( y );
+    if ((current >= GetRowCount()) || (x > GetEndOfLastCol()))

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

+        event.Skip();

         return;
     }
 
         return;
     }
 

+    // Test whether the mouse is hovered on the tree item button
+    bool hoverOverExpander = false;
+    if ((!IsList()) && (GetOwner()->GetExpanderColumn() == col))
+    {
+        wxDataViewTreeNode * node = GetTreeNodeByRow(current);
+        if( node!=NULL && node->HasChildren() )
+        {
+            int indent = node->GetIndentLevel();
+            indent = GetOwner()->GetIndent()*indent;
+
+            // we make the rectangle we are looking in a bit bigger than the actual
+            // visual expander so the user can hit that little thing reliably
+            wxRect rect( xpos + indent,
+                        GetLineStart( current ) + (GetLineHeight(current) - m_lineHeight)/2,
+                        m_lineHeight, m_lineHeight);
+            if( rect.Contains(x, y) )
+            {
+                // So the mouse is over the expander
+                hoverOverExpander = true;
+                if (m_underMouse && m_underMouse != node)
+                {
+                    // wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
+                    RefreshRow(GetRowByItem(m_underMouse->GetItem()));
+                }
+                if (m_underMouse != node)
+                {
+                    // wxLogMessage("Do the row: %d", current);
+                    RefreshRow(current);
+                }
+                m_underMouse = node;
+            }
+        }
+        if (node!=NULL && !node->HasChildren())
+            delete node;
+    }
+    if (!hoverOverExpander)
+    {
+        if (m_underMouse != NULL)
+        {
+            // wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
+            RefreshRow(GetRowByItem(m_underMouse->GetItem()));
+            m_underMouse = NULL;
+        }
+    }
+

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

+#if wxUSE_DRAG_AND_DROP

     if (event.Dragging())
     {
         if (m_dragCount == 0)
     if (event.Dragging())
     {
         if (m_dragCount == 0)


@@ -3107,7 +3651,30 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
         if (event.LeftIsDown())
         {
 
         if (event.LeftIsDown())
         {

+            m_owner->CalcUnscrolledPosition( m_dragStart.x, m_dragStart.y,
+                                             &m_dragStart.x, &m_dragStart.y );
+            unsigned int drag_item_row = GetLineAt( m_dragStart.y );
+            wxDataViewItem item = GetItemByRow( drag_item_row );
+

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

+            wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() );
+            event.SetEventObject( m_owner );
+            event.SetItem( item );
+            event.SetModel( model );
+            if (!m_owner->HandleWindowEvent( event ))
+                return;
+
+            if (!event.IsAllowed())
+                return;
+
+            wxDataObject *obj = event.GetDataObject();
+            if (!obj)
+                return;
+
+            wxDataViewDropSource drag( this, drag_item_row );
+            drag.SetData( *obj );
+            /* wxDragResult res = */ drag.DoDragDrop();
+            delete obj;

         }
         return;
     }
         }
         return;
     }


@@ -3115,8 +3682,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     {
         m_dragCount = 0;
     }
     {
         m_dragCount = 0;
     }

+#endif // wxUSE_DRAG_AND_DROP

 
 

-    bool forceClick = false;
+    bool simulateClick = false;

 
     if (event.ButtonDClick())
     {
 
     if (event.ButtonDClick())
     {


@@ -3124,19 +3692,42 @@ 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 (event.LeftDClick())
     {

-        if ( current == m_lineLastClicked )
+        if(hoverOverExpander)
+        {
+            // a double click on the expander will be converted into a "simulated" normal click
+            simulateClick = true;
+        }
+        else if ( current == m_lineLastClicked )

         {
         {

-            if (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE)
+            if ((!ignore_other_columns) && (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE))
+            {
+                const unsigned colIdx = col->GetModelColumn();
+
+                cell->PrepareForItem(model, item, colIdx);
+
+                wxRect cell_rect( xpos, GetLineStart( current ),
+                                col->GetWidth(), GetLineHeight( current ) );
+                cell->WXOnActivate( cell_rect, model, item, colIdx );
+            }
+            else

             {
             {

-                wxDataViewItem item = GetItemByRow(current);
-                wxVariant value;
-                model->GetValue( value, item, col->GetModelColumn() );
-                cell->SetValue( value );
-                wxRect cell_rect( xpos, current * m_lineHeight,
-                                  col->GetWidth(), m_lineHeight );
-                cell->Activate( cell_rect, model, item, col->GetModelColumn() );
+                wxWindow *parent = GetParent();
+                wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId());
+                le.SetItem( item );
+                le.SetColumn( col->GetModelColumn() );
+                le.SetDataViewColumn( col );
+                le.SetEventObject(parent);
+                le.SetModel(GetOwner()->GetModel());
+
+                parent->GetEventHandler()->ProcessEvent(le);

             }
             return;
         }
             }
             return;
         }


@@ -3144,42 +3735,26 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         {
             // The first click was on another item, so don't interpret this as
             // a double click, but as a simple click instead
         {
             // The first click was on another item, so don't interpret this as
             // a double click, but as a simple click instead

-            forceClick = true;
+            simulateClick = true;

         }
     }
 
         }
     }
 

-    if (event.LeftUp())
+    if (event.LeftUp() && !hoverOverExpander)

     {
         if (m_lineSelectSingleOnUp != (unsigned int)-1)
         {
             // select single line
             SelectAllRows( false );
             SelectRow( m_lineSelectSingleOnUp, true );
     {
         if (m_lineSelectSingleOnUp != (unsigned int)-1)
         {
             // select single line
             SelectAllRows( false );
             SelectRow( m_lineSelectSingleOnUp, true );

+            SendSelectionChangedEvent( GetItemByRow(m_lineSelectSingleOnUp) );

         }
 
         }
 

-        //Process the event of user clicking the expander
-        bool expander = false;
-        wxDataViewTreeNode * node = GetTreeNodeByRow(current);
-        if( node!=NULL && node->HasChildren() )
-        {
-            int indent = node->GetIndentLevel();
-            indent = GetOwner()->GetIndent()*indent;
-            wxRect rect( xpos + indent + EXPANDER_MARGIN, current * m_lineHeight + EXPANDER_MARGIN, m_lineHeight-2*EXPANDER_MARGIN,m_lineHeight-2*EXPANDER_MARGIN);
-            if( rect.Contains( x, y) )
-            {
-                expander = true;
-                if( node->IsOpen() )
-                    OnCollapsing(current);
-                else
-                    OnExpanding( current );
-            }
-        }
-
-        //If the user click the expander, we do not do editing even if the column with expander are editable
-        if (m_lastOnSame && !expander )
+        // If the user click the expander, we do not do editing even if the column
+        // with expander are editable
+        if (m_lastOnSame && !ignore_other_columns)

         {
             if ((col == m_currentCol) && (current == m_currentRow) &&
         {
             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 );
             }


@@ -3188,7 +3763,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         m_lastOnSame = false;
         m_lineSelectSingleOnUp = (unsigned int)-1;
     }
         m_lastOnSame = false;
         m_lineSelectSingleOnUp = (unsigned int)-1;
     }

-    else
+    else if(!event.LeftUp())

     {
         // This is necessary, because after a DnD operation in
         // from and to ourself, the up event is swallowed by the
     {
         // This is necessary, because after a DnD operation in
         // from and to ourself, the up event is swallowed by the


@@ -3207,27 +3782,45 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         if (!IsRowSelected(current))
         {
             SelectAllRows(false);
         if (!IsRowSelected(current))
         {
             SelectAllRows(false);

+            const unsigned oldCurrent = m_currentRow;

             ChangeCurrentRow(current);
             SelectRow(m_currentRow,true);
             ChangeCurrentRow(current);
             SelectRow(m_currentRow,true);

+            RefreshRow(oldCurrent);
+            SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );

         }
         }

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

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

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

     }
     }

-    if (event.LeftDown() || forceClick)
+
+    if((event.LeftDown() || simulateClick) && hoverOverExpander)

     {
     {

-#ifdef __WXMSW__
-        SetFocus();
-#endif
+        wxDataViewTreeNode* node = GetTreeNodeByRow(current);

 
 

+        // hoverOverExpander being true tells us that our node must be
+        // valid and have children.
+        // So we don't need any extra checks.
+        if( node->IsOpen() )
+            Collapse(current);
+        else
+            Expand(current);
+    }
+    else if ((event.LeftDown() || simulateClick) && !hoverOverExpander)
+    {

         m_lineBeforeLastClicked = m_lineLastClicked;
         m_lineLastClicked = current;
 
         m_lineBeforeLastClicked = m_lineLastClicked;
         m_lineLastClicked = current;
 


@@ -3240,10 +3833,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             if ( IsSingleSel() || !IsRowSelected(current) )
             {
                 SelectAllRows( false );
             if ( IsSingleSel() || !IsRowSelected(current) )
             {
                 SelectAllRows( false );

-

                 ChangeCurrentRow(current);
                 ChangeCurrentRow(current);

-

                 SelectRow(m_currentRow,true);
                 SelectRow(m_currentRow,true);

+                SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );

             }
             else // multi sel & current is highlighted & no mod keys
             {
             }
             else // multi sel & current is highlighted & no mod keys
             {


@@ -3256,15 +3848,15 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             if (cmdModifierDown)
             {
                 ChangeCurrentRow(current);
             if (cmdModifierDown)
             {
                 ChangeCurrentRow(current);

-

                 ReverseRowSelection(m_currentRow);
                 ReverseRowSelection(m_currentRow);

+                SendSelectionChangedEvent(GetItemByRow(m_currentRow));

             }
             else if (event.ShiftDown())
             {
                 ChangeCurrentRow(current);
 
                 unsigned int lineFrom = oldCurrentRow,
             }
             else if (event.ShiftDown())
             {
                 ChangeCurrentRow(current);
 
                 unsigned int lineFrom = oldCurrentRow,

-                       lineTo = current;
+                    lineTo = current;

 
                 if ( lineTo < lineFrom )
                 {
 
                 if ( lineTo < lineFrom )
                 {


@@ -3273,11 +3865,12 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
                 }
 
                 SelectRows(lineFrom, lineTo, true);
                 }
 
                 SelectRows(lineFrom, lineTo, true);

+                SendSelectionChangedEvent(GetItemByRow(m_selection[0]) );

             }
             else // !ctrl, !shift
             {
                 // test in the enclosing if should make it impossible
             }
             else // !ctrl, !shift
             {
                 // test in the enclosing if should make it impossible

-                wxFAIL_MSG( _T("how did we get here?") );
+                wxFAIL_MSG( wxT("how did we get here?") );

             }
         }
 
             }
         }
 


@@ -3289,8 +3882,57 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         // Update selection here...
         m_currentCol = col;
 
         // Update selection here...
         m_currentCol = col;
 

-        m_lastOnSame = !forceClick && ((col == oldCurrentCol) &&
+        m_lastOnSame = !simulateClick && ((col == oldCurrentCol) &&

                         (current == oldCurrentRow)) && oldWasSelected;
                         (current == oldCurrentRow)) && oldWasSelected;

+
+        // Call LeftClick after everything else as under GTK+
+        if (cell->GetMode() & wxDATAVIEW_CELL_ACTIVATABLE)
+        {
+            // notify cell about click
+            cell->PrepareForItem(model, item, col->GetModelColumn());
+
+            wxRect cell_rect( xpos, GetLineStart( current ),
+                              col->GetWidth(), GetLineHeight( current ) );
+
+            // Report position relative to the cell's custom area, i.e.
+            // no the entire space as given by the control but the one
+            // used by the renderer after calculation of alignment etc.
+
+            // adjust the rectangle ourselves to account for the alignment
+            wxRect rectItem = cell_rect;
+            const int align = cell->GetAlignment();
+            if ( align != wxDVR_DEFAULT_ALIGNMENT )
+            {
+                const wxSize size = cell->GetSize();
+
+                if ( size.x >= 0 && size.x < cell_rect.width )
+                {
+                    if ( align & wxALIGN_CENTER_HORIZONTAL )
+                        rectItem.x += (cell_rect.width - size.x)/2;
+                    else if ( align & wxALIGN_RIGHT )
+                        rectItem.x += cell_rect.width - size.x;
+                    // else: wxALIGN_LEFT is the default
+                }
+
+                if ( size.y >= 0 && size.y < cell_rect.height )
+                {
+                    if ( align & wxALIGN_CENTER_VERTICAL )
+                        rectItem.y += (cell_rect.height - size.y)/2;
+                    else if ( align & wxALIGN_BOTTOM )
+                        rectItem.y += cell_rect.height - size.y;
+                    // else: wxALIGN_TOP is the default
+                }
+            }
+
+            wxPoint pos( event.GetPosition() );
+            pos.x -= rectItem.x;
+            pos.y -= rectItem.y;
+
+            m_owner->CalcUnscrolledPosition( pos.x, pos.y, &pos.x, &pos.y );
+
+             /* ignore ret */ cell->WXOnLeftClick( pos, cell_rect,
+                              model, item, col->GetModelColumn());
+        }

     }
 }
 
     }
 }
 


@@ -3314,7 +3956,7 @@ void wxDataViewMainWindow::OnKillFocus( wxFocusEvent &event )
     event.Skip();
 }
 
     event.Skip();
 }
 

-wxDataViewItem wxDataViewMainWindow::GetSelection()
+wxDataViewItem wxDataViewMainWindow::GetSelection() const

 {
     if( m_selection.GetCount() != 1 )
         return wxDataViewItem();
 {
     if( m_selection.GetCount() != 1 )
         return wxDataViewItem();


@@ -3326,8 +3968,9 @@ wxDataViewItem wxDataViewMainWindow::GetSelection()
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------
 
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
+WX_DEFINE_LIST(wxDataViewColumnList)

 
 

+IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)

 BEGIN_EVENT_TABLE(wxDataViewCtrl, wxDataViewCtrlBase)
     EVT_SIZE(wxDataViewCtrl::OnSize)
 END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(wxDataViewCtrl, wxDataViewCtrlBase)
     EVT_SIZE(wxDataViewCtrl::OnSize)
 END_EVENT_TABLE()


@@ -3336,33 +3979,56 @@ wxDataViewCtrl::~wxDataViewCtrl()
 {
     if (m_notifier)
         GetModel()->RemoveNotifier( m_notifier );
 {
     if (m_notifier)
         GetModel()->RemoveNotifier( m_notifier );

+
+    m_cols.Clear();
+    m_colsBestWidths.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,
+                            const wxString& name)

 {
 {

+//    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, name))

         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 );
 

+    // We use the cursor keys for moving the selection, not scrolling, so call
+    // this method to ensure wxScrollHelperEvtHandler doesn't catch all
+    // keyboard events forwarded to us from wxListMainWindow.
+    DisableKeyboardScrolling();
+

     if (HasFlag(wxDV_NO_HEADER))
         m_headerArea = NULL;
     else
     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 );
 


@@ -3375,10 +4041,15 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
     return true;
 }
 
     return true;
 }
 

+wxBorder wxDataViewCtrl::GetDefaultBorder() const
+{
+    return wxBORDER_THEME;
+}
+

 #ifdef __WXMSW__
 WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg,
 #ifdef __WXMSW__
 WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg,

-                                       WXWPARAM wParam,
-                                       WXLPARAM lParam)
+                                        WXWPARAM wParam,
+                                        WXLPARAM lParam)

 {
     WXLRESULT rc = wxDataViewCtrlBase::MSWWindowProc(nMsg, wParam, lParam);
 
 {
     WXLRESULT rc = wxDataViewCtrlBase::MSWWindowProc(nMsg, wParam, lParam);
 


@@ -3394,6 +4065,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


@@ -3406,6 +4086,22 @@ void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
     Layout();
 
     AdjustScrollbars();
     Layout();
 
     AdjustScrollbars();

+
+    // We must redraw the headers if their height changed. Normally this
+    // shouldn't happen as the control shouldn't let itself be resized beneath
+    // its minimal height but avoid the display artefacts that appear if it
+    // does happen, e.g. because there is really not enough vertical space.
+    if ( !HasFlag(wxDV_NO_HEADER) && m_headerArea &&
+            m_headerArea->GetSize().y <= m_headerArea->GetBestSize(). y )
+    {
+        m_headerArea->Refresh();
+    }
+}
+
+void wxDataViewCtrl::SetFocus()
+{
+    if (m_clientArea)
+        m_clientArea->SetFocus();

 }
 
 bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
 }
 
 bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )


@@ -3417,6 +4113,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();


@@ -3424,19 +4122,65 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
     return true;
 }
 
     return true;
 }
 

+#if wxUSE_DRAG_AND_DROP
+
+bool wxDataViewCtrl::EnableDragSource( const wxDataFormat &format )
+{
+    return m_clientArea->EnableDragSource( format );
+}
+
+bool wxDataViewCtrl::EnableDropTarget( const wxDataFormat &format )
+{
+    return m_clientArea->EnableDropTarget( format );
+}
+
+#endif // wxUSE_DRAG_AND_DROP
+

 bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
 {
     if (!wxDataViewCtrlBase::AppendColumn(col))
         return false;
 
 bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
 {
     if (!wxDataViewCtrlBase::AppendColumn(col))
         return false;
 

-    OnColumnChange();
+    m_cols.Append( col );
+    m_colsBestWidths.push_back(0);
+    OnColumnsCountChanged();
+    return true;
+}
+
+bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
+{
+    if (!wxDataViewCtrlBase::PrependColumn(col))
+        return false;
+
+    m_cols.Insert( col );
+    m_colsBestWidths.insert(m_colsBestWidths.begin(), 0);
+    OnColumnsCountChanged();
+    return true;
+}
+
+bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col )
+{
+    if (!wxDataViewCtrlBase::InsertColumn(pos,col))
+        return false;
+
+    m_cols.Insert( pos, col );
+    m_colsBestWidths.insert(m_colsBestWidths.begin() + pos, 0);
+    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();
 }


@@ -3451,55 +4195,482 @@ void wxDataViewCtrl::DoSetIndent()
     m_clientArea->UpdateDisplay();
 }
 
     m_clientArea->UpdateDisplay();
 }
 

-wxDataViewItem wxDataViewCtrl::GetSelection()
+unsigned int wxDataViewCtrl::GetColumnCount() const

 {
 {

-    return m_clientArea->GetSelection();
+    return m_cols.GetCount();

 }
 
 }
 

-/********************************************************************
-void wxDataViewCtrl::SetSelection( int row )
+bool wxDataViewCtrl::SetRowHeight( int lineHeight )

 {
 {

-    m_clientArea->SelectRow(row, true);
+    if ( !m_clientArea )
+        return false;
+
+    m_clientArea->SetRowHeight(lineHeight);
+
+    return true;

 }
 
 }
 

-void wxDataViewCtrl::SetSelectionRange( unsigned int from, unsigned int to )
+wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int idx ) const

 {
 {

-    m_clientArea->SelectRows(from, to, true);
+    return m_cols[idx];

 }
 
 }
 

-void wxDataViewCtrl::SetSelections( const wxArrayInt& aSelections )
+wxDataViewColumn *wxDataViewCtrl::GetColumnAt(unsigned int pos) const

 {
 {

-    m_clientArea->Select(aSelections);
+    // 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);

 }
 
 }
 

-void wxDataViewCtrl::Unselect( unsigned int WXUNUSED(row) )
+int wxDataViewCtrl::GetColumnIndex(const wxDataViewColumn *column) const

 {
 {

-    // FIXME - TODO
+    const unsigned count = m_cols.size();
+    for ( unsigned n = 0; n < count; n++ )
+    {
+        if ( m_cols[n] == column )
+            return n;
+    }
+
+    return wxNOT_FOUND;

 }
 
 }
 

-bool wxDataViewCtrl::IsSelected( unsigned int WXUNUSED(row) ) const
+unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const

 {
 {

-    // FIXME - TODO
+    if ( m_colsBestWidths[idx] != 0 )
+        return m_colsBestWidths[idx];

 
 

-    return false;
+    const int count = m_clientArea->GetRowCount();
+    wxDataViewColumn *column = GetColumn(idx);
+    wxDataViewRenderer *renderer =
+        const_cast<wxDataViewRenderer*>(column->GetRenderer());
+
+    class MaxWidthCalculator
+    {
+    public:
+        MaxWidthCalculator(wxDataViewMainWindow *clientArea,
+                           wxDataViewRenderer *renderer,
+                           const wxDataViewModel *model,
+                           unsigned column)
+            : m_width(0),
+              m_clientArea(clientArea),
+              m_renderer(renderer),
+              m_model(model),
+              m_column(column)
+        {
+        }
+
+        void UpdateWithWidth(int width)
+        {
+            m_width = wxMax(m_width, width);
+        }
+
+        void UpdateWithRow(int row)
+        {
+            wxDataViewItem item = m_clientArea->GetItemByRow(row);
+            m_renderer->PrepareForItem(m_model, item, m_column);
+            m_width = wxMax(m_width, m_renderer->GetSize().x);
+        }
+
+        int GetMaxWidth() const { return m_width; }
+
+    private:
+        int m_width;
+        wxDataViewMainWindow *m_clientArea;
+        wxDataViewRenderer *m_renderer;
+        const wxDataViewModel *m_model;
+        unsigned m_column;
+    };
+
+    MaxWidthCalculator calculator(m_clientArea, renderer,
+                                  GetModel(), column->GetModelColumn());
+
+    if ( m_headerArea )
+    {
+        int header_width = m_headerArea->GetTextExtent(column->GetTitle()).x;
+        // Labels on native MSW header are indented on both sides
+        header_width +=
+            wxRendererNative::Get().GetHeaderButtonMargin(m_headerArea);
+        calculator.UpdateWithWidth(header_width);
+    }
+
+    // The code below deserves some explanation. For very large controls, we
+    // simply can't afford to calculate sizes for all items, it takes too
+    // long. So the best we can do is to check the first and the last N/2
+    // items in the control for some sufficiently large N and calculate best
+    // sizes from that. That can result in the calculated best width being too
+    // small for some outliers, but it's better to get slightly imperfect
+    // result than to wait several seconds after every update. To avoid highly
+    // visible miscalculations, we also include all currently visible items
+    // no matter what.  Finally, the value of N is determined dynamically by
+    // measuring how much time we spent on the determining item widths so far.
+
+#if wxUSE_STOPWATCH
+    int top_part_end = count;
+    static const long CALC_TIMEOUT = 20/*ms*/;
+    // don't call wxStopWatch::Time() too often
+    static const unsigned CALC_CHECK_FREQ = 100;
+    wxStopWatch timer;
+#else
+    // use some hard-coded limit, that's the best we can do without timer
+    int top_part_end = wxMin(500, count);
+#endif // wxUSE_STOPWATCH/!wxUSE_STOPWATCH
+
+    int row = 0;
+
+    for ( row = 0; row < top_part_end; row++ )
+    {
+#if wxUSE_STOPWATCH
+        if ( row % CALC_CHECK_FREQ == CALC_CHECK_FREQ-1 &&
+             timer.Time() > CALC_TIMEOUT )
+            break;
+#endif // wxUSE_STOPWATCH
+        calculator.UpdateWithRow(row);
+    }
+
+    // row is the first unmeasured item now; that's our value of N/2
+
+    if ( row < count )
+    {
+        top_part_end = row;
+
+        // add bottom N/2 items now:
+        const int bottom_part_start = wxMax(row, count - row);
+        for ( row = bottom_part_start; row < count; row++ )
+        {
+            calculator.UpdateWithRow(row);
+        }
+
+        // finally, include currently visible items in the calculation:
+        const wxPoint origin = CalcUnscrolledPosition(wxPoint(0, 0));
+        int first_visible = m_clientArea->GetLineAt(origin.y);
+        int last_visible = m_clientArea->GetLineAt(origin.y + GetClientSize().y);
+
+        first_visible = wxMax(first_visible, top_part_end);
+        last_visible = wxMin(bottom_part_start, last_visible);
+
+        for ( row = first_visible; row < last_visible; row++ )
+        {
+            calculator.UpdateWithRow(row);
+        }
+
+        wxLogTrace("dataview",
+                   "determined best size from %d top, %d bottom plus %d more visible items out of %d total",
+                   top_part_end,
+                   count - bottom_part_start,
+                   wxMax(0, last_visible - first_visible),
+                   count);
+    }
+
+    int max_width = calculator.GetMaxWidth();
+    if ( max_width > 0 )
+        max_width += 2 * PADDING_RIGHTLEFT;
+
+    const_cast<wxDataViewCtrl*>(this)->m_colsBestWidths[idx] = max_width;
+    return max_width;
+}
+
+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();

 }
 
 }
 

-int wxDataViewCtrl::GetSelection() const
+bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )

 {
 {

-    // FIXME - TODO
+    wxDataViewColumnList::compatibility_iterator ret = m_cols.Find( column );
+    if (!ret)
+        return false;

 
 

-    return -1;
+    m_colsBestWidths.erase(m_colsBestWidths.begin() + GetColumnIndex(column));
+    m_cols.Erase(ret);
+    OnColumnsCountChanged();
+
+    return true;
+}
+
+bool wxDataViewCtrl::ClearColumns()
+{
+    m_cols.Clear();
+    m_colsBestWidths.clear();
+    OnColumnsCountChanged();
+    return true;

 }
 
 }
 

-int wxDataViewCtrl::GetSelections(wxArrayInt& WXUNUSED(aSelections) ) const
+void wxDataViewCtrl::InvalidateColBestWidth(int idx)

 {
 {

-    // FIXME - TODO
+    m_colsBestWidths[idx] = 0;

 
 

-    return 0;
+    if ( m_headerArea )
+        m_headerArea->UpdateColumn(idx);

 }
 }

-*********************************************************************/
-#endif
-    // !wxUSE_GENERICDATAVIEWCTRL

 
 

+void wxDataViewCtrl::InvalidateColBestWidths()
+{
+    m_colsBestWidths.clear();
+    m_colsBestWidths.resize(m_cols.size());
+
+    if ( m_headerArea )
+    {
+        const unsigned cols = m_headerArea->GetColumnCount();
+        for ( unsigned i = 0; i < cols; i++ )
+            m_headerArea->UpdateColumn(i);
+    }
+}
+
+int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
+{
+#if 1
+    unsigned int len = GetColumnCount();
+    for ( unsigned int i = 0; i < len; i++ )
+    {
+        wxDataViewColumn * col = GetColumnAt(i);
+        if (column==col)
+            return i;
+    }
+
+    return wxNOT_FOUND;
+#else
+    // This returns the position in pixels which is not what we want.
+    int ret = 0,
+        dummy = 0;
+    unsigned int len = GetColumnCount();
+    for ( unsigned int i = 0; i < len; i++ )
+    {
+        wxDataViewColumn * col = GetColumnAt(i);
+        if (col->IsHidden())
+            continue;
+        ret += col->GetWidth();
+        if (column==col)
+        {
+            CalcScrolledPosition( ret, dummy, &ret, &dummy );
+            break;
+        }
+    }
+    return ret;

 #endif
 #endif

-    // wxUSE_DATAVIEWCTRL
+}
+
+wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
+{
+    return m_sortingColumnIdx == wxNOT_FOUND ? NULL
+                                            : GetColumn(m_sortingColumnIdx);
+}
+
+wxDataViewItem wxDataViewCtrl::DoGetCurrentItem() const
+{
+    return GetItemByRow(m_clientArea->GetCurrentRow());
+}
+
+void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item)
+{
+    const int row = m_clientArea->GetRowByItem(item);
+
+    const unsigned oldCurrent = m_clientArea->GetCurrentRow();
+    if ( static_cast<unsigned>(row) != oldCurrent )
+    {
+        m_clientArea->ChangeCurrentRow(row);
+        m_clientArea->RefreshRow(oldCurrent);
+        m_clientArea->RefreshRow(row);
+    }
+}
+
+// Selection code with wxDataViewItem as parameters
+wxDataViewItem wxDataViewCtrl::GetSelection() const
+{
+    return m_clientArea->GetSelection();
+}
+
+int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const
+{
+    sel.Empty();
+    wxDataViewSelection selection = m_clientArea->GetSelections();
+
+    const size_t len = selection.size();
+    for ( size_t i = 0; i < len; i++ )
+    {
+        wxDataViewItem item = m_clientArea->GetItemByRow(selection[i]);
+        if ( item.IsOk() )
+        {
+            sel.Add(item);
+        }
+        else
+        {
+            wxFAIL_MSG( "invalid item in selection - bad internal state" );
+        }
+    }
+
+    return sel.size();
+}
+
+void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
+{
+    wxDataViewSelection selection(wxDataViewSelectionCmp);
+
+    wxDataViewItem last_parent;
+
+    int len = sel.GetCount();
+    for( int i = 0; i < len; 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) );
+    }
+
+    m_clientArea->SetSelections( selection );
+}
+
+void wxDataViewCtrl::Select( const wxDataViewItem & item )
+{
+    ExpandAncestors( item );
+
+    int row = m_clientArea->GetRowByItem( item );
+    if( row >= 0 )
+    {
+        // Unselect all rows before select another in the single select mode
+        if (m_clientArea->IsSingleSel())
+            m_clientArea->SelectAllRows(false);
+
+        m_clientArea->SelectRow(row, true);
+
+        // Also set focus to the selected item
+        m_clientArea->ChangeCurrentRow( row );
+    }
+}
+
+void wxDataViewCtrl::Unselect( const wxDataViewItem & item )
+{
+    int row = m_clientArea->GetRowByItem( item );
+    if( row >= 0 )
+        m_clientArea->SelectRow(row, false);
+}
+
+bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const
+{
+    int row = m_clientArea->GetRowByItem( item );
+    if( row >= 0 )
+    {
+        return m_clientArea->IsRowSelected(row);
+    }
+    return false;
+}
+
+void wxDataViewCtrl::SelectAll()
+{
+    m_clientArea->SelectAllRows(true);
+}
+
+void wxDataViewCtrl::UnselectAll()
+{
+    m_clientArea->SelectAllRows(false);
+}
+
+void wxDataViewCtrl::EnsureVisible( int row, int column )
+{
+    if( row < 0 )
+        row = 0;
+    if( row > (int) m_clientArea->GetRowCount() )
+        row = m_clientArea->GetRowCount();
+
+    int first = m_clientArea->GetFirstVisibleRow();
+    int last = m_clientArea->GetLastVisibleRow();
+    if( row < first )
+        m_clientArea->ScrollTo( row, column );
+    else if( row > last )
+        m_clientArea->ScrollTo( row - last + first, column );
+    else
+        m_clientArea->ScrollTo( first, column );
+}
+
+void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn * column )
+{
+    ExpandAncestors( item );
+
+    m_clientArea->RecalculateDisplay();
+
+    int row = m_clientArea->GetRowByItem(item);
+    if( row >= 0 )
+    {
+        if( column == NULL )
+            EnsureVisible(row, -1);
+        else
+            EnsureVisible( row, GetColumnIndex(column) );
+    }
+
+}
+
+void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item,
+                              wxDataViewColumn* &column ) const
+{
+    m_clientArea->HitTest(point, item, column);
+}
+
+wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem & item,
+                                    const wxDataViewColumn* column ) const
+{
+    return m_clientArea->GetItemRect(item, column);
+}
+
+wxDataViewItem wxDataViewCtrl::GetItemByRow( unsigned int row ) const
+{
+    return m_clientArea->GetItemByRow( row );
+}
+
+int wxDataViewCtrl::GetRowByItem( const wxDataViewItem & item ) const
+{
+    return m_clientArea->GetRowByItem( item );
+}
+
+void wxDataViewCtrl::Expand( const wxDataViewItem & item )
+{
+    ExpandAncestors( item );
+
+    int row = m_clientArea->GetRowByItem( item );
+    if (row != -1)
+        m_clientArea->Expand(row);
+}
+
+void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
+{
+    int row = m_clientArea->GetRowByItem( item );
+    if (row != -1)
+        m_clientArea->Collapse(row);
+}
+
+bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
+{
+    int row = m_clientArea->GetRowByItem( item );
+    if (row != -1)
+        return m_clientArea->IsExpanded(row);
+    return false;
+}
+
+void wxDataViewCtrl::StartEditor( const wxDataViewItem & item, unsigned int column )
+{
+    wxDataViewColumn* col = GetColumn( column );
+    if (!col)
+        return;
+
+    wxRect itemRect = GetItemRect(item, col);
+    wxDataViewRenderer* renderer = col->GetRenderer();
+    if (renderer->GetMode() == wxDATAVIEW_CELL_EDITABLE)
+        renderer->StartEditing(item, itemRect);
+}
+
+#endif // !wxUSE_GENERICDATAVIEWCTRL
+
+#endif // wxUSE_DATAVIEWCTRL