Allow passing multi-line strings to wxDC::DrawText(), even under MSW.

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 38c3281ec56265183e75e6269327d570a3565823..dd7813621d9f095ad2afcc6792ee110a06fa9d55 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -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"


@@ -45,13 +46,21 @@
 #include "wx/list.h"
 #include "wx/listimpl.cpp"
 #include "wx/imaglist.h"
 #include "wx/list.h"
 #include "wx/listimpl.cpp"
 #include "wx/imaglist.h"

+#include "wx/headerctrl.h"
+#include "wx/dnd.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 SCROLL_UNIT_X = 15;
 
 // the cell padding on the left/right


@@ -66,200 +75,167 @@ static const int EXPANDER_OFFSET = 4;
 static const int EXPANDER_OFFSET = 1;
 #endif
 
 static const int EXPANDER_OFFSET = 1;
 #endif
 

-//-----------------------------------------------------------------------------
-// wxDataViewHeaderWindow
-//-----------------------------------------------------------------------------
-
-// on wxMSW the header window (only that part however) can be made native!
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    #define USE_NATIVE_HEADER_WINDOW
-#endif
-
-//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;
+// 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;
 
 static int g_column = -2;
 static bool g_asending = true;
 

-// NB: for some reason, this class must be dllexport'ed or we get warnings from
-//     MSVC in DLL build
-class WXDLLIMPEXP_ADV wxDataViewHeaderWindowBase : public wxControl
-{
-public:
-    wxDataViewHeaderWindowBase()
-        { m_owner = NULL; }
-
-    bool Create(wxDataViewCtrl *parent, wxWindowID id,
-                const wxPoint &pos, const wxSize &size,
-                const wxString &name)
-    {
-        return wxWindow::Create(parent, id, pos, size, wxNO_BORDER, name);
-    }
-
-    void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; }
-    wxDataViewCtrl *GetOwner() { return m_owner; }
-
-    // called on column addition/removal
-    virtual void UpdateDisplay() { /* by default, do nothing */ }
+//-----------------------------------------------------------------------------
+// wxDataViewColumn
+//-----------------------------------------------------------------------------

 
 

-    // returns the n-th column
-    virtual wxDataViewColumn *GetColumn(unsigned int n)
+void wxDataViewColumn::Init(int width, wxAlignment align, int flags)
+{
+    m_width = width == wxCOL_WIDTH_DEFAULT ? wxDVC_DEFAULT_WIDTH : width;
+    m_minWidth = 0;
+    m_align = align;
+    m_flags = flags;
+    m_sort = false;
+    m_sortAscending = true;
+}
+    
+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);
-};
-
-#ifdef 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();
-
-    virtual void OnInternalIdle();
-
-    // called Refresh afterwards
-    virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL);
-
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+    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);
-
-    wxSize DoGetBestSize() const;
+    // implement/override wxHeaderCtrl functions by forwarding them to the main
+    // control
+    virtual const wxHeaderColumn& GetColumn(unsigned int idx) const
+    {
+        return *(GetOwner()->GetColumn(idx));
+    }

 
 

-    unsigned int GetColumnIdxFromHeader(NMHEADER *nmHDR);
+    // FIXME: currently unused
+    virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle)
+    {
+        wxDataViewCtrl * const owner = GetOwner();

 
 

-    wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR)
-        { return GetColumn(GetColumnIdxFromHeader(nmHDR)); }
+        int widthContents = owner->GetBestColumnWidth(idx);
+        owner->GetColumn(idx)->SetWidth(wxMax(widthTitle, widthContents));
+        owner->OnColumnChange(idx);

 
 

-    int          m_scrollOffsetX;
-    int          m_buttonHeight;
-    bool         m_delayedUpdate;
-    wxImageList *m_imageList;
+        return true;
+    }

 
 private:
 
 private:

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

     {
     {

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

 
 

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

 
 

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

     }
 
     }
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

     {
     {

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

 
 

-        m_hover = wxNOT_FOUND;
-        m_column = wxNOT_FOUND;
-        m_currentX = 0;
-        m_minX = 0;
+    void 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 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


@@ -278,11 +254,13 @@ public:
 //-----------------------------------------------------------------------------
 // wxDataViewTreeNode
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDataViewTreeNode
 //-----------------------------------------------------------------------------

+

 class wxDataViewTreeNode;
 WX_DEFINE_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes );
 WX_DEFINE_ARRAY( void* , wxDataViewTreeLeaves);
 
 class wxDataViewTreeNode;
 WX_DEFINE_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes );
 WX_DEFINE_ARRAY( void* , wxDataViewTreeLeaves);
 

-int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2);
+int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1,
+                                           wxDataViewTreeNode ** node2);

 int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2);
 
 class wxDataViewTreeNode
 int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2);
 
 class wxDataViewTreeNode


@@ -332,7 +310,7 @@ public:
     unsigned int GetNodeNumber() const { return m_nodes.GetCount(); }
     int GetIndentLevel() const
     {
     unsigned int GetNodeNumber() const { return m_nodes.GetCount(); }
     int GetIndentLevel() const
     {

-        int ret = 0 ;
+        int ret = 0;

         const wxDataViewTreeNode * node = this;
         while( node->GetParent()->GetParent() != NULL )
         {
         const wxDataViewTreeNode * node = this;
         while( node->GetParent()->GetParent() != NULL )
         {


@@ -344,14 +322,14 @@ public:
 
     bool IsOpen() const
     {
 
     bool IsOpen() const
     {

-        return m_open ;
+        return m_open;

     }
 
     void ToggleOpen()
     {
         int len = m_nodes.GetCount();
         int sum = 0;
     }
 
     void ToggleOpen()
     {
         int len = m_nodes.GetCount();
         int sum = 0;

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

             sum += m_nodes[i]->GetSubTreeCount();
 
         sum += m_leaves.GetCount();
             sum += m_nodes[i]->GetSubTreeCount();
 
         sum += m_leaves.GetCount();


@@ -374,7 +352,7 @@ public:
     void ChangeSubTreeCount( int num )
     {
         if( !m_open )
     void ChangeSubTreeCount( int num )
     {
         if( !m_open )

-            return ;
+            return;

         m_subTreeCount += num;
         if( m_parent )
             m_parent->ChangeSubTreeCount(num);
         m_subTreeCount += num;
         if( m_parent )
             m_parent->ChangeSubTreeCount(num);


@@ -402,7 +380,8 @@ private:
     int                  m_subTreeCount;
 };
 
     int                  m_subTreeCount;
 };
 

-int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2)
+int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1,
+                                           wxDataViewTreeNode ** node2)

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


@@ -413,7 +392,6 @@ int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2)
 }
 
 
 }
 
 

-

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


@@ -432,7 +410,7 @@ public:
                             const wxSize &size = wxDefaultSize,
                             const wxString &name = wxT("wxdataviewctrlmainwindow") );
     virtual ~wxDataViewMainWindow();
                             const wxSize &size = wxDefaultSize,
                             const wxString &name = wxT("wxdataviewctrlmainwindow") );
     virtual ~wxDataViewMainWindow();

-    
+

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


@@ -473,6 +451,9 @@ public:
     wxDataViewCtrl *GetOwner() { return m_owner; }
     const wxDataViewCtrl *GetOwner() const { return m_owner; }
 
     wxDataViewCtrl *GetOwner() { return m_owner; }
     const wxDataViewCtrl *GetOwner() const { return m_owner; }
 

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


@@ -498,13 +479,17 @@ 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
+
+    // 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 GetLastVisibleRow();

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

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

-    void SetSelections( const wxDataViewSelection & sel ) { m_selection = sel; UpdateDisplay(); }
+    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 Select( const wxArrayInt& aSelections );
     void SelectAllRows( bool on );
     void SelectRow( unsigned int row, bool on );


@@ -524,33 +509,45 @@ public:
     }
 
     wxRect GetLineRect( unsigned int row ) const;
     }
 
     wxRect GetLineRect( unsigned int row ) const;

-    
+

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

-    //Some useful functions for row and item mapping
+    // Some useful functions for row and item mapping

     wxDataViewItem GetItemByRow( unsigned int row ) const;
     int GetRowByItem( const wxDataViewItem & item ) const;
     wxDataViewItem GetItemByRow( unsigned int row ) const;
     int GetRowByItem( const wxDataViewItem & item ) const;

-    
-    //Methods for building the mapping tree
+
+    // Methods for building the mapping tree

     void BuildTree( wxDataViewModel  * model );
     void DestroyTree();
     void HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column );
     wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column );
 
     void BuildTree( wxDataViewModel  * model );
     void DestroyTree();
     void HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column );
     wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column );
 

-    void Expand( unsigned int row ) { OnExpanding( row ); }
-    void Collapse( unsigned int row ) { OnCollapsing( row ); }
+    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:
     wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const;
 private:
     wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const;

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

 
 

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

 
     wxDataViewEvent SendExpanderEvent( wxEventType type, const wxDataViewItem & item );
 
     wxDataViewEvent SendExpanderEvent( wxEventType type, const wxDataViewItem & item );

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

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


@@ -568,13 +565,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;


@@ -582,11 +589,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
+
+    // This is the tree node under the cursor

     wxDataViewTreeNode * m_underMouse;
     wxDataViewTreeNode * m_underMouse;

+

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


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

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

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


@@ -627,19 +636,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_wantsAttr = false;
-    m_hasAttr = false;
+    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()


@@ -657,7 +664,7 @@ wxDC *wxDataViewRenderer::GetDC()
 }
 
 void wxDataViewRenderer::SetAlignment( int align )
 }
 
 void wxDataViewRenderer::SetAlignment( int align )

-{ 
+{

     m_align=align;
 }
 
     m_align=align;
 }
 


@@ -666,19 +673,6 @@ int wxDataViewRenderer::GetAlignment() const
     return m_align;
 }
 
     return m_align;
 }
 

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

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


@@ -686,30 +680,20 @@ int wxDataViewRenderer::CalculateAlignment() const
 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 )
 {
 }
 

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

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

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

 {
 }
 
 {
 }
 


@@ -725,7 +709,7 @@ bool wxDataViewTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const
     return false;
 }
 
     return false;
 }
 

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

 {
     return true;
 }
 {
     return true;
 }


@@ -733,9 +717,15 @@ bool wxDataViewTextRenderer::HasEditorCtrl()
 wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,
         wxRect labelRect, const wxVariant &value )
 {
 wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,
         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( wxControl *editor, wxVariant &value )


@@ -745,9 +735,9 @@ bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVarian
     return true;
 }
 
     return true;
 }
 

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

 {
 {

-    RenderText( m_text, 0, cell, dc, state );
+    RenderText(m_text, 0, rect, dc, state);

     return true;
 }
 
     return true;
 }
 


@@ -755,77 +745,19 @@ wxSize wxDataViewTextRenderer::GetSize() const
 {
     const wxDataViewCtrl *view = GetView();
     if (!m_text.empty())
 {
     const wxDataViewCtrl *view = GetView();
     if (!m_text.empty())

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

 {
 }
 
 {
 }
 


@@ -861,18 +793,18 @@ wxSize wxDataViewBitmapRenderer::GetSize() const
     else if (m_icon.Ok())
         return wxSize( m_icon.GetWidth(), m_icon.GetHeight() );
 
     else if (m_icon.Ok())
         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;
 }


@@ -891,63 +823,56 @@ 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;
     if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE)
         flags |= wxCONTROL_DISABLED;
 
     int flags = 0;
     if (m_toggle)
         flags |= wxCONTROL_CHECKED;
     if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE)
         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)
+void wxDataViewToggleRenderer::WXOnActivate(wxDataViewModel *model,
+                                            const wxVariant& valueOld,
+                                            const wxDataViewItem & item,
+                                            unsigned int col)

 {
 {

-    bool value = !m_toggle;
-    wxVariant variant = value;
-    model->SetValue( variant, item, col);
-    model->ValueChanged( item, col );
-    return true;
+    model->ChangeValue(!valueOld.GetBool(), item, col);

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


@@ -964,18 +889,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;
 }


@@ -1032,20 +962,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 )

 {
 }
 
 {
 }
 


@@ -1078,44 +1005,39 @@ wxSize wxDataViewDateRenderer::GetSize() const
     return wxSize(x,y+d);
 }
 
     return wxSize(x,y+d);
 }
 

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

 {
 {

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

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

 }
 
 // ---------------------------------------------------------
 // wxDataViewIconTextRenderer
 // ---------------------------------------------------------
 
 }
 
 // ---------------------------------------------------------
 // wxDataViewIconTextRenderer
 // ---------------------------------------------------------
 

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

 
 wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(
 
 wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(

-  const wxString &varianttype, wxDataViewCellMode mode, int align ) :
-    wxDataViewCustomRenderer( varianttype, mode, align )
+const wxString &varianttype, wxDataViewCellMode mode, int align ) :
+    wxDataViewRenderer( varianttype, mode, align )

 {
     SetMode(mode);
     SetAlignment(align);
 }
 
 {
     SetMode(mode);
     SetAlignment(align);
 }
 

-wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer()
-{
-}
-

 bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )
 {
     m_value << value;
 bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )
 {
     m_value << value;


@@ -1127,17 +1049,18 @@ bool wxDataViewIconTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const
     return false;
 }
 
     return false;
 }
 

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

 {
     int xoffset = 0;
 {
     int xoffset = 0;

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

     {
     {

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

     }
 
     }
 

-    RenderText( m_value.GetText(), xoffset, cell, dc, state );
+    RenderText(m_value.GetText(), xoffset, rect, dc, state);

 
     return true;
 }
 
     return true;
 }


@@ -1157,891 +1080,491 @@ wxSize wxDataViewIconTextRenderer::GetSize() const
     return wxSize(80,20);
 }
 
     return wxSize(80,20);
 }
 

-wxControl *
-wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow * WXUNUSED(parent),
-                                             wxRect WXUNUSED(labelRect),
-                                             const wxVariant& WXUNUSED(value))
-{
-    return NULL;
-}
-
-bool
-wxDataViewIconTextRenderer::GetValueFromEditorCtrl(wxControl* WXUNUSED(editor),
-                                                   wxVariant& WXUNUSED(value))
+wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant& value)

 {
 {

-    return false;
-}
+    wxDataViewIconText iconText;
+    iconText << value;

 
 

-// ---------------------------------------------------------
-// wxDataViewColumn
-// ---------------------------------------------------------
+    wxString text = iconText.GetText();

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
+    // 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;
+    }

 
 

-wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell,
-                                    unsigned int model_column,
-                                    int width, wxAlignment align, int flags ) :
-    wxDataViewColumnBase( title, cell, model_column, width, align, flags )
-{
-    SetAlignment(align);
-    SetTitle(title);
-    SetFlags(flags);
+    wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, text,
+                                       wxPoint(labelRect.x,labelRect.y),
+                                       wxSize(labelRect.width,labelRect.height) );

 
 

-    m_autosize = width < 0;  // TODO
+    // select the text in the control an place the cursor at the end
+    ctrl->SetInsertionPointEnd();
+    ctrl->SelectAll();

 
 

-    Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width);
+    return ctrl;

 }
 
 }
 

-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::GetValueFromEditorCtrl( wxControl *editor, wxVariant& value )

 {
 {

-    SetAlignment(align);
-    SetFlags(flags);
+    wxTextCtrl *text = (wxTextCtrl*) editor;

 
 

-    Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width);
+    wxDataViewIconText iconText(text->GetValue(), m_value.GetIcon());
+    value << iconText;
+    return true;

 }
 
 }
 

-wxDataViewColumn::~wxDataViewColumn()
-{
-}
+//-----------------------------------------------------------------------------
+// wxDataViewDropTarget
+//-----------------------------------------------------------------------------

 
 

-void wxDataViewColumn::Init( int width )
-{
-    m_width = width;
-    m_minWidth = wxDVC_DEFAULT_MINWIDTH;
-    m_ascending = true;
-}
+#if wxUSE_DRAG_AND_DROP

 
 

-void wxDataViewColumn::SetResizeable( bool resizeable )
+class wxBitmapCanvas: public wxWindow

 {
 {

-    if (resizeable)
-        m_flags |= wxDATAVIEW_COL_RESIZABLE;
-    else
-        m_flags &= ~wxDATAVIEW_COL_RESIZABLE;
-}
+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) );
+    }

 
 

-void wxDataViewColumn::SetHidden( bool hidden )
-{
-    if (hidden)
-        m_flags |= wxDATAVIEW_COL_HIDDEN;
-    else
-        m_flags &= ~wxDATAVIEW_COL_HIDDEN;
+    void OnPaint( wxPaintEvent &WXUNUSED(event) )
+    {
+        wxPaintDC dc(this);
+        dc.DrawBitmap( m_bitmap, 0, 0);
+    }

 
 

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

 
 

-void wxDataViewColumn::SetSortable( bool sortable )
+class wxDataViewDropSource: public wxDropSource

 {
 {

-    if (sortable)
-        m_flags |= wxDATAVIEW_COL_SORTABLE;
-    else
-        m_flags &= ~wxDATAVIEW_COL_SORTABLE;
+public:
+    wxDataViewDropSource( wxDataViewMainWindow *win, unsigned int row ) :
+        wxDropSource( win )
+    {
+        m_win = win;
+        m_row = row;
+        m_hint = NULL;
+    }

 
 

-    // Update header button
-    if (GetOwner())
-        GetOwner()->OnColumnChange();
-}
+    ~wxDataViewDropSource()
+    {
+        delete m_hint;
+    }

 
 

-void wxDataViewColumn::SetReorderable( bool reorderable )
-{
-    if (reorderable)
-        m_flags |= wxDATAVIEW_COL_REORDERABLE;
-    else
-        m_flags &= ~wxDATAVIEW_COL_REORDERABLE;
-}
+    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect) )
+    {
+        wxPoint pos = wxGetMousePosition();

 
 

-void wxDataViewColumn::SetSortOrder( bool ascending )
-{
-    m_ascending = ascending;
+        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;

 
 

-    // Update header button
-    if (GetOwner())
-        GetOwner()->OnColumnChange();
-}
+            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 );
+        }

 
 

-bool wxDataViewColumn::IsSortOrderAscending() const
-{
-    return m_ascending;
-}
+        return false;
+    }

 
 

-void wxDataViewColumn::SetInternalWidth( int width )
-{
-    m_width = width;
+    wxDataViewMainWindow   *m_win;
+    unsigned int            m_row;
+    wxFrame                *m_hint;
+    int m_dist_x,m_dist_y;
+};

 
 

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

 
 

-void wxDataViewColumn::SetWidth( int width )
+class wxDataViewDropTarget: public wxDropTarget

 {
 {

-    if (m_owner->m_headerArea) m_owner->m_headerArea->UpdateDisplay();
+public:
+    wxDataViewDropTarget( wxDataObject *obj, wxDataViewMainWindow *win ) :
+        wxDropTarget( obj )
+    {
+        m_win = win;
+    }

 
 

-    SetInternalWidth(width);
-}
+    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);
+    }

 
 

+    virtual bool OnDrop( wxCoord x, wxCoord y )
+    {
+        wxDataFormat format = GetMatchingPair();
+        if (format == wxDF_INVALID)
+            return false;
+        return m_win->OnDrop( format, x, y );
+    }

 
 

-//-----------------------------------------------------------------------------
-// wxDataViewHeaderWindowBase
-//-----------------------------------------------------------------------------
+    virtual wxDragResult OnData( wxCoord x, wxCoord y, wxDragResult def )
+    {
+        wxDataFormat format = GetMatchingPair();
+        if (format == wxDF_INVALID)
+            return wxDragNone;
+        if (!GetData())
+            return wxDragNone;
+        return m_win->OnData( format, x, y, def );
+    }

 
 

-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());
-
-    // for events created by wxDataViewHeaderWindow the
-    // row / value fields are not valid
-
-    parent->GetEventHandler()->ProcessEvent(le);
-}
+    virtual void OnLeave()
+        { m_win->OnLeave(); }

 
 

-#ifdef USE_NATIVE_HEADER_WINDOW
-
-#ifndef HDS_DRAGDROP
-    #define HDS_DRAGDROP 0x0040
-#endif
-#ifndef HDS_FULLDRAG
-    #define HDS_FULLDRAG 0x0080
-#endif
+    wxDataViewMainWindow   *m_win;
+};

 
 

-// implemented in msw/listctrl.cpp:
-int WXDLLIMPEXP_CORE wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick);
+#endif // wxUSE_DRAG_AND_DROP

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxDataViewHeaderWindowMSW, wxWindow)
+//-----------------------------------------------------------------------------
+// wxDataViewRenameTimer
+//-----------------------------------------------------------------------------

 
 

-bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id,
-                                        const wxPoint &pos, const wxSize &size,
-                                        const wxString &name )
+wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner )

 {
 {

-    m_owner = parent;
-
-    m_scrollOffsetX = 0;
-    m_delayedUpdate = false;
-    m_buttonHeight = wxRendererNative::Get().GetHeaderButtonHeight( this );
-
-    int x = pos.x == wxDefaultCoord ? 0 : pos.x,
-        y = pos.y == wxDefaultCoord ? 0 : pos.y,
-        w = size.x == wxDefaultCoord ? 1 : size.x,
-        h = m_buttonHeight;
-
-    wxSize new_size(w,h);
-
-    if ( !CreateControl(parent, id, pos, new_size, 0, wxDefaultValidator, name) )
-        return false;
-
-    // create the native WC_HEADER window:
-    WXHWND hwndParent = (HWND)parent->GetHandle();
-    WXDWORD msStyle = WS_CHILD | HDS_DRAGDROP | HDS_BUTTONS | HDS_HORZ | HDS_HOTTRACK | HDS_FULLDRAG;
-
-    if ( m_isShown )
-        msStyle |= WS_VISIBLE;
-
-    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;
-    }
-
-    m_imageList = new wxImageList( 16, 16 );
-    Header_SetImageList( (HWND) m_hWnd, m_imageList->GetHIMAGELIST() );
-
-    // we need to subclass the m_hWnd to force wxWindow::HandleNotify
-    // to call wxDataViewHeaderWindow::MSWOnNotify
-    SubclassWin(m_hWnd);
-
-    // the following is required to get the default win's font for
-    // header windows and must be done befor sending the HDM_LAYOUT msg
-    SetFont(GetFont());
-
-    return true;
+    m_owner = owner;

 }
 
 }
 

-wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow()
+void wxDataViewRenameTimer::Notify()

 {
 {

-    delete m_imageList;
-    UnsubclassWin();
+    m_owner->OnRenameTimer();

 }
 
 }
 

-wxSize wxDataViewHeaderWindowMSW::DoGetBestSize() const
-{
-    return wxSize( 80, m_buttonHeight+2 );
-}
+//-----------------------------------------------------------------------------
+// wxDataViewMainWindow
+//-----------------------------------------------------------------------------

 
 

-void wxDataViewHeaderWindowMSW::OnInternalIdle()
-{
-    if (m_delayedUpdate)
-    {
-        m_delayedUpdate = false;
-        UpdateDisplay();
-    }
-}
+// The tree building helper, declared firstly
+static void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item,
+                             wxDataViewTreeNode * node);

 
 

-void wxDataViewHeaderWindowMSW::UpdateDisplay()
+int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )

 {
 {

-    // remove old columns
-    for (int j=0, max=Header_GetItemCount((HWND)m_hWnd); j < max; j++)
-        Header_DeleteItem((HWND)m_hWnd, 0);
-        
-    m_imageList->RemoveAll();
-
-    // add the updated array of columns to the header control
-    unsigned int cols = GetOwner()->GetColumnCount();
-    unsigned int added = 0;
-    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;
-        if (col->GetBitmap().IsOk())
-        {
-           m_imageList->Add( col->GetBitmap() );
-           hdi.mask |= HDI_IMAGE;
-           hdi.iImage = m_imageList->GetImageCount()-1;
-        }
-        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;
-        if (col->GetBitmap().IsOk())
-            hdi.fmt |= HDF_IMAGE;
-        
-        //hdi.fmt &= ~(HDF_SORTDOWN|HDF_SORTUP);
-
-        if (col->IsSortable() && GetOwner()->GetSortingColumn() == col)
-        {
-            //The Microsoft Comctrl32.dll 6.0 support SORTUP/SORTDOWN, but they are not default
-            //see http://msdn2.microsoft.com/en-us/library/ms649534.aspx for more detail
-            // VZ: works with 5.81
-            hdi.fmt |= col->IsSortOrderAscending() ? HDF_SORTUP : HDF_SORTDOWN;
-        }
-
-        // lParam is reserved for application's use:
-        // we store there the column index to use it later in MSWOnNotify
-        // (since columns may have been hidden)
-        hdi.lParam = (LPARAM)i;
-
-        // the native wxMSW implementation of the header window
-        // draws the column separator COLUMN_WIDTH_OFFSET pixels
-        // on the right: to correct this effect we make the column
-        // exactly COLUMN_WIDTH_OFFSET wider (for the first column):
-        if (i == 0)
-            hdi.cxy += COLUMN_WIDTH_OFFSET;
-
-        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;
-
-        default:
-            // such alignment is not allowed for the column header!
-            break; // wxFAIL;
-        }
-
-        SendMessage((HWND)m_hWnd, HDM_INSERTITEM,
-                    (WPARAM)added, (LPARAM)&hdi);
-        added++;
-    }
+    if (row1 > row2) return 1;
+    if (row1 == row2) return 0;
+    return -1;

 }
 
 }
 

-unsigned int wxDataViewHeaderWindowMSW::GetColumnIdxFromHeader(NMHEADER *nmHDR)
-{
-    unsigned int idx;
-
-    // NOTE: we don't just return nmHDR->iItem because when there are
-    //       hidden columns, nmHDR->iItem may be different from
-    //       nmHDR->pitem->lParam
-
-    if (nmHDR->pitem && nmHDR->pitem->mask & HDI_LPARAM)
-    {
-        idx = (unsigned int)nmHDR->pitem->lParam;
-        return idx;
-    }
+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;
-
-    // is it a message from the header?
-    if ( nmhdr->hwndFrom != (HWND)m_hWnd )
-        return wxWindow::MSWOnNotify(idCtrl, lParam, result);
-
-    NMHEADER *nmHDR = (NMHEADER *)nmhdr;
-    switch ( nmhdr->code )
-    {
-        case HDN_BEGINTRACK:
-            // user has started to resize a column:
-            // do we need to veto it?
-            if (!GetColumn(nmHDR->iItem)->IsResizeable())
-            {
-                // veto it!
-                *result = TRUE;
-            }
-            break;
-
-        case HDN_BEGINDRAG:
-            // user has started to reorder a column
-            if ((nmHDR->iItem != -1) && (!GetColumn(nmHDR->iItem)->IsReorderable()))
-            {
-                // veto it!
-                *result = TRUE;
-            }
-            break;
-
-        case HDN_ENDDRAG:       // user has finished reordering a column
-            {
-               wxDataViewColumn *col = GetColumn(nmHDR->iItem);
-               unsigned int new_pos = nmHDR->pitem->iOrder;
-               m_owner->ColumnMoved( col, new_pos );
-               m_delayedUpdate = true;
-            }
-            break;
-
-        case HDN_ITEMCHANGING:
-            if (nmHDR->pitem != NULL &&
-                (nmHDR->pitem->mask & HDI_WIDTH) != 0)
-            {
-                int minWidth = GetColumnFromHeader(nmHDR)->GetMinWidth();
-                if (nmHDR->pitem->cxy < minWidth)
-                {
-                    // do not allow the user to resize this column under
-                    // its minimal width:
-                    *result = TRUE;
-                }
-            }
-            break;
-
-        case HDN_ITEMCHANGED:   // user is resizing a column
-        case HDN_ENDTRACK:      // user has finished resizing a column
-
-            // 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);
+    SetOwner( parent );

 
 

-                // see UpdateDisplay() for more info about COLUMN_WIDTH_OFFSET
-                if (idx == 0 && w > COLUMN_WIDTH_OFFSET)
-                    w -= COLUMN_WIDTH_OFFSET;
+    m_lastOnSame = false;
+    m_renameTimer = new wxDataViewRenameTimer( this );

 
 

-                if (w >= (unsigned)col->GetMinWidth())
-                    col->SetInternalWidth(w);
-            }
-            break;
+    // TODO: user better initial values/nothing selected
+    m_currentCol = NULL;
+    m_currentRow = 0;

 
 

-        case HDN_ITEMCLICK:
-            {
-                unsigned int idx = GetColumnIdxFromHeader(nmHDR);
-                wxDataViewModel * model = GetOwner()->GetModel();
+    m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1

 
 

-                if(nmHDR->iButton == 0)
-                {
-                    wxDataViewColumn *col = GetColumn(idx);
-                    if(col->IsSortable())
-                    {
-                        if(model && m_owner->GetSortingColumn() == col)
-                        {
-                            bool order = col->IsSortOrderAscending();
-                            col->SetSortOrder(!order);
-                        }
-                        else if(model)
-                        {
-                            m_owner->SetSortingColumn(col);
-                        }
-                    }
-                    UpdateDisplay();
-                    if(model)
-                        model->Resort();
-                }
+#if wxUSE_DRAG_AND_DROP
+    m_dragCount = 0;
+    m_dragStart = wxPoint(0,0);

 
 

-                wxEventType evt = nmHDR->iButton == 0 ?
-                        wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK :
-                        wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK;
-                SendEvent(evt, idx);
-            }
-            break;
+    m_dragEnabled = false;
+    m_dropEnabled = false;
+    m_dropHint = false;
+    m_dropHintLine = (unsigned int) -1;
+#endif // wxUSE_DRAG_AND_DROP

 
 

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

 
 

-                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;
+    m_hasFocus = false;

 
 

-        case HDN_GETDISPINFOW:
-            // see wxListCtrl::MSWOnNotify for more info!
-            break;
+    SetBackgroundColour( *wxWHITE );

 
 

-        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;
+    SetBackgroundStyle(wxBG_STYLE_CUSTOM);

 
 

-        default:
-            return wxWindow::MSWOnNotify(idCtrl, lParam, result);
-    }
+    m_penRule = wxPen(GetRuleColour());

 
 

-    return true;
-}
+    // compose a pen whichcan draw black lines
+    // TODO: maybe there is something system colour to use
+    m_penExpander = wxPen(wxColour(0,0,0));

 
 

-void wxDataViewHeaderWindowMSW::ScrollWindow(int dx, int WXUNUSED(dy),
-                                             const wxRect * WXUNUSED(rect))
-{
-    m_scrollOffsetX += dx;
+    m_root = new wxDataViewTreeNode( NULL );
+    m_root->SetHasChildren(true);

 
 

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

 }
 
 }
 

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

 {
 {

-    // TODO: why is there a border + 2px around it?
-    wxControl::DoSetSize( x+m_scrollOffsetX+1, y+1, w-m_scrollOffsetX-2, h-2, f );
+    DestroyTree();
+    delete m_renameTimer;

 }
 
 }
 

-#else       // !defined(__WXMSW__)
-
-IMPLEMENT_ABSTRACT_CLASS(wxGenericDataViewHeaderWindow, wxWindow)
-BEGIN_EVENT_TABLE(wxGenericDataViewHeaderWindow, wxWindow)
-    EVT_PAINT         (wxGenericDataViewHeaderWindow::OnPaint)
-    EVT_MOUSE_EVENTS  (wxGenericDataViewHeaderWindow::OnMouse)
-    EVT_SET_FOCUS     (wxGenericDataViewHeaderWindow::OnSetFocus)
-END_EVENT_TABLE()

 
 

-bool wxGenericDataViewHeaderWindow::Create(wxDataViewCtrl *parent, wxWindowID id,
-                                           const wxPoint &pos, const wxSize &size,
-                                           const wxString &name )
+#if wxUSE_DRAG_AND_DROP
+bool wxDataViewMainWindow::EnableDragSource( const wxDataFormat &format )

 {
 {

-    m_owner = parent;
-
-    if (!wxDataViewHeaderWindowBase::Create(parent, id, pos, size, name))
-        return false;
-
-    wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes();
-    SetBackgroundStyle( wxBG_STYLE_CUSTOM );
-    SetOwnForegroundColour( attr.colFg );
-    SetOwnBackgroundColour( attr.colBg );
-    if (!m_hasFont)
-        SetOwnFont( attr.font );
-
-    // set our size hints: wxDataViewCtrl will put this wxWindow inside
-    // a wxBoxSizer and in order to avoid super-big header windows,
-    // we need to set our height as fixed
-    SetMinSize(wxSize(-1, HEADER_WINDOW_HEIGHT));
-    SetMaxSize(wxSize(-1, HEADER_WINDOW_HEIGHT));
+    m_dragFormat = format;
+    m_dragEnabled = format != wxDF_INVALID;

 
     return true;
 }
 
 
     return true;
 }
 

-void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
+bool wxDataViewMainWindow::EnableDropTarget( const wxDataFormat &format )

 {
 {

-    int w, h;
-    GetClientSize( &w, &h );
-
-    wxAutoBufferedPaintDC dc( this );
-
-    dc.SetBackground(GetBackgroundColour());
-    dc.Clear();
-
-    int xpix;
-    m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
-
-    int x;
-    m_owner->GetViewStart( &x, NULL );
-
-    // account for the horz scrollbar offset
-    dc.SetDeviceOrigin( -x * xpix, 0 );
-
-    dc.SetFont( GetFont() );
-
-    unsigned int cols = GetOwner()->GetColumnCount();
-    unsigned int i;
-    int xpos = 0;
-    for (i = 0; i < cols; i++)
-    {
-        wxDataViewColumn *col = GetColumn( i );
-        if (col->IsHidden())
-            continue;      // skip it!
-
-        int cw = col->GetWidth();
-        int ch = h;
-
-        wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE;
-        if (col->IsSortable() && GetOwner()->GetSortingColumn() == col)
-        {
-            if (col->IsSortOrderAscending())
-                sortArrow = wxHDR_SORT_ICON_UP;
-            else
-                sortArrow = wxHDR_SORT_ICON_DOWN;
-        }
-
-        int state = 0;
-        if (m_parent->IsEnabled())
-        {
-            if ((int) i == m_hover)
-                state = wxCONTROL_CURRENT;
-        }
-        else
-        {
-            state = (int) wxCONTROL_DISABLED;
-        }
-
-        wxRendererNative::Get().DrawHeaderButton
-                                (
-                                    this,
-                                    dc,
-                                    wxRect(xpos, 0, cw, ch-1),
-                                    state,
-                                    sortArrow
-                                );
-
-        // align as required the column title:
-        int x = xpos;
-        wxSize titleSz = dc.GetTextExtent(col->GetTitle());
-        switch (col->GetAlignment())
-        {
-        case wxALIGN_LEFT:
-            x += HEADER_HORIZ_BORDER;
-            break;
-        case wxALIGN_RIGHT:
-            x += cw - titleSz.GetWidth() - HEADER_HORIZ_BORDER;
-            break;
-        default:
-        case wxALIGN_CENTER:
-        case wxALIGN_CENTER_HORIZONTAL:
-            x += (cw - titleSz.GetWidth() - 2 * HEADER_HORIZ_BORDER)/2;
-            break;
-        }
-
-        // always center the title vertically:
-        int y = wxMax((ch - titleSz.GetHeight()) / 2, HEADER_VERT_BORDER);
+    m_dropFormat = format;
+    m_dropEnabled = format != wxDF_INVALID;

 
 

-        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();
+    if (m_dropEnabled)
+        SetDropTarget( new wxDataViewDropTarget( new wxCustomDataObject( format ), this ) );

 
 

-        xpos += cw;
-    }
+    return true;

 }
 
 }
 

-void wxGenericDataViewHeaderWindow::OnSetFocus( wxFocusEvent &event )
+void wxDataViewMainWindow::RemoveDropHint()

 {
 {

-    GetParent()->SetFocus();
-    event.Skip();
+    if (m_dropHint)
+    {
+            m_dropHint = false;
+            RefreshRow( m_dropHintLine );
+            m_dropHintLine = (unsigned int) -1;
+    }

 }
 
 }
 

-void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event )
+wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x,
+                                               wxCoord y, wxDragResult def )

 {
 {

-    // we want to work with logical coords
-    int x;
-    m_owner->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL);
-    int y = event.GetY();
+    int xx = x;
+    int yy = y;
+    m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy );
+    unsigned int row = GetLineAt( yy );

 
 

-    if (m_isDragging)
+    if ((row >= GetRowCount()) || (yy > GetEndOfLastCol()))

     {
     {

-        // we don't draw the line beyond our window,
-        // but we allow dragging it there
-        int w = 0;
-        GetClientSize( &w, NULL );
-        m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
-        w -= 6;
-
-        if (event.ButtonUp())
-        {
-            m_isDragging = false;
-            if (HasCapture())
-                ReleaseMouse();
+        RemoveDropHint();
+        return wxDragNone;
+    }

 
 

-            m_dirty = true;
-        }
-        m_currentX = wxMax(m_minX + 7, x);
+    wxDataViewItem item = GetItemByRow( row );

 
 

-        if (m_currentX < w)
-        {
-            GetColumn(m_column)->SetWidth(m_currentX - m_minX);
-            Refresh();
-            GetOwner()->Refresh();
-        }
+    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;

     }
     }

-    else     // not dragging
+
+    if (!event.IsAllowed())

     {
     {

-        m_minX = 0;
-        m_column = wxNOT_FOUND;
+        RemoveDropHint();
+        return wxDragNone;
+    }

 
 

-        bool hit_border = false;

 
 

-        // end of the current column
-        int xpos = 0;
+    if (m_dropHint && (row != m_dropHintLine))
+        RefreshRow( m_dropHintLine );
+    m_dropHint = true;
+    m_dropHintLine = row;
+    RefreshRow( row );

 
 

-        // find the column where this event occured
-        int countCol = m_owner->GetColumnCount();
-        for (int column = 0; column < countCol; column++)
-        {
-            wxDataViewColumn *p = GetColumn(column);
+    return def;
+}

 
 

-            if (p->IsHidden())
-                continue;   // skip if not shown
+bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y )
+{
+    RemoveDropHint();

 
 

-            xpos += p->GetWidth();
-            m_column = column;
-            if ((abs(x-xpos) < 3) && (y < 22))
-            {
-                hit_border = true;
-                break;
-            }
+    int xx = x;
+    int yy = y;
+    m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy );
+    unsigned int row = GetLineAt( yy );

 
 

-            if (x < xpos)
-            {
-                // inside the column
-                break;
-            }
+    if ((row >= GetRowCount()) || (yy > GetEndOfLastCol()))
+        return false;

 
 

-            m_minX = xpos;
-        }
+    wxDataViewItem item = GetItemByRow( row );

 
 

-        int old_hover = m_hover;
-        m_hover = m_column;
-        if (event.Leaving())
-            m_hover = wxNOT_FOUND;
-        if (old_hover != m_hover)
-            Refresh();
+    wxDataViewModel *model = GetOwner()->GetModel();

 
 

-        if (m_column == wxNOT_FOUND)
-            return;
+    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;

 
 

-        bool resizeable = GetColumn(m_column)->IsResizeable();
-        if (event.LeftDClick() && resizeable)
-        {
-            GetColumn(m_column)->SetWidth(GetOwner()->GetBestColumnWidth(m_column));
-            Refresh();
-        }
-        else if (event.LeftDown() || event.RightUp())
-        {
-            if (hit_border && event.LeftDown() && resizeable)
-            {
-                m_isDragging = true;
-                CaptureMouse();
-                m_currentX = x;
-            }
-            else    // click on a column
-            {
-                wxDataViewModel * model = GetOwner()->GetModel();
-                wxEventType evt = event.LeftDown() ?
-                        wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK :
-                        wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK;
-                SendEvent(evt, m_column);
-
-                //Left click the header
-                if(event.LeftDown())
-                {
-                    wxDataViewColumn *col = GetColumn(m_column);
-                    if(col->IsSortable())
-                    {
-                        wxDataViewColumn* sortCol = m_owner->GetSortingColumn();
-                        if(model && sortCol == col)
-                        {
-                            bool order = col->IsSortOrderAscending();
-                            col->SetSortOrder(!order);
-                        }
-                        else if(model)
-                        {
-                            m_owner->SetSortingColumn(col);
-                        }
-                    }
-                    UpdateDisplay();
-                    if(model)
-                        model->Resort();
-                    //Send the column sorted event
-                    SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, m_column);
-                }
-            }
-        }
-        else if (event.Moving())
-        {
-            if (hit_border && resizeable)
-                m_currentCursor = m_resizeCursor;
-            else
-                m_currentCursor = wxSTANDARD_CURSOR;
+    if (!event.IsAllowed())
+        return false;

 
 

-            SetCursor(*m_currentCursor);
-        }
-    }
+    return true;

 }
 
 }
 

-void wxGenericDataViewHeaderWindow::AdjustDC(wxDC& dc)
+wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoord y,
+                                           wxDragResult def )

 {
 {

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

 
 

-    m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
-    m_owner->GetViewStart( &x, NULL );
+    if ((row >= GetRowCount()) || (yy > GetEndOfLastCol()))
+        return wxDragNone;

 
 

-    // 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 );
-}
+    wxDataViewItem item = GetItemByRow( row );

 
 

-#endif      // defined(__WXMSW__)
+    wxDataViewModel *model = GetOwner()->GetModel();

 
 

-//-----------------------------------------------------------------------------
-// wxDataViewRenameTimer
-//-----------------------------------------------------------------------------
+    wxCustomDataObject *obj = (wxCustomDataObject *) GetDropTarget()->GetDataObject();

 
 

-wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner )
-{
-    m_owner = owner;
+    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;
+
+    if (!event.IsAllowed())
+        return wxDragNone;
+
+    return def;

 }
 
 }
 

-void wxDataViewRenameTimer::Notify()
+void wxDataViewMainWindow::OnLeave()

 {
 {

-    m_owner->OnRenameTimer();
+    RemoveDropHint();

 }
 
 }
 

-//-----------------------------------------------------------------------------
-// wxDataViewMainWindow
-//-----------------------------------------------------------------------------
-
-//The tree building helper, declared firstly
-static void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataViewTreeNode * node);
-
-int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )
+wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent )

 {
 {

-    if (row1 > row2) return 1;
-    if (row1 == row2) return 0;
-    return -1;
-}
+    int height = GetLineHeight( row );
+    int width = 0;
+    unsigned int cols = GetOwner()->GetColumnCount();
+    unsigned int col;
+    for (col = 0; col < cols; col++)
+    {
+        wxDataViewColumn *column = GetOwner()->GetColumnAt(col);
+        if (column->IsHidden())
+            continue;      // skip it!
+        width += column->GetWidth();
+    }

 
 

+    indent = 0;
+    if (!IsVirtualList())
+    {
+        wxDataViewTreeNode *node = GetTreeNodeByRow(row);
+        indent = GetOwner()->GetIndent() * node->GetIndentLevel();
+        indent = indent + m_lineHeight;
+            // try to use the m_lineHeight as the expander space
+
+        if(!node->HasChildren())
+            delete node;
+    }
+    width -= indent;

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow)
+    wxBitmap bitmap( width, height );
+    wxMemoryDC dc( bitmap );
+    dc.SetFont( GetFont() );
+    dc.SetPen( *wxBLACK_PEN );
+    dc.SetBrush( *wxWHITE_BRUSH );
+    dc.DrawRectangle( 0,0,width,height );

 
 

-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()
+    wxDataViewModel *model = m_owner->GetModel();

 
 

-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 )
+    wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
+    if (!expander)
+    {
+        // TODO-RTL: last column for RTL support
+        expander = GetOwner()->GetColumnAt( 0 );
+        GetOwner()->SetExpanderColumn(expander);
+    }

 
 

-{
-    SetOwner( parent );

 
 

-    m_lastOnSame = false;
-    m_renameTimer = new wxDataViewRenameTimer( this );
+    int x = 0;
+    for (col = 0; col < cols; col++)
+    {
+        wxDataViewColumn *column = GetOwner()->GetColumnAt( col );
+        wxDataViewRenderer *cell = column->GetRenderer();

 
 

-    // TODO: user better initial values/nothing selected
-    m_currentCol = NULL;
-    m_currentRow = 0;
+        if (column->IsHidden())
+            continue;       // skip it!

 
 

-    m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1
+        width = column->GetWidth();

 
 

-    m_dragCount = 0;
-    m_dragStart = wxPoint(0,0);
-    m_lineLastClicked = (unsigned int) -1;
-    m_lineBeforeLastClicked = (unsigned int) -1;
-    m_lineSelectSingleOnUp = (unsigned int) -1;
+        if (column == expander)
+            width -= indent;

 
 

-    m_hasFocus = false;
+        wxVariant value;
+        wxDataViewItem item = GetItemByRow( row );
+        model->GetValue( value, item, column->GetModelColumn());
+        cell->SetValue( value );

 
 

-    SetBackgroundColour( *wxWHITE );
+        wxDataViewItemAttr attr;
+        model->GetAttr(item, column->GetModelColumn(), attr);
+        cell->SetAttr(attr);

 
 

-    SetBackgroundStyle(wxBG_STYLE_CUSTOM);
+        wxRect item_rect(x, 0, width, height);
+        item_rect.Deflate(PADDING_RIGHTLEFT, 0);

 
 

-    m_penRule = wxPen(GetRuleColour());
+        // dc.SetClippingRegion( item_rect );
+        cell->WXCallRender(item_rect, &dc, 0);
+        // dc.DestroyClippingRegion();

 
 

-    //Here I compose a pen can draw black lines, maybe there are something system colour to use
-    m_penExpander = wxPen(wxColour(0,0,0));
-    //Some new added code to deal with the tree structure
-    m_root = new wxDataViewTreeNode( NULL );
-    m_root->SetHasChildren(true);
+        x += width;
+    }

 
 

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

 }
 
 }
 

-wxDataViewMainWindow::~wxDataViewMainWindow()
-{
-    DestroyTree();
-    delete m_renameTimer;
-}
+#endif // wxUSE_DRAG_AND_DROP
+

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


@@ -2049,11 +1572,9 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     wxAutoBufferedPaintDC dc( this );
 
 #ifdef __WXMSW__
     wxAutoBufferedPaintDC dc( this );
 
 #ifdef __WXMSW__

+    dc.SetBrush(GetOwner()->GetBackgroundColour());

     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.SetPen( *wxTRANSPARENT_PEN );

-    dc.SetBrush( wxBrush( GetBackgroundColour()) );
-    dc.SetBrush( *wxWHITE_BRUSH );
-    wxSize size( GetClientSize() );
-    dc.DrawRectangle( 0,0,size.x,size.y );
+    dc.DrawRectangle(GetClientSize());

 #endif
 
     // prepare the DC
 #endif
 
     // prepare the DC


@@ -2067,16 +1588,29 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     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),
     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));
+            (int)(GetRowCount( ) - item_start));

     unsigned int item_last = item_start + item_count;
     unsigned int item_last = item_start + item_count;

+    // Get the parent of DataViewCtrl
+    wxWindow *parent = GetParent()->GetParent();
+    wxDataViewEvent cache_event(wxEVT_COMMAND_DATAVIEW_CACHE_HINT, parent->GetId());
+    cache_event.SetEventObject(GetParent());
+    cache_event.SetCache(item_start, item_last - 1);
+    parent->ProcessWindowEvent(cache_event);

 
     // compute which columns needs to be redrawn
     unsigned int cols = GetOwner()->GetColumnCount();
 
     // 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;
+    }
+

     unsigned int col_start = 0;
     unsigned int col_start = 0;

-    unsigned int x_start = 0;
+    unsigned int x_start;

     for (x_start = 0; col_start < cols; col_start++)
     {
     for (x_start = 0; col_start < cols; col_start++)
     {

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

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


@@ -2091,7 +1625,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     unsigned int x_last = x_start;
     for (; col_last < cols; col_last++)
     {
     unsigned int x_last = x_start;
     for (; col_last < cols; col_last++)
     {

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

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


@@ -2107,7 +1641,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         dc.SetPen(m_penRule);
         dc.SetBrush(*wxTRANSPARENT_BRUSH);
 
         dc.SetPen(m_penRule);
         dc.SetBrush(*wxTRANSPARENT_BRUSH);
 

-        for (unsigned int i = item_start; i <= item_last+1; i++)
+        for (unsigned int i = item_start; i <= item_last; i++)

         {
             int y = GetLineStart( i );
             dc.DrawLine(x_start, y, x_last, y);
         {
             int y = GetLineStart( i );
             dc.DrawLine(x_start, y, x_last, y);


@@ -2123,7 +1657,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         int x = x_start;
         for (unsigned int i = col_start; i < col_last; i++)
         {
         int x = x_start;
         for (unsigned int i = col_start; i < col_last; i++)
         {

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

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


@@ -2150,7 +1684,8 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             if (m_hasFocus)
                 flags |= wxCONTROL_FOCUSED;
 
             if (m_hasFocus)
                 flags |= wxCONTROL_FOCUSED;
 

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

             wxRendererNative::Get().DrawItemSelectionRect
                                 (
                                     this,
             wxRendererNative::Get().DrawItemSelectionRect
                                 (
                                     this,


@@ -2161,11 +1696,22 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         }
     }
 
         }
     }
 

+#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
+

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

-        // TODO: last column for RTL support
-        expander = GetOwner()->GetColumn( 0 );
+        // TODO-RTL: last column for RTL support
+        expander = GetOwner()->GetColumnAt( 0 );

         GetOwner()->SetExpanderColumn(expander);
     }
 
         GetOwner()->SetExpanderColumn(expander);
     }
 


@@ -2174,13 +1720,11 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     cell_rect.x = x_start;
     for (unsigned int i = col_start; i < col_last; i++)
     {
     cell_rect.x = x_start;
     for (unsigned int i = col_start; i < col_last; i++)
     {

-        cell_rect.height = GetLineHeight( i );     // -1 is for the horizontal rules (?)
-       
-        wxDataViewColumn *col = GetOwner()->GetColumn( i );
+        wxDataViewColumn *col = GetOwner()->GetColumnAt( i );

         wxDataViewRenderer *cell = col->GetRenderer();
         cell_rect.width = col->GetWidth();
 
         wxDataViewRenderer *cell = col->GetRenderer();
         cell_rect.width = col->GetWidth();
 

-        if (col->IsHidden())
+        if ( col->IsHidden() || cell_rect.width <= 0 )

             continue;       // skip it!
 
         for (unsigned int item = item_start; item < item_last; item++)
             continue;       // skip it!
 
         for (unsigned int item = item_start; item < item_last; item++)


@@ -2198,100 +1742,83 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
                 dataitem = node->GetItem();
 
 
                 dataitem = node->GetItem();
 

-                if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem))
+                if ((i > 0) && model->IsContainer(dataitem) &&
+                    !model->HasContainerColumns(dataitem))

                     continue;
             }
             else
             {
                     continue;
             }
             else
             {

-                dataitem = wxDataViewItem( (void*) item );
+                dataitem = wxDataViewItem( wxUIntToPtr(item+1) );

             }
 
             model->GetValue( value, dataitem, col->GetModelColumn());
             cell->SetValue( value );
 
             }
 
             model->GetValue( value, dataitem, col->GetModelColumn());
             cell->SetValue( value );
 

-            if (cell->GetWantsAttr())
-            {
-                wxDataViewItemAttr attr;
-                bool ret = model->GetAttr( dataitem, col->GetModelColumn(), attr );
-                if (ret)
-                    cell->SetAttr( attr );
-                cell->SetHasAttr( ret );
-            }
+            wxDataViewItemAttr attr;
+            model->GetAttr(dataitem, col->GetModelColumn(), attr);
+            cell->SetAttr(attr);

 
 

-            // update the y offset
+            // update cell_rect

             cell_rect.y = GetLineStart( item );
             cell_rect.y = GetLineStart( item );

+            cell_rect.height = GetLineHeight( item );

 
 

-            //Draw the expander here.
+            // deal with the expander

             int indent = 0;
             if ((!IsVirtualList()) && (col == expander))
             {
             int indent = 0;
             if ((!IsVirtualList()) && (col == expander))
             {

-                indent = node->GetIndentLevel();
-
-                //Calculate the indent first
-                indent = cell_rect.x + GetOwner()->GetIndent() * indent;
-
-                int expander_width = m_lineHeight - 2*EXPANDER_MARGIN;
-                // change the cell_rect.x to the appropriate pos
-                int  expander_x = indent + EXPANDER_MARGIN;
-                int expander_y = cell_rect.y + EXPANDER_MARGIN + (GetLineHeight(item) / 2) - (expander_width/2) - EXPANDER_OFFSET;
-                indent = indent + m_lineHeight ;  //try to use the m_lineHeight as the expander space
-                dc.SetPen( m_penExpander );
-                dc.SetBrush( wxNullBrush );
-                if( node->HasChildren() )
+                // Calculate the indent first
+                indent = GetOwner()->GetIndent() * node->GetIndentLevel();
+
+                // 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;
+
+                // draw expander if needed and visible
+                if ( node->HasChildren() && exp_x < cell_rect.GetRight() )

                 {
                 {

-                    wxRect rect( expander_x , expander_y, expander_width, expander_width);
+                    dc.SetPen( m_penExpander );
+                    dc.SetBrush( wxNullBrush );
+
+                    int exp_size = m_lineHeight - 2*EXPANDER_MARGIN;
+                    int exp_y = cell_rect.y + (cell_rect.height - exp_size)/2
+                                   + EXPANDER_MARGIN - EXPANDER_OFFSET;
+
+                    const wxRect rect(exp_x, exp_y, exp_size, exp_size);
+

                     int flag = 0;
                     int flag = 0;

-                    if (m_underMouse == node)
-                    {
+                    if ( m_underMouse == node )

                         flag |= wxCONTROL_CURRENT;
                         flag |= wxCONTROL_CURRENT;

-                    }
-                    if( node->IsOpen() )
-                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag|wxCONTROL_EXPANDED );
-                    else
-                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
+                    if ( node->IsOpen() )
+                        flag |= wxCONTROL_EXPANDED;
+
+                    // ensure that we don't overflow the cell (which might
+                    // happen if the column is very narrow)
+                    wxDCClipper clip(dc, cell_rect);
+
+                    wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);

                 }
                 }

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

             }
             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
             }
             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)
+                wxDELETE(node);

             }
 
             }
 

-            // cannot be bigger than allocated space
-            wxSize size = cell->GetSize();
-            // Because of the tree structure indent, here we should minus the width of the cell for drawing
-            size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent );
-            // size.y = wxMin( size.y, cell_rect.height );
-            size.y = cell_rect.height;
-
-            wxRect item_rect(cell_rect.GetTopLeft(), size);
-            int align = cell->CalculateAlignment();
-
-            // horizontal alignment:
-            item_rect.x = cell_rect.x;
-            if (align & wxALIGN_CENTER_HORIZONTAL)
-                item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2);
-            else if (align & wxALIGN_RIGHT)
-                item_rect.x = cell_rect.x + cell_rect.width - size.x;
-            //else: wxALIGN_LEFT is the default
-
-            // vertical alignment:
-            item_rect.y = cell_rect.y;
-            if (align & wxALIGN_CENTER_VERTICAL)
-                item_rect.y = cell_rect.y + (cell_rect.height / 2) - (size.y / 2);
-            else if (align & wxALIGN_BOTTOM)
-                item_rect.y = cell_rect.y + cell_rect.height - size.y;
-            //else: wxALIGN_TOP is the default
-
-            // add padding
-            item_rect.x += PADDING_RIGHTLEFT;
-            item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;
-
-            //Here we add the tree indent
+            wxRect item_rect = cell_rect;
+            item_rect.Deflate(PADDING_RIGHTLEFT, 0);
+
+            // account for the tree indent (harmless if we're not indented)

             item_rect.x += indent;
             item_rect.x += indent;

+            item_rect.width -= indent;
+
+            if ( item_rect.width <= 0 )
+                continue;

 
             int state = 0;
             if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND))
 
             int state = 0;
             if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND))


@@ -2304,9 +1831,9 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             //       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.
             //       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();
+            wxDCClipper clip(dc, item_rect);
+
+            cell->WXCallRender(item_rect, &dc, state);

         }
 
         cell_rect.x += cell_rect.width;
         }
 
         cell_rect.x += cell_rect.width;


@@ -2318,49 +1845,34 @@ 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, 
-                      GetLineStart( m_currentRow ),
-                      m_currentCol->GetWidth(), 
-                      GetLineHeight( m_currentRow ) );
-
-    GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y,
-                                     &labelRect.x, &labelRect.y);

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

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

 
 

+    wxRect labelRect = GetItemRect(item, m_currentCol);
+
+    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;
 };
 


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

-            return true ;
+            return true;

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

-            default:
-                ;
+        default:
+            ;

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


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

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

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


@@ -2403,12 +1915,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;


@@ -2416,9 +1928,11 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func )
 
 bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item)
 {
 
 bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item)
 {

-    if (!m_root)
+    if (IsVirtualList())

     {
     {

-        m_count++;
+        wxDataViewVirtualListModel *list_model =
+            (wxDataViewVirtualListModel*) GetOwner()->GetModel();
+        m_count = list_model->GetCount();

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


@@ -2456,12 +1970,16 @@ static void DestroyTreeHelper( wxDataViewTreeNode * node);
 bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
                                        const wxDataViewItem& item)
 {
 bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
                                        const wxDataViewItem& item)
 {

-    if (!m_root)
+    if (IsVirtualList())

     {
     {

-        m_count--;
+        wxDataViewVirtualListModel *list_model =
+            (wxDataViewVirtualListModel*) GetOwner()->GetModel();
+        m_count = list_model->GetCount();
+

         if( m_currentRow > GetRowCount() )
             m_currentRow = m_count - 1;
 
         if( m_currentRow > GetRowCount() )
             m_currentRow = m_count - 1;
 

+        // TODO: why empty the entire selection?

         m_selection.Empty();
 
         UpdateDisplay();
         m_selection.Empty();
 
         UpdateDisplay();


@@ -2472,11 +1990,12 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
     wxDataViewTreeNode * node = FindNode(parent);
 
     wxCHECK_MSG( node != NULL, false, "item not found" );
     wxDataViewTreeNode * node = FindNode(parent);
 
     wxCHECK_MSG( node != NULL, false, "item not found" );

-    wxCHECK_MSG( node->GetChildren().Index( item.GetID() ) != wxNOT_FOUND, false, "item not found" );
+    wxCHECK_MSG( node->GetChildren().Index( item.GetID() ) != wxNOT_FOUND,
+                 false, "item not found" );

 
     int sub = -1;
     node->GetChildren().Remove( item.GetID() );
 
     int sub = -1;
     node->GetChildren().Remove( item.GetID() );

-    //Manuplate selection
+    // Manipolate selection

     if( m_selection.GetCount() > 1 )
     {
         m_selection.Empty();
     if( m_selection.GetCount() > 1 )
     {
         m_selection.Empty();


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

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

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


@@ -2511,11 +2030,11 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
         sub -= n->GetSubTreeCount();
         ::DestroyTreeHelper(n);
     }
         sub -= n->GetSubTreeCount();
         ::DestroyTreeHelper(n);
     }

-    //Make the row number invalid and get a new valid one when user call GetRowCount
+    // Make the row number invalid and get a new valid one when user call GetRowCount

     m_count = -1;
     node->ChangeSubTreeCount(sub);
 
     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() )
         m_currentRow = m_count - 1;
 
     if( m_currentRow > GetRowCount() )
         m_currentRow = m_count - 1;
 


@@ -2529,7 +2048,7 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
     SortPrepare();
     g_model->Resort();
 
     SortPrepare();
     g_model->Resort();
 

-    //Send event
+    // Send event

     wxWindow *parent = GetParent();
     wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
     le.SetEventObject(parent);
     wxWindow *parent = GetParent();
     wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
     le.SetEventObject(parent);


@@ -2554,7 +2073,7 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
     SortPrepare();
     g_model->Resort();
 
     SortPrepare();
     g_model->Resort();
 

-    //Send event
+    // Send event

     wxWindow *parent = GetParent();
     wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
     le.SetEventObject(parent);
     wxWindow *parent = GetParent();
     wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
     le.SetEventObject(parent);


@@ -2582,6 +2101,7 @@ bool wxDataViewMainWindow::Cleared()
 void wxDataViewMainWindow::UpdateDisplay()
 {
     m_dirty = true;
 void wxDataViewMainWindow::UpdateDisplay()
 {
     m_dirty = true;

+    m_underMouse = NULL;

 }
 
 void wxDataViewMainWindow::OnInternalIdle()
 }
 
 void wxDataViewMainWindow::OnInternalIdle()


@@ -2631,12 +2151,12 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column )
     {
         wxRect rect = GetClientRect();
         int colnum = 0;
     {
         wxRect rect = GetClientRect();
         int colnum = 0;

-        int x_start = 0, x_end = 0, w = 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++)
         {
         int xx, yy, xe;
         m_owner->CalcUnscrolledPosition( rect.x, rect.y, &xx, &yy );
         for (x_start = 0; colnum < column; colnum++)
         {

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

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


@@ -2644,7 +2164,7 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column )
             x_start += w;
         }
 
             x_start += w;
         }
 

-        x_end = x_start + w;
+        int x_end = x_start + w;

         xe = xx + rect.width;
         if( x_end > xe )
         {
         xe = xx + rect.width;
         if( x_end > xe )
         {


@@ -2671,7 +2191,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();


@@ -2692,9 +2212,9 @@ unsigned int wxDataViewMainWindow::GetLastVisibleRow()
 {
     wxSize client_size = GetClientSize();
     m_owner->CalcUnscrolledPosition( client_size.x, client_size.y,
 {
     wxSize client_size = GetClientSize();
     m_owner->CalcUnscrolledPosition( client_size.x, client_size.y,

-                                     &client_size.x, &client_size.y );
+                                    &client_size.x, &client_size.y );

 
 

-    //we should deal with the pixel here
+    // we should deal with the pixel here

     unsigned int row = GetLineAt(client_size.y) - 1;
 
     return wxMin( GetRowCount()-1, row );
     unsigned int row = GetLineAt(client_size.y) - 1;
 
     return wxMin( GetRowCount()-1, row );


@@ -2866,14 +2386,14 @@ void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow )
     if (start > client_size.y) return;
 
     wxRect rect( 0, start, client_size.x, client_size.y - start );
     if (start > client_size.y) return;
 
     wxRect rect( 0, start, client_size.x, client_size.y - start );

-    
+

     Refresh( true, &rect );
 }
 
 void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event)
 {
     wxCHECK_RET( newCurrent < GetRowCount(),
     Refresh( true, &rect );
 }
 
 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())


@@ -2935,34 +2455,55 @@ wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const
 
 int wxDataViewMainWindow::GetLineStart( unsigned int row ) const
 {
 
 int wxDataViewMainWindow::GetLineStart( unsigned int row ) const
 {

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

     if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT)
     {
         // TODO make more efficient
     if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT)
     {
         // TODO make more efficient

-        
+

         int start = 0;
         int start = 0;

-        
+

         unsigned int r;
         for (r = 0; r < row; r++)
         {
         unsigned int r;
         for (r = 0; r < row; r++)
         {

-           const wxDataViewTreeNode* node = GetTreeNodeByRow(r);
-           if (!node) return start;
-           
-           unsigned int cols = GetOwner()->GetColumnCount();
-           unsigned int col;
-           int height = 0;
-           for (col = 0; col < cols; col++)
-           {
+            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!
                 const wxDataViewColumn *column = GetOwner()->GetColumn(col);
                 if (column->IsHidden())
                     continue;      // skip it!

-            
-                const wxDataViewRenderer *renderer = column->GetRenderer();
+
+                if ((col != 0) &&
+                    model->IsContainer(item) &&
+                    !model->HasContainerColumns(item))
+                    continue;      // skip it!
+
+                wxVariant value;
+                model->GetValue( value, item, column->GetModelColumn() );
+
+                wxDataViewRenderer *renderer =
+                    const_cast<wxDataViewRenderer*>(column->GetRenderer());
+                renderer->SetValue( value );

                 height = wxMax( height, renderer->GetSize().y );
                 height = wxMax( height, renderer->GetSize().y );

-           }
-           
-           start += height;
+            }
+
+            start += height;

         }
         }

-        
+

         return start;
     }
     else
         return start;
     }
     else


@@ -2973,63 +2514,87 @@ int wxDataViewMainWindow::GetLineStart( unsigned int row ) const
 
 int wxDataViewMainWindow::GetLineAt( unsigned int y ) const
 {
 
 int wxDataViewMainWindow::GetLineAt( unsigned int y ) const
 {

-    if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT)
+    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 (;;)

     {
     {

-        // TODO make more efficient
-        
-        unsigned int row = 0;
-        unsigned int yy = 0;
-        for (;;)
+        const wxDataViewTreeNode* node = GetTreeNodeByRow(row);
+        if (!node)

         {
         {

-           const wxDataViewTreeNode* node = GetTreeNodeByRow(row);
-           if (!node)
-           {
-               // not really correct...
-               return row + ((y-yy) / m_lineHeight);
-           }
-           
-           unsigned int cols = GetOwner()->GetColumnCount();
-           unsigned int col;
-           int height = 0;
-           for (col = 0; col < cols; col++)
-           {
-                const wxDataViewColumn *column = GetOwner()->GetColumn(col);
-                if (column->IsHidden())
-                    continue;      // skip it!
-            
-                const wxDataViewRenderer *renderer = column->GetRenderer();
-                height = wxMax( height, renderer->GetSize().y );
-           }
-           
-           yy += height;
-           if (y < yy)
-               return row;
-               
-           row++;
+            // not really correct...
+            return row + ((y-yy) / m_lineHeight);

         }
         }

-        
-        return -1;
-    }
-    else
-    {
-        return y / 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!
+
+            wxVariant value;
+            model->GetValue( value, item, column->GetModelColumn() );
+
+            wxDataViewRenderer *renderer =
+                const_cast<wxDataViewRenderer*>(column->GetRenderer());
+            renderer->SetValue( value );
+            height = wxMax( height, renderer->GetSize().y );
+        }
+
+        yy += height;
+        if (y < yy)
+            return row;
+
+        row++;

     }
 }
 
 int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
 {
     }
 }
 
 int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
 {

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

     if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT)
     {
         wxASSERT( !IsVirtualList() );
     if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT)
     {
         wxASSERT( !IsVirtualList() );

-        
+

         const wxDataViewTreeNode* node = GetTreeNodeByRow(row);
         // wxASSERT( node );
         if (!node) return m_lineHeight;
 
         const wxDataViewTreeNode* node = GetTreeNodeByRow(row);
         // wxASSERT( node );
         if (!node) return m_lineHeight;
 

-        wxDataViewItem item( node->GetItem() );
-        
-        int height = 0;
-        
+        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++)
         unsigned int cols = GetOwner()->GetColumnCount();
         unsigned int col;
         for (col = 0; col < cols; col++)


@@ -3037,8 +2602,18 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
             const wxDataViewColumn *column = GetOwner()->GetColumn(col);
             if (column->IsHidden())
                 continue;      // skip it!
             const wxDataViewColumn *column = GetOwner()->GetColumn(col);
             if (column->IsHidden())
                 continue;      // skip it!

-            
-            const wxDataViewRenderer *renderer = column->GetRenderer();
+
+            if ((col != 0) &&
+                model->IsContainer(item) &&
+                !model->HasContainerColumns(item))
+                continue;      // skip it!
+
+            wxVariant value;
+            model->GetValue( value, item, column->GetModelColumn() );
+
+            wxDataViewRenderer *renderer =
+                const_cast<wxDataViewRenderer*>(column->GetRenderer());
+            renderer->SetValue( value );

             height = wxMax( height, renderer->GetSize().y );
         }
 
             height = wxMax( height, renderer->GetSize().y );
         }
 


@@ -3053,15 +2628,16 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
 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;
         }
 


@@ -3072,8 +2648,10 @@ public:
         }
         else
         {
         }
         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 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;
             if( node->GetNodes().GetCount() == 0)
             {
                 int index = static_cast<int>(row) - current - 1;


@@ -3088,24 +2666,27 @@ public:
     {
         current ++;
         if( current == static_cast<int>(row))
     {
         current ++;
         if( current == static_cast<int>(row))

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

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

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

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

-    int current ;
+    int current;

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

-    if (!m_root)
+    if (IsVirtualList())

     {
     {

-        return wxDataViewItem( (void*) row );
+        return wxDataViewItem( wxUIntToPtr(row+1) );

     }
     else
     {
     }
     else
     {


@@ -3121,18 +2702,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;
         }
 


@@ -3144,29 +2725,30 @@ public:
         else
         {
             parent = node;
         else
         {
             parent = node;

-            //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 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 );
             if( node->GetNodes().GetCount() == 0)
             {
                 int index = static_cast<int>(row) - current - 1;
                 void * n = node->GetChildren().Item( index );

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

                 ret->SetItem( wxDataViewItem( n ));
                 ret->SetHasChildren(false);
                 return DoJob::OK;
             }
             return DoJob::CONT;
         }
                 ret->SetItem( wxDataViewItem( n ));
                 ret->SetHasChildren(false);
                 return DoJob::OK;
             }
             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;


@@ -3174,25 +2756,28 @@ 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() );
 wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) const
 {
     wxASSERT( !IsVirtualList() );

-    
+

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

-wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const wxDataViewItem & item )
+wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type,
+                                                         const wxDataViewItem & item )

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


@@ -3205,80 +2790,172 @@ wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const
     return le;
 }
 
     return le;
 }
 

-void wxDataViewMainWindow::OnExpanding( unsigned int row )
+bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const

 {
 {

+    if (IsVirtualList())
+        return false;
+

     wxDataViewTreeNode * node = GetTreeNodeByRow(row);
     wxDataViewTreeNode * node = GetTreeNodeByRow(row);

-    if( node != NULL )
+    if (!node)
+        return false;
+
+    if (!node->HasChildren())

     {
     {

-        if( node->HasChildren())
-        {
-            if( !node->IsOpen())
+        delete node;
+        return false;
+    }
+
+    return node->IsOpen();
+}
+
+bool wxDataViewMainWindow::HasChildren( unsigned int row ) const
+{
+    if (IsVirtualList())
+        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 (IsVirtualList())
+        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() )
+                wxDataViewEvent e =
+                    SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, node->GetItem());
+
+                // Check if the user prevent expanding
+                if( e.GetSkipped() )

                     return;
 
                     return;
 

-               node->ToggleOpen();
-               //Here I build the children of current node
-               if( node->GetChildrenNumber() == 0 )
-               {
-                   SortPrepare();
-                   ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);
-               }
-               m_count = -1;
-               UpdateDisplay();
-               //Send the expanded event
-               SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem());
-            }
-            else
-            {
-                SelectRow( row, false );
-                SelectRow( row + 1, true );
-                ChangeCurrentRow( row + 1 );
-                SendSelectionChangedEvent( GetItemByRow(row+1));
+                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);
+
+                m_count = -1;
+                UpdateDisplay();
+                // Send the expanded event
+                SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem());

             }
             }

-        }
-        else
-            delete node;
-    }

 }
 
 }
 

-void wxDataViewMainWindow::OnCollapsing(unsigned int row)
+void wxDataViewMainWindow::Collapse(unsigned int row)

 {
 {

-    wxDataViewTreeNode * node = GetTreeNodeByRow(row);
-    if( node != NULL )
+    if (IsVirtualList())
+        return;
+
+    wxDataViewTreeNode *node = GetTreeNodeByRow(row);
+    if (!node)
+        return;
+
+    if (!node->HasChildren())

     {
     {

-        wxDataViewTreeNode * nd = node;
+        delete node;
+        return;
+    }

 
 

-        if( node->HasChildren() && node->IsOpen() )
+        if (node->IsOpen())

         {
         {

-            wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem());
+            wxDataViewEvent e =
+                SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem());

             if( e.GetSkipped() )
                 return;
             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)
+            {
+                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;
+                }
+            }
+

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

-            m_count = -1;
-            UpdateDisplay();
-            SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,nd->GetItem());
-        }
-        else
-        {
-            node = node->GetParent();
-            if( node != NULL )
+
+            // 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)
+            {
+                SelectAllRows(false);
+                ChangeCurrentRow(row);
+                SelectRow(row, true);
+                SendSelectionChangedEvent(GetItemByRow(row));
+            }
+            else

             {
             {

-                int  parent = GetRowByItem( node->GetItem() ) ;
-                if( parent >= 0 )
+                // 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)

                 {
                 {

-                    SelectRow( row, false);
-                    SelectRow(parent , true );
-                    ChangeCurrentRow( parent );
-                    SendSelectionChangedEvent( node->GetItem() );
+                    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 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);

             }
             }

+
+            m_count = -1;
+            UpdateDisplay();
+            SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,node->GetItem());

         }
         }

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

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


@@ -3287,7 +2964,10 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
     if( model == NULL )
         return NULL;
 
     if( model == NULL )
         return NULL;
 

-    //Compose the a parent-chain of the finding item
+    if (!item.IsOk())
+        return m_root;
+
+    // Compose the a parent-chain of the finding item

     ItemList list;
     list.DeleteContents( true );
     wxDataViewItem it( item );
     ItemList list;
     list.DeleteContents( true );
     wxDataViewItem it( item );


@@ -3298,10 +2978,10 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
         it = model->GetParent( it );
     }
 
         it = model->GetParent( it );
     }
 

-    //Find the item along the parent-chain.
-    //This algorithm is designed to speed up the node-finding method
+    // Find the item along the parent-chain.
+    // This algorithm is designed to speed up the node-finding method

     wxDataViewTreeNode * node = m_root;
     wxDataViewTreeNode * node = m_root;

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

     {
         if( node->HasChildren() )
         {
     {
         if( node->HasChildren() )
         {


@@ -3314,14 +2994,14 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
             wxDataViewTreeNodes nodes = node->GetNodes();
             unsigned int i;
             bool found = false;
             wxDataViewTreeNodes nodes = node->GetNodes();
             unsigned int i;
             bool found = false;

-            
+

             for (i = 0; i < nodes.GetCount(); i ++)
             {
                 if (nodes[i]->GetItem() == (**iter))
                 {
                     if (nodes[i]->GetItem() == item)
             for (i = 0; i < nodes.GetCount(); i ++)
             {
                 if (nodes[i]->GetItem() == (**iter))
                 {
                     if (nodes[i]->GetItem() == item)

-                       return nodes[i];
-                       
+                    return nodes[i];
+

                     node = nodes[i];
                     found = true;
                     break;
                     node = nodes[i];
                     found = true;
                     break;


@@ -3336,17 +3016,17 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
     return NULL;
 }
 
     return NULL;
 }
 

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

 {
     wxDataViewColumn *col = NULL;
     unsigned int cols = GetOwner()->GetColumnCount();
     unsigned int colnum = 0;
 {
     wxDataViewColumn *col = NULL;
     unsigned int cols = GetOwner()->GetColumnCount();
     unsigned int colnum = 0;

-    unsigned int x_start = 0;

     int x, y;
     m_owner->CalcUnscrolledPosition( point.x, point.y, &x, &y );
     int x, y;
     m_owner->CalcUnscrolledPosition( point.x, point.y, &x, &y );

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

     {
     {

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

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


@@ -3361,35 +3041,77 @@ void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item
     item = GetItemByRow( GetLineAt( y ) );
 }
 
     item = GetItemByRow( GetLineAt( y ) );
 }
 

-wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column )
+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);
     int row = GetRowByItem(item);

-    int y = GetLineStart( row );
-    int h = GetLineHeight( m_lineHeight );
-    int x = 0;
-    wxDataViewColumn *col = NULL;
-    for( int i = 0, cols = GetOwner()->GetColumnCount(); i < cols; i ++ )
+    if (!IsVirtualList() && (column == 0 || GetOwner()->GetExpanderColumn() == column) )

     {
     {

-       col = GetOwner()->GetColumn( i );
-       x += col->GetWidth();
-       if( GetOwner()->GetColumn(i+1) == column )
-           break;
+        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;

     }
     }

-    int w = col->GetWidth();
-    m_owner->CalcScrolledPosition( x, y, &x, &y );
-    return wxRect(x, y, w, h);
+
+    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()
 {

-    if (!m_root)
+    if (IsVirtualList())

     {
     {

-        wxDataViewIndexListModel *list_model = (wxDataViewIndexListModel*) GetOwner()->GetModel();
-#ifndef __WXMAC__
-        return list_model->GetLastIndex() + 1;
-#else
-        return list_model->GetLastIndex() - 1;
-#endif
+        wxDataViewVirtualListModel *list_model =
+            (wxDataViewVirtualListModel*) GetOwner()->GetModel();
+
+        return list_model->GetCount();

     }
     else
     {
     }
     else
     {


@@ -3400,29 +3122,32 @@ int wxDataViewMainWindow::RecalculateCount()
 class ItemToRowJob : public DoJob
 {
 public:
 class ItemToRowJob : public DoJob
 {
 public:

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

 
 

-    //Maybe binary search will help to speed up this process
+    // 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( node->GetItem() == **m_iter )
-         {
-             m_iter++ ;
-             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;
+        }

 
     }
 
 
     }
 


@@ -3433,8 +3158,11 @@ 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:
     ItemList::const_iterator  m_iter;
     wxDataViewItem item;
 private:
     ItemList::const_iterator  m_iter;
     wxDataViewItem item;


@@ -3448,18 +3176,18 @@ int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) const
     if( model == NULL )
         return -1;
 
     if( model == NULL )
         return -1;
 

-    if (!m_root)
+    if (IsVirtualList())

     {
     {

-        return wxPtrToUInt( item.GetID() );
+        return wxPtrToUInt( item.GetID() ) -1;

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

-        //Compose the a parent-chain of the finding item
+        // Compose the a parent-chain of the finding item

         ItemList list;
         ItemList list;

-        wxDataViewItem * pItem = NULL;
+        wxDataViewItem * pItem;

         list.DeleteContents( true );
         wxDataViewItem it( item );
         while( it.IsOk() )
         list.DeleteContents( true );
         wxDataViewItem it( item );
         while( it.IsOk() )


@@ -3477,13 +3205,15 @@ int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) const
     }
 }
 
     }
 }
 

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

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

-        return ;
+        return;

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

+

     unsigned int index = 0;
     while( index < num )
     {
     unsigned int index = 0;
     while( index < num )
     {


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

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

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


@@ -3513,18 +3243,18 @@ void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
 
     if (GetOwner()->GetModel()->IsVirtualListModel())
     {
 
     if (GetOwner()->GetModel()->IsVirtualListModel())
     {

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

         return;
     }
 
     m_root = new wxDataViewTreeNode( NULL );
     m_root->SetHasChildren(true);
 
         return;
     }
 
     m_root = new wxDataViewTreeNode( NULL );
     m_root->SetHasChildren(true);
 

-    //First we define a invalid item to fetch the top-level elements
+    // First we define a invalid item to fetch the top-level elements

     wxDataViewItem item;
     SortPrepare();
     BuildTreeHelper( model, item, m_root);
     wxDataViewItem item;
     SortPrepare();
     BuildTreeHelper( model, item, m_root);

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

 }
 
 static void DestroyTreeHelper( wxDataViewTreeNode * node )
 }
 
 static void DestroyTreeHelper( wxDataViewTreeNode * node )


@@ -3532,12 +3262,9 @@ 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();
         wxDataViewTreeNodes& nodes = node->GetNodes();

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

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

-        }

     }
     delete node;
 }
     }
     delete node;
 }


@@ -3546,15 +3273,23 @@ void wxDataViewMainWindow::DestroyTree()
 {
     if (!IsVirtualList())
     {
 {
     if (!IsVirtualList())
     {

-       ::DestroyTreeHelper(m_root);
-        m_count = 0;
-        m_root = NULL;
+        ::DestroyTreeHelper(m_root);
+            m_count = 0;
+            m_root = NULL;

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

-    if ( HandleAsNavigationKey(event) )
+    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
         return;
 
     // no item -> nothing to do


@@ -3566,16 +3301,14 @@ 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() )
     {
         case WXK_RETURN:
 
     switch ( event.GetKeyCode() )
     {
         case WXK_RETURN:

-        {
-            if (m_currentRow > 0)

             {
             {

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

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


@@ -3583,7 +3316,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
                 parent->GetEventHandler()->ProcessEvent(le);
             }
             break;
                 parent->GetEventHandler()->ProcessEvent(le);
             }
             break;

-        }
+

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


@@ -3593,18 +3326,64 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
             if ( m_currentRow < GetRowCount() - 1 )
                 OnArrowChar( m_currentRow + 1, event );
             break;
             if ( m_currentRow < GetRowCount() - 1 )
                 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 (IsVirtualList())
+               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 );


@@ -3633,6 +3412,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();
     }


@@ -3657,7 +3446,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!
 


@@ -3673,14 +3462,14 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
     wxDataViewRenderer *cell = col->GetRenderer();
     unsigned int current = GetLineAt( y );
 
     wxDataViewRenderer *cell = col->GetRenderer();
     unsigned int current = GetLineAt( y );

-    if ((current > GetRowCount()) || (x > GetEndOfLastCol()))
+    if ((current >= GetRowCount()) || (x > GetEndOfLastCol()))

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

-    //Test whether the mouse is hovered on the tree item button
-    bool hover = false;
+    // Test whether the mouse is hovered on the tree item button
+    bool hoverOverExpander = false;

     if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col))
     {
         wxDataViewTreeNode * node = GetTreeNodeByRow(current);
     if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col))
     {
         wxDataViewTreeNode * node = GetTreeNodeByRow(current);


@@ -3688,22 +3477,24 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         {
             int indent = node->GetIndentLevel();
             indent = GetOwner()->GetIndent()*indent;
         {
             int indent = node->GetIndentLevel();
             indent = GetOwner()->GetIndent()*indent;

-            wxRect rect( xpos + indent + EXPANDER_MARGIN, 
-                         GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET,
-                         m_lineHeight-2*EXPANDER_MARGIN,
-                         m_lineHeight-2*EXPANDER_MARGIN);
-            if( rect.Contains( x, y) )
+
+            // 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
-                hover = true;
+                // So the mouse is over the expander
+                hoverOverExpander = true;

                 if (m_underMouse && m_underMouse != node)
                 {
                 if (m_underMouse && m_underMouse != node)
                 {

-                    //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
+                    // wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));

                     RefreshRow(GetRowByItem(m_underMouse->GetItem()));
                 }
                 if (m_underMouse != node)
                 {
                     RefreshRow(GetRowByItem(m_underMouse->GetItem()));
                 }
                 if (m_underMouse != node)
                 {

-                    //wxLogMessage("Do the row: %d", current);
+                    // wxLogMessage("Do the row: %d", current);

                     RefreshRow(current);
                 }
                 m_underMouse = node;
                     RefreshRow(current);
                 }
                 m_underMouse = node;


@@ -3712,11 +3503,11 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         if (node!=NULL && !node->HasChildren())
             delete node;
     }
         if (node!=NULL && !node->HasChildren())
             delete node;
     }

-    if (!hover)
+    if (!hoverOverExpander)

     {
         if (m_underMouse != NULL)
         {
     {
         if (m_underMouse != NULL)
         {

-            //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
+            // wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));

             RefreshRow(GetRowByItem(m_underMouse->GetItem()));
             m_underMouse = NULL;
         }
             RefreshRow(GetRowByItem(m_underMouse->GetItem()));
             m_underMouse = NULL;
         }


@@ -3724,6 +3515,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
     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)


@@ -3741,7 +3533,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;
     }


@@ -3749,8 +3564,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())
     {


@@ -3761,22 +3577,35 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     wxDataViewItem item = GetItemByRow(current);
     bool ignore_other_columns =
         ((GetOwner()->GetExpanderColumn() != col) &&
     wxDataViewItem item = GetItemByRow(current);
     bool ignore_other_columns =
         ((GetOwner()->GetExpanderColumn() != col) &&

-         (model->IsContainer(item)) &&
-         (!model->HasContainerColumns(item)));
+        (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 ((!ignore_other_columns) && (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE))
             {
         {
             if ((!ignore_other_columns) && (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE))
             {

+                const unsigned colIdx = col->GetModelColumn();
+

                 wxVariant value;
                 wxVariant value;

-                model->GetValue( value, item, col->GetModelColumn() );
-                cell->SetValue( value );
-                wxRect cell_rect( xpos, GetLineStart( current ),
-                                  col->GetWidth(), GetLineHeight( current ) );
-                cell->Activate( cell_rect, model, item, col->GetModelColumn() );
+                model->GetValue( value, item, colIdx );
+
+                cell->WXOnActivate(model, value, item, colIdx);

 
 

+                if ( wxDataViewCustomRenderer *custom = cell->WXGetAsCustom() )
+                {
+                    cell->SetValue( value );
+
+                    wxRect cell_rect( xpos, GetLineStart( current ),
+                                    col->GetWidth(), GetLineHeight( current ) );
+                    custom->Activate( cell_rect, model, item, colIdx );
+                }

             }
             else
             {
             }
             else
             {


@@ -3794,47 +3623,23 @@ 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;
-        if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col))
-        {
-            wxDataViewTreeNode * node = GetTreeNodeByRow(current);
-            if( node!=NULL && node->HasChildren() )
-            {
-                int indent = node->GetIndentLevel();
-                indent = GetOwner()->GetIndent()*indent;
-                wxRect rect( xpos + indent + EXPANDER_MARGIN, 
-                         GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET,
-                         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 (node && !node->HasChildren())
-               delete node;
-        }
-        //If the user click the expander, we do not do editing even if the column with expander are editable
-        if (m_lastOnSame && !expander && !ignore_other_columns)
+        // 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) &&
                 (cell->GetMode() & wxDATAVIEW_CELL_EDITABLE) )
         {
             if ((col == m_currentCol) && (current == m_currentRow) &&
                 (cell->GetMode() & wxDATAVIEW_CELL_EDITABLE) )


@@ -3846,7 +3651,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


@@ -3869,7 +3674,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             SelectRow(m_currentRow,true);
             SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );
         }
             SelectRow(m_currentRow,true);
             SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );
         }

-
+    }
+    else if (event.RightUp())
+    {

         wxVariant value;
         model->GetValue( value, item, col->GetModelColumn() );
         wxWindow *parent = GetParent();
         wxVariant value;
         model->GetValue( value, item, col->GetModelColumn() );
         wxWindow *parent = GetParent();


@@ -3883,7 +3690,20 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     else if (event.MiddleDown())
     {
     }
     else if (event.MiddleDown())
     {
     }

-    if (event.LeftDown() || forceClick)
+
+    if((event.LeftDown() || simulateClick) && hoverOverExpander)
+    {
+        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)

     {
         SetFocus();
 
     {
         SetFocus();
 


@@ -3915,14 +3735,14 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             {
                 ChangeCurrentRow(current);
                 ReverseRowSelection(m_currentRow);
             {
                 ChangeCurrentRow(current);
                 ReverseRowSelection(m_currentRow);

-                SendSelectionChangedEvent(GetItemByRow(m_selection[0]) );
+                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 )
                 {


@@ -3936,10 +3756,10 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             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?") );

             }
         }
             }
         }

-        
+

         if (m_currentRow != oldCurrentRow)
             RefreshRow( oldCurrentRow );
 
         if (m_currentRow != oldCurrentRow)
             RefreshRow( oldCurrentRow );
 


@@ -3948,19 +3768,23 @@ 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;
 
         // Call LeftClick after everything else as under GTK+
         if (cell->GetMode() & wxDATAVIEW_CELL_ACTIVATABLE)
         {
                         (current == oldCurrentRow)) && oldWasSelected;
 
         // Call LeftClick after everything else as under GTK+
         if (cell->GetMode() & wxDATAVIEW_CELL_ACTIVATABLE)
         {

-            // notify cell about right click
-            wxVariant value;
-            model->GetValue( value, item, col->GetModelColumn() );
-            cell->SetValue( value );
-            wxRect cell_rect( xpos, GetLineStart( current ),
-                          col->GetWidth(), GetLineHeight( current ) );
-            /* ignore ret */ cell->LeftClick( event.GetPosition(), cell_rect, model, item, col->GetModelColumn());
+            if ( wxDataViewCustomRenderer *custom = cell->WXGetAsCustom() )
+            {
+                // notify cell about click
+                wxVariant value;
+                model->GetValue( value, item, col->GetModelColumn() );
+                custom->SetValue( value );
+                wxRect cell_rect( xpos, GetLineStart( current ),
+                                  col->GetWidth(), GetLineHeight( current ) );
+                 /* ignore ret */ custom->LeftClick( event.GetPosition(), cell_rect,
+                                  model, item, col->GetModelColumn());
+            }

         }
     }
 }
         }
     }
 }


@@ -3996,10 +3820,10 @@ wxDataViewItem wxDataViewMainWindow::GetSelection() const
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------

+

 WX_DEFINE_LIST(wxDataViewColumnList)
 
 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()


@@ -4009,43 +3833,50 @@ wxDataViewCtrl::~wxDataViewCtrl()
     if (m_notifier)
         GetModel()->RemoveNotifier( m_notifier );
 
     if (m_notifier)
         GetModel()->RemoveNotifier( m_notifier );
 

-    wxDataViewColumnList::const_iterator iter;
-    for (iter = m_cols.begin(); iter!=m_cols.end(); iter++)
-    {
-        delete *iter;
-    }
+    m_cols.Clear();

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

+    m_cols.DeleteContents(true);

     m_notifier = NULL;
     m_notifier = NULL;

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

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

-           const wxPoint& pos, const wxSize& size,
-           long style, const wxValidator& validator )
+                            const wxPoint& pos, const wxSize& size,
+                            long style, const wxValidator& validator )

 {
 {

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

     if (!wxControl::Create( parent, id, pos, size,
                             style | wxScrolledWindowStyle, validator))
         return false;
 
     SetInitialSize(size);
 
     if (!wxControl::Create( parent, id, pos, size,
                             style | wxScrolledWindowStyle, validator))
         return false;
 
     SetInitialSize(size);
 

-    Init();
-

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


@@ -4058,10 +3889,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);
 


@@ -4077,6 +3913,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


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

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

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


@@ -4109,13 +3960,27 @@ 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;
 
     m_cols.Append( col );
 bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
 {
     if (!wxDataViewCtrlBase::AppendColumn(col))
         return false;
 
     m_cols.Append( col );

-    OnColumnChange();
+    OnColumnsCountChanged();

     return true;
 }
 
     return true;
 }
 


@@ -4125,14 +3990,32 @@ bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
         return false;
 
     m_cols.Insert( col );
         return false;
 
     m_cols.Insert( col );

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

     return true;
 }
 
     return true;
 }
 

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

 {
     if (m_headerArea)
 {
     if (m_headerArea)

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

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


@@ -4152,76 +4035,101 @@ unsigned int wxDataViewCtrl::GetColumnCount() const
     return m_cols.GetCount();
 }
 
     return m_cols.GetCount();
 }
 

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

 {
 {

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

 
 

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

 }
 
 }
 

-void wxDataViewCtrl::ColumnMoved( wxDataViewColumn* col, unsigned int new_pos )
+int wxDataViewCtrl::GetColumnIndex(const wxDataViewColumn *column) const

 {
 {

-    if (new_pos > m_cols.GetCount()) return;
-    m_cols.DeleteObject( col );
-    m_cols.Insert( new_pos, col );
+    const unsigned count = m_cols.size();
+    for ( unsigned n = 0; n < count; n++ )
+    {
+        if ( m_cols[n] == column )
+            return n;
+    }
+
+    return wxNOT_FOUND;
+}

 
 

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

     m_clientArea->UpdateDisplay();
 }
 
 bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
 {
     m_clientArea->UpdateDisplay();
 }
 
 bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
 {

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

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

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

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

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

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

-    int ret = 0, dead = 0;
-    int len = GetColumnCount();
-    for (int i=0; i<len; i++)
+#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 = GetColumn(i);
+        wxDataViewColumn * col = GetColumnAt(i);

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

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

             break;
         }
     }
     return ret;
             break;
         }
     }
     return ret;

+#endif

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

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

 }
 
 }
 

-//Selection code with wxDataViewItem as parameters
+// Selection code with wxDataViewItem as parameters

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


@@ -4242,26 +4150,45 @@ int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const
 
 void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
 {
 
 void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
 {

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

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

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

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

+

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

+    ExpandAncestors( item );
+

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

-        //Unselect all rows before select another in the single select mode
+        // Unselect all rows before select another in the single select mode

         if (m_clientArea->IsSingleSel())
             m_clientArea->SelectAllRows(false);
         if (m_clientArea->IsSingleSel())
             m_clientArea->SelectAllRows(false);

+            

         m_clientArea->SelectRow(row, true);
         m_clientArea->SelectRow(row, true);

+        
+        // Also set focus to the selected item
+        m_clientArea->ChangeCurrentRow( row );

     }
 }
 
     }
 }
 


@@ -4282,7 +4209,7 @@ bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const
     return false;
 }
 
     return false;
 }
 

-//Selection code with row number as parameter
+// Selection code with row number as parameter

 int wxDataViewCtrl::GetSelections( wxArrayInt & sel ) const
 {
     sel.Empty();
 int wxDataViewCtrl::GetSelections( wxArrayInt & sel ) const
 {
     sel.Empty();


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

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

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


@@ -4378,33 +4305,29 @@ void wxDataViewCtrl::EnsureVisible( int row, int column )
 
 void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn * column )
 {
 
 void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn * column )
 {

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

     int row = m_clientArea->GetRowByItem(item);
     if( row >= 0 )
     {
         if( column == NULL )
             EnsureVisible(row, -1);
         else
     int row = m_clientArea->GetRowByItem(item);
     if( row >= 0 )
     {
         if( column == NULL )
             EnsureVisible(row, -1);
         else

-        {
-            int col = 0;
-            int len = GetColumnCount();
-            for( int i = 0; i < len; i ++ )
-                if( GetColumn(i) == column )
-                {
-                    col = i;
-                    break;
-                }
-            EnsureVisible( row, col );
-        }
+            EnsureVisible( row, GetColumnIndex(column) );

     }
 
 }
 
     }
 
 }
 

-void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ) const
+void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item,
+                              wxDataViewColumn* &column ) const

 {
     m_clientArea->HitTest(point, item, column);
 }
 
 {
     m_clientArea->HitTest(point, item, column);
 }
 

-wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column ) const
+wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem & item,
+                                    const wxDataViewColumn* column ) const

 {
     return m_clientArea->GetItemRect(item, column);
 }
 {
     return m_clientArea->GetItemRect(item, column);
 }


@@ -4433,8 +4356,25 @@ void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
         m_clientArea->Collapse(row);
 }
 
         m_clientArea->Collapse(row);
 }
 

- #endif
-    // !wxUSE_GENERICDATAVIEWCTRL
+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();
+    renderer->StartEditing(item, itemRect);
+}
+
+#endif // !wxUSE_GENERICDATAVIEWCTRL

 
 

-#endif
-    // wxUSE_DATAVIEWCTRL
+#endif // wxUSE_DATAVIEWCTRL