]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/datavgen.cpp
no real change; just add the standard separator where it's missing
[wxWidgets.git] / src / generic / datavgen.cpp
index 44eef8c70e70d2412640f42d15b1d8cfa5f275e0..afe948e080c3b983d31a686f16ea4f15a3bb177c 100644 (file)
@@ -34,6 +34,7 @@
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/dcscreen.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/stockitem.h"
@@ -45,6 +46,8 @@
 #include "wx/list.h"
 #include "wx/listimpl.cpp"
 #include "wx/imaglist.h"
+#include "wx/headerctrl.h"
+#include "wx/dnd.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -66,201 +69,144 @@ static const int EXPANDER_OFFSET = 4;
 static const int EXPANDER_OFFSET = 1;
 #endif
 
+// Below is the compare stuff.
+// For the generic implementation, both the leaf nodes and the nodes are sorted for
+// fast search when needed
+static wxDataViewModel* g_model;
+static int g_column = -2;
+static bool g_asending = true;
+
 //-----------------------------------------------------------------------------
 // wxDataViewHeaderWindow
 //-----------------------------------------------------------------------------
 
-// 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;
-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
+class wxDataViewHeaderWindow : public wxHeaderCtrl
 {
 public:
-    wxDataViewHeaderWindowBase()
-        { m_owner = NULL; }
-
-    bool Create(wxDataViewCtrl *parent, wxWindowID id,
-                const wxPoint &pos, const wxSize &size,
-                const wxString &name)
+    wxDataViewHeaderWindow(wxDataViewCtrl *parent)
+        : wxHeaderCtrl(parent)
     {
-        return wxWindow::Create(parent, id, pos, size, wxNO_BORDER, name);
     }
 
-    void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; }
-    wxDataViewCtrl *GetOwner() { return m_owner; }
-
-    // called on column addition/removal
-    virtual void UpdateDisplay() { /* by default, do nothing */ }
-
-    // returns the n-th column
-    virtual wxDataViewColumn *GetColumn(unsigned int n)
-    {
-        wxASSERT(m_owner);
-        wxDataViewColumn *ret = m_owner->GetColumn(n);
-        wxASSERT(ret);
-
-        return ret;
-    }
+    wxDataViewCtrl *GetOwner() const
+        { return static_cast<wxDataViewCtrl *>(GetParent()); }
 
 protected:
-    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
-
-class wxDataViewHeaderWindowMSW : public wxDataViewHeaderWindowBase
-{
-public:
-
-    wxDataViewHeaderWindowMSW( wxDataViewCtrl *parent,
-                               wxWindowID id,
-                               const wxPoint &pos = wxDefaultPosition,
-                               const wxSize &size = wxDefaultSize,
-                               const wxString &name = wxT("wxdataviewctrlheaderwindow") )
+    // implement/override wxHeaderCtrl functions by forwarding them to the main
+    // control
+    virtual const wxHeaderColumn& GetColumn(unsigned int idx) const
     {
-        Create(parent, id, pos, size, name);
+        return *(GetOwner()->GetColumn(idx));
     }
 
-    bool Create(wxDataViewCtrl *parent, wxWindowID id,
-                const wxPoint &pos, const wxSize &size,
-                const wxString &name);
-
-    ~wxDataViewHeaderWindowMSW();
-
-    // called when any column setting is changed and/or changed
-    // the column count
-    virtual void UpdateDisplay();
-
-    virtual void OnInternalIdle();
-
-    // called Refresh afterwards
-    virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL);
-
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-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;
-
-    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_vetoColumnDrag;
-    bool         m_delayedUpdate;
-    wxImageList *m_imageList;
+        return true;
+    }
 
 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()
+    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
@@ -279,11 +225,13 @@ public:
 //-----------------------------------------------------------------------------
 // wxDataViewTreeNode
 //-----------------------------------------------------------------------------
+
 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
@@ -403,7 +351,8 @@ private:
     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 );
 }
@@ -414,7 +363,6 @@ int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2)
 }
 
 
-
 //-----------------------------------------------------------------------------
 // wxDataViewMainWindow
 //-----------------------------------------------------------------------------
@@ -474,6 +422,9 @@ public:
     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 );
@@ -499,13 +450,17 @@ public:
     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 GetRowCount();
 
     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 );
@@ -530,28 +485,40 @@ public:
     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;
 
-    //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 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;
-    //We did not need this temporarily
-    //wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item );
+    // We did not need this temporarily
+    // wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item );
 
     int RecalculateCount();
 
     wxDataViewEvent SendExpanderEvent( wxEventType type, const wxDataViewItem & item );
-    void OnExpanding( unsigned int row );
-    void OnCollapsing( unsigned int row );
 
     wxDataViewTreeNode * FindNode( const wxDataViewItem & item );
 
@@ -569,13 +536,23 @@ private:
 
     bool                        m_hasFocus;
 
+#if wxUSE_DRAG_AND_DROP
     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,
-           m_lineBeforeLastClicked,
-           m_lineSelectSingleOnUp;
+        m_lineBeforeLastClicked,
+        m_lineSelectSingleOnUp;
 
     // the pen used to draw horiz/vertical rules
     wxPen m_penRule;
@@ -583,11 +560,13 @@ private:
     // 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;
-    //This is the tree node under the cursor
+
+    // This is the tree node under the cursor
     wxDataViewTreeNode * m_underMouse;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow)
     DECLARE_EVENT_TABLE()
@@ -614,7 +593,7 @@ public:
     virtual bool Cleared()
         { return m_mainWindow->Cleared(); }
     virtual void Resort()
-         { m_mainWindow->Resort(); }
+        { m_mainWindow->Resort(); }
 
     wxDataViewMainWindow    *m_mainWindow;
 };
@@ -672,7 +651,7 @@ int wxDataViewRenderer::CalculateAlignment() const
     if (m_align == wxDVR_DEFAULT_ALIGNMENT)
     {
         if (GetOwner() == NULL)
-           return wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL;
+        return wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL;
 
         return GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL;
     }
@@ -687,19 +666,22 @@ int wxDataViewRenderer::CalculateAlignment() const
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
 
 wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
-                          wxDataViewCellMode mode, int align ) :
+                        wxDataViewCellMode mode, int align ) :
     wxDataViewRenderer( varianttype, mode, align )
 {
 }
 
-void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, wxRect cell, wxDC *dc, int state )
+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));
+    dc->DrawText( text,
+                  cell.x + xoffset,
+                  cell.y + ((cell.height - dc->GetCharHeight()) / 2));
 }
 
 // ---------------------------------------------------------
@@ -726,7 +708,7 @@ bool wxDataViewTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const
     return false;
 }
 
-bool wxDataViewTextRenderer::HasEditorCtrl()
+bool wxDataViewTextRenderer::HasEditorCtrl() const
 {
     return true;
 }
@@ -735,8 +717,8 @@ 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) );
+                        wxPoint(labelRect.x,labelRect.y),
+                        wxSize(labelRect.width,labelRect.height) );
 }
 
 bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant &value )
@@ -756,12 +738,8 @@ wxSize wxDataViewTextRenderer::GetSize() const
 {
     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);
+        return view->wxWindowBase::GetTextExtent( m_text );
+    return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE);
 }
 
 // ---------------------------------------------------------
@@ -792,13 +770,13 @@ bool wxDataViewTextRendererAttr::Render( wxRect cell, wxDC *dc, int WXUNUSED(sta
 
         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 );
+            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 );
         }
     }
 
@@ -862,7 +840,7 @@ wxSize wxDataViewBitmapRenderer::GetSize() const
     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);
 }
 
 // ---------------------------------------------------------
@@ -892,14 +870,6 @@ bool wxDataViewToggleRenderer::GetValue( wxVariant &WXUNUSED(value) ) const
 
 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;
@@ -909,15 +879,15 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state
     wxRendererNative::Get().DrawCheckBox(
             GetOwner()->GetOwner(),
             *dc,
-            rect,
+            cell,
             flags );
 
     return true;
 }
 
 bool wxDataViewToggleRenderer::Activate( wxRect WXUNUSED(cell),
-                                         wxDataViewModel *model,
-                                         const wxDataViewItem & item, unsigned int col)
+                                        wxDataViewModel *model,
+                                        const wxDataViewItem & item, unsigned int col)
 {
     bool value = !m_toggle;
     wxVariant variant = value;
@@ -928,7 +898,9 @@ bool wxDataViewToggleRenderer::Activate( wxRect WXUNUSED(cell),
 
 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);
 }
 
 // ---------------------------------------------------------
@@ -1080,7 +1052,7 @@ wxSize wxDataViewDateRenderer::GetSize() const
 }
 
 bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *model,
-                                       const wxDataViewItem & item, unsigned int col )
+                                    const wxDataViewItem & item, unsigned int col )
 {
     wxVariant variant;
     model->GetValue( variant, item, col );
@@ -1106,7 +1078,7 @@ bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *m
 IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer)
 
 wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(
-  const wxString &varianttype, wxDataViewCellMode mode, int align ) :
+const wxString &varianttype, wxDataViewCellMode mode, int align ) :
     wxDataViewCustomRenderer( varianttype, mode, align )
 {
     SetMode(mode);
@@ -1136,844 +1108,182 @@ bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state )
     {
         dc->DrawIcon( icon, cell.x, cell.y + ((cell.height - icon.GetHeight()) / 2));
         xoffset =  icon.GetWidth()+4;
-    }
-
-    RenderText( m_value.GetText(), xoffset, cell, dc, state );
-
-    return true;
-}
-
-wxSize wxDataViewIconTextRenderer::GetSize() const
-{
-    const wxDataViewCtrl *view = GetView();
-    if (!m_value.GetText().empty())
-    {
-        int x,y;
-        view->GetTextExtent( m_value.GetText(), &x, &y );
-
-        if (m_value.GetIcon().IsOk())
-            x += m_value.GetIcon().GetWidth() + 4;
-        return wxSize( x, y );
-    }
-    return wxSize(80,20);
-}
-
-wxControl *
-wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow * WXUNUSED(parent),
-                                             wxRect WXUNUSED(labelRect),
-                                             const wxVariant& WXUNUSED(value))
-{
-    return NULL;
-}
-
-bool
-wxDataViewIconTextRenderer::GetValueFromEditorCtrl(wxControl* WXUNUSED(editor),
-                                                   wxVariant& WXUNUSED(value))
-{
-    return false;
-}
-
-// ---------------------------------------------------------
-// wxDataViewColumn
-// ---------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
-
-wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell,
-                                    unsigned int model_column,
-                                    int width, wxAlignment align, int flags ) :
-    wxDataViewColumnBase( title, cell, model_column, width, align, flags )
-{
-    SetAlignment(align);
-    SetTitle(title);
-    SetFlags(flags);
-
-    m_autosize = width < 0;  // TODO
-
-    Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width);
-}
-
-wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell,
-                                    unsigned int model_column,
-                                    int width, wxAlignment align, int flags ) :
-    wxDataViewColumnBase( bitmap, cell, model_column, width, align, flags )
-{
-    SetAlignment(align);
-    SetFlags(flags);
-
-    Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width);
-}
-
-wxDataViewColumn::~wxDataViewColumn()
-{
-}
-
-void wxDataViewColumn::Init( int width )
-{
-    m_width = width;
-    m_minWidth = wxDVC_DEFAULT_MINWIDTH;
-    m_ascending = true;
-}
-
-void wxDataViewColumn::SetResizeable( bool resizeable )
-{
-    if (resizeable)
-        m_flags |= wxDATAVIEW_COL_RESIZABLE;
-    else
-        m_flags &= ~wxDATAVIEW_COL_RESIZABLE;
-}
-
-void wxDataViewColumn::SetHidden( bool hidden )
-{
-    if (hidden)
-        m_flags |= wxDATAVIEW_COL_HIDDEN;
-    else
-        m_flags &= ~wxDATAVIEW_COL_HIDDEN;
-
-    // tell our owner to e.g. update its scrollbars:
-    if (GetOwner())
-        GetOwner()->OnColumnChange();
-}
-
-void wxDataViewColumn::SetSortable( bool sortable )
-{
-    if (sortable)
-        m_flags |= wxDATAVIEW_COL_SORTABLE;
-    else
-        m_flags &= ~wxDATAVIEW_COL_SORTABLE;
-
-    // Update header button
-    if (GetOwner())
-        GetOwner()->OnColumnChange();
-}
-
-void wxDataViewColumn::SetReorderable( bool reorderable )
-{
-    if (reorderable)
-        m_flags |= wxDATAVIEW_COL_REORDERABLE;
-    else
-        m_flags &= ~wxDATAVIEW_COL_REORDERABLE;
-}
-
-void wxDataViewColumn::SetSortOrder( bool ascending )
-{
-    m_ascending = ascending;
-
-    // Update header button
-    if (GetOwner())
-        GetOwner()->OnColumnChange();
-}
-
-bool wxDataViewColumn::IsSortOrderAscending() const
-{
-    return m_ascending;
-}
-
-void wxDataViewColumn::SetInternalWidth( int width )
-{
-    m_width = width;
-
-    // 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 )
-{
-    if (m_owner->m_headerArea) m_owner->m_headerArea->UpdateDisplay();
-
-    SetInternalWidth(width);
-}
-
-
-//-----------------------------------------------------------------------------
-// wxDataViewHeaderWindowBase
-//-----------------------------------------------------------------------------
-
-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);
-}
-
-#ifdef USE_NATIVE_HEADER_WINDOW
-
-#ifndef HDS_DRAGDROP
-    #define HDS_DRAGDROP 0x0040
-#endif
-#ifndef HDS_FULLDRAG
-    #define HDS_FULLDRAG 0x0080
-#endif
-
-// implemented in msw/listctrl.cpp:
-int WXDLLIMPEXP_CORE wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick);
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewHeaderWindowMSW, wxWindow)
-
-bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id,
-                                        const wxPoint &pos, const wxSize &size,
-                                        const wxString &name )
-{
-    m_owner = parent;
-
-    m_scrollOffsetX = 0;
-    m_delayedUpdate = false;
-    m_vetoColumnDrag = 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 );
-    (void)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;
-}
-
-wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow()
-{
-    delete m_imageList;
-    UnsubclassWin();
-}
-
-wxSize wxDataViewHeaderWindowMSW::DoGetBestSize() const
-{
-    return wxSize( 80, m_buttonHeight+2 );
-}
-
-void wxDataViewHeaderWindowMSW::OnInternalIdle()
-{
-    if (m_delayedUpdate)
-    {
-        m_delayedUpdate = false;
-        UpdateDisplay();
-    }
-}
-
-void wxDataViewHeaderWindowMSW::UpdateDisplay()
-{
-    // remove old columns
-    for (int j=0, max=Header_GetItemCount((HWND)m_hWnd); j < max; j++)
-        Header_DeleteItem((HWND)m_hWnd, 0);
-
-    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!
-
-        wxString title( col->GetTitle() );
-        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 *) title.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++;
-    }
-}
-
-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;
-    }
-
-    HDITEM item;
-    item.mask = HDI_LPARAM;
-    Header_GetItem((HWND)m_hWnd, nmHDR->iItem, &item);
-
-    return (unsigned int)item.lParam;
-}
-
-bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
-{
-    NMHDR *nmhdr = (NMHDR *)lParam;
-
-    // is it a message from the header?
-    if ( nmhdr->hwndFrom != (HWND)m_hWnd )
-        return wxWindow::MSWOnNotify(idCtrl, lParam, result);
-
-    NMHEADER *nmHDR = (NMHEADER *)nmhdr;
-    switch ( nmhdr->code )
-    {
-        case NM_RELEASEDCAPTURE:
-            {
-                // user has released the mouse
-                m_vetoColumnDrag = false;
-            }
-            break;
-
-        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:
-            // valid column
-            if (nmHDR->iItem != -1)
-            {
-                // user has started to reorder a valid column
-                if ((m_vetoColumnDrag == true) || (!GetColumn(nmHDR->iItem)->IsReorderable()))
-                {
-                    // veto it!
-                    *result = TRUE;
-                    m_vetoColumnDrag = true;
-                }
-            }
-            else
-            {
-                // veto it!
-                m_vetoColumnDrag = 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);
-
-                // see UpdateDisplay() for more info about COLUMN_WIDTH_OFFSET
-                if (idx == 0 && w > COLUMN_WIDTH_OFFSET)
-                    w -= COLUMN_WIDTH_OFFSET;
-
-                if (w >= (unsigned)col->GetMinWidth())
-                    col->SetInternalWidth(w);
-            }
-            break;
-
-        case HDN_ITEMCLICK:
-            {
-                unsigned int idx = GetColumnIdxFromHeader(nmHDR);
-                wxDataViewModel * model = GetOwner()->GetModel();
-
-                if(nmHDR->iButton == 0)
-                {
-                    wxDataViewColumn *col = GetColumn(idx);
-                    if(col->IsSortable())
-                    {
-                        if(model && m_owner->GetSortingColumn() == col)
-                        {
-                            bool order = col->IsSortOrderAscending();
-                            col->SetSortOrder(!order);
-                        }
-                        else if(model)
-                        {
-                            m_owner->SetSortingColumn(col);
-                        }
-                    }
-                    UpdateDisplay();
-                    if(model)
-                        model->Resort();
-                }
-
-                wxEventType evt = nmHDR->iButton == 0 ?
-                        wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK :
-                        wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK;
-                SendEvent(evt, idx);
-            }
-            break;
-
-        case NM_RCLICK:
-            {
-                // NOTE: for some reason (i.e. for a bug in Windows)
-                //       the HDN_ITEMCLICK notification is not sent on
-                //       right clicks, so we need to handle NM_RCLICK
-
-                POINT ptClick;
-                int column = wxMSWGetColumnClicked(nmhdr, &ptClick);
-                if (column != wxNOT_FOUND)
-                {
-                    HDITEM item;
-                    item.mask = HDI_LPARAM;
-                    Header_GetItem((HWND)m_hWnd, column, &item);
-
-                    // 'idx' may be different from 'column' if there are
-                    // hidden columns...
-                    unsigned int idx = (unsigned int)item.lParam;
-                    SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK,
-                              idx);
-                }
-            }
-            break;
-
-        case HDN_GETDISPINFOW:
-            // see wxListCtrl::MSWOnNotify for more info!
-            break;
-
-        case HDN_ITEMDBLCLICK:
-            {
-                unsigned int idx = GetColumnIdxFromHeader(nmHDR);
-                int w = GetOwner()->GetBestColumnWidth(idx);
-
-                // update the native control:
-                HDITEM hd;
-                ZeroMemory(&hd, sizeof(hd));
-                hd.mask = HDI_WIDTH;
-                hd.cxy = w;
-                Header_SetItem(GetHwnd(),
-                               nmHDR->iItem,  // NOTE: we don't want 'idx' here!
-                               &hd);
-
-                // update the wxDataViewColumn class:
-                GetColumn(idx)->SetInternalWidth(w);
-            }
-            break;
-
-        default:
-            return wxWindow::MSWOnNotify(idCtrl, lParam, result);
-    }
-
-    return true;
-}
-
-void wxDataViewHeaderWindowMSW::ScrollWindow(int dx, int WXUNUSED(dy),
-                                             const wxRect * WXUNUSED(rect))
-{
-    m_scrollOffsetX += dx;
-
-    GetParent()->Layout();
-}
-
-void wxDataViewHeaderWindowMSW::DoSetSize(int x, int y,
-                                          int w, int h,
-                                          int f)
-{
-    // TODO: why is there a border + 2px around it?
-    wxControl::DoSetSize( x+m_scrollOffsetX+1, y+1, w-m_scrollOffsetX-2, h-2, f );
-}
-
-#else       // !defined(__WXMSW__)
-
-IMPLEMENT_ABSTRACT_CLASS(wxGenericDataViewHeaderWindow, wxWindow)
-BEGIN_EVENT_TABLE(wxGenericDataViewHeaderWindow, wxWindow)
-    EVT_PAINT         (wxGenericDataViewHeaderWindow::OnPaint)
-    EVT_MOUSE_EVENTS  (wxGenericDataViewHeaderWindow::OnMouse)
-    EVT_SET_FOCUS     (wxGenericDataViewHeaderWindow::OnSetFocus)
-END_EVENT_TABLE()
-
-bool wxGenericDataViewHeaderWindow::Create(wxDataViewCtrl *parent, wxWindowID id,
-                                           const wxPoint &pos, const wxSize &size,
-                                           const wxString &name )
-{
-    m_owner = parent;
-
-    if (!wxDataViewHeaderWindowBase::Create(parent, id, pos, size, name))
-        return false;
-
-    wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes();
-    SetBackgroundStyle( wxBG_STYLE_CUSTOM );
-    SetOwnForegroundColour( attr.colFg );
-    SetOwnBackgroundColour( attr.colBg );
-    if (!m_hasFont)
-        SetOwnFont( attr.font );
-
-    // set our size hints: wxDataViewCtrl will put this wxWindow inside
-    // a wxBoxSizer and in order to avoid super-big header windows,
-    // we need to set our height as fixed
-    SetMinSize(wxSize(-1, HEADER_WINDOW_HEIGHT));
-    SetMaxSize(wxSize(-1, HEADER_WINDOW_HEIGHT));
-
-    return true;
-}
-
-void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
-{
-    int w, h;
-    GetClientSize( &w, &h );
-
-    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);
+    }
 
-        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();
+    RenderText( m_value.GetText(), xoffset, cell, dc, state );
 
-        xpos += cw;
-    }
+    return true;
 }
 
-void wxGenericDataViewHeaderWindow::OnSetFocus( wxFocusEvent &event )
+wxSize wxDataViewIconTextRenderer::GetSize() const
 {
-    GetParent()->SetFocus();
-    event.Skip();
+    const wxDataViewCtrl *view = GetView();
+    if (!m_value.GetText().empty())
+    {
+        int x,y;
+        view->GetTextExtent( m_value.GetText(), &x, &y );
+
+        if (m_value.GetIcon().IsOk())
+            x += m_value.GetIcon().GetWidth() + 4;
+        return wxSize( x, y );
+    }
+    return wxSize(80,20);
 }
 
-void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event )
+wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant& value)
 {
-    // we want to work with logical coords
-    int x;
-    m_owner->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL);
-    int y = event.GetY();
-
-    if (m_isDragging)
-    {
-        // we don't draw the line beyond our window,
-        // but we allow dragging it there
-        int w = 0;
-        GetClientSize( &w, NULL );
-        m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
-        w -= 6;
+    wxDataViewIconText iconText;
+    iconText << value;
 
-        if (event.ButtonUp())
-        {
-            m_isDragging = false;
-            if (HasCapture())
-                ReleaseMouse();
+    wxString text = iconText.GetText();
 
-            m_dirty = true;
-        }
-        m_currentX = wxMax(m_minX + 7, x);
+    // 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;
+    }
 
-        if (m_currentX < w)
-        {
-            GetColumn(m_column)->SetWidth(m_currentX - m_minX);
-            Refresh();
-            GetOwner()->Refresh();
-        }
+    return new wxTextCtrl( parent, wxID_ANY, text,
+                           wxPoint(labelRect.x,labelRect.y),
+                           wxSize(labelRect.width,labelRect.height) );
+}
 
-    }
-    else     // not dragging
-    {
-        m_minX = 0;
-        m_column = wxNOT_FOUND;
+bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant& value )
+{
+    wxTextCtrl *text = (wxTextCtrl*) editor;
 
-        bool hit_border = false;
+    wxDataViewIconText iconText(text->GetValue(), m_value.GetIcon());
+    value << iconText;
+    return true;
+}
 
-        // end of the current column
-        int xpos = 0;
+//-----------------------------------------------------------------------------
+// wxDataViewDropTarget
+//-----------------------------------------------------------------------------
 
-        // find the column where this event occured
-        int countCol = m_owner->GetColumnCount();
-        for (int column = 0; column < countCol; column++)
-        {
-            wxDataViewColumn *p = GetColumn(column);
+#if wxUSE_DRAG_AND_DROP
 
-            if (p->IsHidden())
-                continue;   // skip if not shown
+class wxBitmapCanvas: public wxWindow
+{
+public:
+    wxBitmapCanvas( wxWindow *parent, const wxBitmap &bitmap, const wxSize &size ) :
+    wxWindow( parent, wxID_ANY, wxPoint(0,0), size )
+    {
+        m_bitmap = bitmap;
+        Connect( wxEVT_PAINT, wxPaintEventHandler(wxBitmapCanvas::OnPaint) );
+    }
 
-            xpos += p->GetWidth();
-            m_column = column;
-            if ((abs(x-xpos) < 3) && (y < 22))
-            {
-                hit_border = true;
-                break;
-            }
+    void OnPaint( wxPaintEvent &WXUNUSED(event) )
+    {
+        wxPaintDC dc(this);
+        dc.DrawBitmap( m_bitmap, 0, 0);
+    }
 
-            if (x < xpos)
-            {
-                // inside the column
-                break;
-            }
+    wxBitmap m_bitmap;
+};
 
-            m_minX = xpos;
-        }
+class wxDataViewDropSource: public wxDropSource
+{
+public:
+    wxDataViewDropSource( wxDataViewMainWindow *win, unsigned int row ) :
+        wxDropSource( win )
+    {
+        m_win = win;
+        m_row = row;
+        m_hint = NULL;
+    }
 
-        int old_hover = m_hover;
-        m_hover = m_column;
-        if (event.Leaving())
-            m_hover = wxNOT_FOUND;
-        if (old_hover != m_hover)
-            Refresh();
+    ~wxDataViewDropSource()
+    {
+        delete m_hint;
+    }
 
-        if (m_column == wxNOT_FOUND)
-            return;
+    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect) )
+    {
+        wxPoint pos = wxGetMousePosition();
 
-        bool resizeable = GetColumn(m_column)->IsResizeable();
-        if (event.LeftDClick() && resizeable)
+        if (!m_hint)
         {
-            GetColumn(m_column)->SetWidth(GetOwner()->GetBestColumnWidth(m_column));
-            Refresh();
+            int liney = m_win->GetLineStart( m_row );
+            int linex = 0;
+            m_win->GetOwner()->CalcUnscrolledPosition( 0, liney, NULL, &liney );
+            m_win->ClientToScreen( &linex, &liney );
+            m_dist_x = pos.x - linex;
+            m_dist_y = pos.y - liney;
+
+            int indent = 0;
+            wxBitmap ib = m_win->CreateItemBitmap( m_row, indent );
+            m_dist_x -= indent;
+            m_hint = new wxFrame( m_win->GetParent(), wxID_ANY, wxEmptyString,
+                                        wxPoint(pos.x - m_dist_x, pos.y + 5 ),
+                                        ib.GetSize(),
+                                        wxFRAME_TOOL_WINDOW |
+                                        wxFRAME_FLOAT_ON_PARENT |
+                                        wxFRAME_NO_TASKBAR |
+                                        wxNO_BORDER );
+            new wxBitmapCanvas( m_hint, ib, ib.GetSize() );
+            m_hint->Show();
         }
-        else if (event.LeftDown() || event.RightUp())
+        else
         {
-            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);
-                }
-            }
+            m_hint->Move( pos.x - m_dist_x, pos.y + 5  );
+            m_hint->SetTransparent( 128 );
         }
-        else if (event.Moving())
-        {
-            if (hit_border && resizeable)
-                m_currentCursor = m_resizeCursor;
-            else
-                m_currentCursor = wxSTANDARD_CURSOR;
 
-            SetCursor(*m_currentCursor);
-        }
+        return false;
     }
-}
 
-void wxGenericDataViewHeaderWindow::AdjustDC(wxDC& dc)
+    wxDataViewMainWindow   *m_win;
+    unsigned int            m_row;
+    wxFrame                *m_hint;
+    int m_dist_x,m_dist_y;
+};
+
+
+class wxDataViewDropTarget: public wxDropTarget
 {
-    int xpix, x;
+public:
+    wxDataViewDropTarget( wxDataObject *obj, wxDataViewMainWindow *win ) :
+        wxDropTarget( obj )
+    {
+        m_win = win;
+    }
 
-    m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
-    m_owner->GetViewStart( &x, NULL );
+    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);
+    }
 
-    // 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 );
-}
+    virtual bool OnDrop( wxCoord x, wxCoord y )
+    {
+        wxDataFormat format = GetMatchingPair();
+        if (format == wxDF_INVALID)
+            return false;
+        return m_win->OnDrop( format, x, y );
+    }
 
-#endif      // defined(__WXMSW__)
+    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 );
+    }
+
+    virtual void OnLeave()
+        { m_win->OnLeave(); }
+
+    wxDataViewMainWindow   *m_win;
+};
+
+#endif // wxUSE_DRAG_AND_DROP
 
 //-----------------------------------------------------------------------------
 // wxDataViewRenameTimer
@@ -1993,8 +1303,9 @@ void wxDataViewRenameTimer::Notify()
 // wxDataViewMainWindow
 //-----------------------------------------------------------------------------
 
-//The tree building helper, declared firstly
-static void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item, wxDataViewTreeNode * node);
+// The tree building helper, declared firstly
+static void BuildTreeHelper( wxDataViewModel * model,  wxDataViewItem & item,
+                             wxDataViewTreeNode * node);
 
 int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )
 {
@@ -2003,7 +1314,6 @@ int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )
     return -1;
 }
 
-
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow)
 
 BEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow)
@@ -2031,8 +1341,16 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
 
     m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1
 
+#if wxUSE_DRAG_AND_DROP
     m_dragCount = 0;
     m_dragStart = wxPoint(0,0);
+
+    m_dragEnabled = false;
+    m_dropEnabled = false;
+    m_dropHint = false;
+    m_dropHintLine = (unsigned int) -1;
+#endif // wxUSE_DRAG_AND_DROP
+
     m_lineLastClicked = (unsigned int) -1;
     m_lineBeforeLastClicked = (unsigned int) -1;
     m_lineSelectSingleOnUp = (unsigned int) -1;
@@ -2045,13 +1363,14 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
 
     m_penRule = wxPen(GetRuleColour());
 
-    //Here I compose a pen can draw black lines, maybe there are something system colour to use
+    // compose a pen whichcan draw black lines
+    // TODO: maybe there is 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);
 
-    //Make m_count = -1 will cause the class recaculate the real displaying number of rows.
+    // Make m_count = -1 will cause the class recaculate the real displaying number of rows.
     m_count = -1;
     m_underMouse = NULL;
     UpdateDisplay();
@@ -2063,6 +1382,262 @@ wxDataViewMainWindow::~wxDataViewMainWindow()
     delete m_renameTimer;
 }
 
+
+#if wxUSE_DRAG_AND_DROP
+bool wxDataViewMainWindow::EnableDragSource( const wxDataFormat &format )
+{
+    m_dragFormat = format;
+    m_dragEnabled = format != wxDF_INVALID;
+
+    return true;
+}
+
+bool wxDataViewMainWindow::EnableDropTarget( const wxDataFormat &format )
+{
+    m_dropFormat = format;
+    m_dropEnabled = format != wxDF_INVALID;
+
+    if (m_dropEnabled)
+        SetDropTarget( new wxDataViewDropTarget( new wxCustomDataObject( format ), this ) );
+
+    return true;
+}
+
+void wxDataViewMainWindow::RemoveDropHint()
+{
+    if (m_dropHint)
+    {
+            m_dropHint = false;
+            RefreshRow( m_dropHintLine );
+            m_dropHintLine = (unsigned int) -1;
+    }
+}
+
+wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x,
+                                               wxCoord y, wxDragResult def )
+{
+    int xx = x;
+    int yy = y;
+    m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy );
+    unsigned int row = GetLineAt( yy );
+
+    if ((row >= GetRowCount()) || (yy > GetEndOfLastCol()))
+    {
+        RemoveDropHint();
+        return wxDragNone;
+    }
+
+    wxDataViewItem item = GetItemByRow( row );
+
+    wxDataViewModel *model = GetOwner()->GetModel();
+
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
+    event.SetEventObject( m_owner );
+    event.SetItem( item );
+    event.SetModel( model );
+    event.SetDataFormat( format );
+    if (!m_owner->HandleWindowEvent( event ))
+    {
+        RemoveDropHint();
+        return wxDragNone;
+    }
+
+    if (!event.IsAllowed())
+    {
+        RemoveDropHint();
+        return wxDragNone;
+    }
+
+
+    if (m_dropHint && (row != m_dropHintLine))
+        RefreshRow( m_dropHintLine );
+    m_dropHint = true;
+    m_dropHintLine = row;
+    RefreshRow( row );
+
+    return def;
+}
+
+bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y )
+{
+    RemoveDropHint();
+
+    int xx = x;
+    int yy = y;
+    m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy );
+    unsigned int row = GetLineAt( yy );
+
+    if ((row >= GetRowCount()) || (yy > GetEndOfLastCol()))
+        return false;
+
+    wxDataViewItem item = GetItemByRow( row );
+
+    wxDataViewModel *model = GetOwner()->GetModel();
+
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
+    event.SetEventObject( m_owner );
+    event.SetItem( item );
+    event.SetModel( model );
+    event.SetDataFormat( format );
+    if (!m_owner->HandleWindowEvent( event ))
+        return false;
+
+    if (!event.IsAllowed())
+        return false;
+
+    return true;
+}
+
+wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoord y,
+                                           wxDragResult def )
+{
+    int xx = x;
+    int yy = y;
+    m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy );
+    unsigned int row = GetLineAt( yy );
+
+    if ((row >= GetRowCount()) || (yy > GetEndOfLastCol()))
+        return wxDragNone;
+
+    wxDataViewItem item = GetItemByRow( row );
+
+    wxDataViewModel *model = GetOwner()->GetModel();
+
+    wxCustomDataObject *obj = (wxCustomDataObject *) GetDropTarget()->GetDataObject();
+
+    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 wxDataViewMainWindow::OnLeave()
+{
+    RemoveDropHint();
+}
+
+wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent )
+{
+    int height = GetLineHeight( row );
+    int width = 0;
+    unsigned int cols = GetOwner()->GetColumnCount();
+    unsigned int 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;
+
+    wxBitmap bitmap( width, height );
+    wxMemoryDC dc( bitmap );
+    dc.SetFont( GetFont() );
+    dc.SetPen( *wxBLACK_PEN );
+    dc.SetBrush( *wxWHITE_BRUSH );
+    dc.DrawRectangle( 0,0,width,height );
+
+    wxDataViewModel *model = m_owner->GetModel();
+
+    wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
+    if (!expander)
+    {
+        // TODO-RTL: last column for RTL support
+        expander = GetOwner()->GetColumnAt( 0 );
+        GetOwner()->SetExpanderColumn(expander);
+    }
+
+
+    int x = 0;
+    for (col = 0; col < cols; col++)
+    {
+        wxDataViewColumn *column = GetOwner()->GetColumnAt( col );
+        wxDataViewRenderer *cell = column->GetRenderer();
+
+        if (column->IsHidden())
+            continue;       // skip it!
+
+        width = column->GetWidth();
+
+        if (column == expander)
+            width -= indent;
+
+        wxVariant value;
+        wxDataViewItem item = GetItemByRow( row );
+        model->GetValue( value, item, column->GetModelColumn());
+        cell->SetValue( value );
+
+        if (cell->GetWantsAttr())
+        {
+                wxDataViewItemAttr attr;
+                bool ret = model->GetAttr( item, column->GetModelColumn(), attr );
+                if (ret)
+                    cell->SetAttr( attr );
+                cell->SetHasAttr( ret );
+        }
+
+        wxSize size = cell->GetSize();
+        size.x = wxMin( 2*PADDING_RIGHTLEFT + size.x, width );
+        size.y = height;
+        wxRect item_rect(x, 0, size.x, size.y);
+
+        int align = cell->CalculateAlignment();
+        // horizontal alignment:
+        item_rect.x = x;
+        if (align & wxALIGN_CENTER_HORIZONTAL)
+            item_rect.x = x + (width / 2) - (size.x / 2);
+        else if (align & wxALIGN_RIGHT)
+            item_rect.x = x + width - size.x;
+        // else: wxALIGN_LEFT is the default
+
+        // vertical alignment:
+        item_rect.y = 0;
+        if (align & wxALIGN_CENTER_VERTICAL)
+            item_rect.y = (height / 2) - (size.y / 2);
+        else if (align & wxALIGN_BOTTOM)
+            item_rect.y = height - size.y;
+        // else: wxALIGN_TOP is the default
+
+        // add padding
+        item_rect.x += PADDING_RIGHTLEFT;
+        item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;
+
+        // dc.SetClippingRegion( item_rect );
+        cell->Render( item_rect, &dc, 0 );
+        // dc.DestroyClippingRegion();
+
+        x += width;
+    }
+
+    return bitmap;
+}
+
+#endif // wxUSE_DRAG_AND_DROP
+
+
 void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxDataViewModel *model = GetOwner()->GetModel();
@@ -2087,16 +1662,16 @@ 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),
-               (int)(GetRowCount( ) - item_start));
+            (int)(GetRowCount( ) - item_start));
     unsigned int item_last = item_start + item_count;
 
     // compute which columns needs to be redrawn
     unsigned int cols = GetOwner()->GetColumnCount();
     unsigned int col_start = 0;
-    unsigned int x_start = 0;
+    unsigned int x_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!
 
@@ -2111,7 +1686,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     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!
 
@@ -2127,7 +1702,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         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);
@@ -2143,7 +1718,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         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
 
@@ -2181,11 +1756,22 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         }
     }
 
+#if wxUSE_DRAG_AND_DROP
+    if (m_dropHint)
+    {
+        wxRect rect( x_start, GetLineStart( m_dropHintLine ),
+                    x_last, 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)
     {
-        // TODO: last column for RTL support
-        expander = GetOwner()->GetColumn( 0 );
+        // TODO-RTL: last column for RTL support
+        expander = GetOwner()->GetColumnAt( 0 );
         GetOwner()->SetExpanderColumn(expander);
     }
 
@@ -2194,8 +1780,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     cell_rect.x = x_start;
     for (unsigned int i = col_start; i < col_last; i++)
     {
-
-        wxDataViewColumn *col = GetOwner()->GetColumn( i );
+        wxDataViewColumn *col = GetOwner()->GetColumnAt( i );
         wxDataViewRenderer *cell = col->GetRenderer();
         cell_rect.width = col->GetWidth();
 
@@ -2217,7 +1802,8 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
                 dataitem = node->GetItem();
 
-                if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem))
+                if ((i > 0) && model->IsContainer(dataitem) &&
+                    !model->HasContainerColumns(dataitem))
                     continue;
             }
             else
@@ -2239,22 +1825,27 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
             // update cell_rect
             cell_rect.y = GetLineStart( item );
-            cell_rect.height = GetLineHeight( item );     // -1 is for the horizontal rules (?)
+            cell_rect.height = GetLineHeight( item );
 
-            //Draw the expander here.
+            // Draw the expander here.
             int indent = 0;
             if ((!IsVirtualList()) && (col == expander))
             {
                 indent = node->GetIndentLevel();
 
-                //Calculate the indent first
+                // 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
+                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() )
@@ -2266,12 +1857,14 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                         flag |= wxCONTROL_CURRENT;
                     }
                     if( node->IsOpen() )
-                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag|wxCONTROL_EXPANDED );
+                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect,
+                                                                    flag|wxCONTROL_EXPANDED );
                     else
                         wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
                 }
-                 //force the expander column to left-center align
-                 cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
+
+                // force the expander column to left-center align
+                cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
             }
             if (node && !node->HasChildren())
             {
@@ -2282,7 +1875,9 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
             // 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
+
+            // 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;
@@ -2296,7 +1891,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                 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
+            // else: wxALIGN_LEFT is the default
 
             // vertical alignment:
             item_rect.y = cell_rect.y;
@@ -2304,13 +1899,13 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                 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
+            // 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
+            // Here we add the tree indent
             item_rect.x += indent;
 
             int state = 0;
@@ -2338,14 +1933,18 @@ 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 )
+    {
+        // TODO: use wxTheApp->SafeYieldFor(NULL, wxEVT_CATEGORY_UI) instead
+        //       (needs to be tested!)
         wxSafeYield();
+    }
 
     int xpos = 0;
     unsigned int cols = GetOwner()->GetColumnCount();
     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!
 
@@ -2353,29 +1952,42 @@ void wxDataViewMainWindow::OnRenameTimer()
             break;
         xpos += c->GetWidth();
     }
-    wxRect labelRect( xpos,
-                      GetLineStart( m_currentRow ),
-                      m_currentCol->GetWidth(),
-                      GetLineHeight( m_currentRow ) );
+
+    // we have to take an expander column into account and compute its indentation
+    // to get the editor at the correct x position where the actual text is
+    int indent = 0;
+    if (!IsVirtualList() && GetOwner()->GetExpanderColumn() == m_currentCol)
+    {
+        wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
+        indent = GetOwner()->GetIndent() * node->GetIndentLevel();
+        indent = indent + m_lineHeight;
+
+        if(!node->HasChildren())
+            delete node;
+    }
+
+    wxRect labelRect( xpos + indent,
+                    GetLineStart( m_currentRow ),
+                    m_currentCol->GetWidth() - indent,
+                    GetLineHeight( m_currentRow ) );
 
     GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y,
-                                     &labelRect.x, &labelRect.y);
+                                    &labelRect.x, &labelRect.y);
 
     wxDataViewItem item = GetItemByRow( m_currentRow );
     m_currentCol->GetRenderer()->StartEditing( item, labelRect );
-
 }
 
-//------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Helper class for do operation on the tree node
-//------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 class DoJob
 {
 public:
     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
@@ -2428,7 +2040,7 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func )
                     continue;
                 case DoJob::CONT:
                 default:
-                   ;
+                ;
             }
     }
     return false;
@@ -2474,7 +2086,7 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
 static void DestroyTreeHelper( wxDataViewTreeNode * node);
 
 bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
-                                       const wxDataViewItem& item)
+                                    const wxDataViewItem& item)
 {
     if (!m_root)
     {
@@ -2492,11 +2104,12 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
     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() );
-    //Manuplate selection
+    // Manipolate selection
     if( m_selection.GetCount() > 1 )
     {
         m_selection.Empty();
@@ -2531,11 +2144,11 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
         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);
 
-    //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;
 
@@ -2549,7 +2162,7 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
     SortPrepare();
     g_model->Resort();
 
-    //Send event
+    // Send event
     wxWindow *parent = GetParent();
     wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
     le.SetEventObject(parent);
@@ -2574,7 +2187,7 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
     SortPrepare();
     g_model->Resort();
 
-    //Send event
+    // Send event
     wxWindow *parent = GetParent();
     wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
     le.SetEventObject(parent);
@@ -2651,12 +2264,12 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column )
     {
         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++)
         {
-            wxDataViewColumn *col = GetOwner()->GetColumn(colnum);
+            wxDataViewColumn *col = GetOwner()->GetColumnAt(colnum);
             if (col->IsHidden())
                 continue;      // skip it!
 
@@ -2664,7 +2277,7 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column )
             x_start += w;
         }
 
-        x_end = x_start + w;
+        int x_end = x_start + w;
         xe = xx + rect.width;
         if( x_end > xe )
         {
@@ -2691,7 +2304,7 @@ int wxDataViewMainWindow::GetEndOfLastCol() const
     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();
@@ -2712,9 +2325,9 @@ unsigned int wxDataViewMainWindow::GetLastVisibleRow()
 {
     wxSize client_size = GetClientSize();
     m_owner->CalcUnscrolledPosition( client_size.x, client_size.y,
-                                     &client_size.x, &client_size.y );
+                                    &client_size.x, &client_size.y );
 
-    //we should deal with the pixel here
+    // we should deal with the pixel here
     unsigned int row = GetLineAt(client_size.y) - 1;
 
     return wxMin( GetRowCount()-1, row );
@@ -2893,7 +2506,7 @@ void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow )
 void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event)
 {
     wxCHECK_RET( newCurrent < GetRowCount(),
-                 _T("invalid item index in OnArrowChar()") );
+                _T("invalid item index in OnArrowChar()") );
 
     // if there is no selection, we cannot move it anywhere
     if (!HasCurrentRow())
@@ -2987,18 +2600,20 @@ int wxDataViewMainWindow::GetLineStart( unsigned int row ) const
                 if (column->IsHidden())
                     continue;      // skip it!
 
-                if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item))
+                if ((col != 0) &&
+                    model->IsContainer(item) &&
+                    !model->HasContainerColumns(item))
                     continue;      // skip it!
 
-                const wxDataViewRenderer *renderer = column->GetRenderer();
                 wxVariant value;
                 model->GetValue( value, item, column->GetModelColumn() );
-                wxDataViewRenderer *renderer2 = const_cast<wxDataViewRenderer*>(renderer);
-                renderer2->SetValue( value );
+
+                wxDataViewRenderer *renderer =
+                    const_cast<wxDataViewRenderer*>(column->GetRenderer());
+                renderer->SetValue( value );
                 height = wxMax( height, renderer->GetSize().y );
             }
 
-
             start += height;
         }
 
@@ -3023,14 +2638,14 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const
     unsigned int yy = 0;
     for (;;)
     {
-       const wxDataViewTreeNode* node = GetTreeNodeByRow(row);
-       if (!node)
-       {
-           // not really correct...
-           return row + ((y-yy) / m_lineHeight);
-       }
+        const wxDataViewTreeNode* node = GetTreeNodeByRow(row);
+        if (!node)
+        {
+            // not really correct...
+            return row + ((y-yy) / m_lineHeight);
+        }
 
-       wxDataViewItem item = node->GetItem();
+        wxDataViewItem item = node->GetItem();
 
         if (node && !node->HasChildren())
         {
@@ -3039,31 +2654,34 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const
             wxDELETE(node);
         }
 
-       unsigned int cols = GetOwner()->GetColumnCount();
-       unsigned int col;
-       int height = m_lineHeight;
-       for (col = 0; col < cols; col++)
-       {
+        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))
+            if ((col != 0) &&
+                model->IsContainer(item) &&
+                !model->HasContainerColumns(item))
                 continue;      // skip it!
 
-            const wxDataViewRenderer *renderer = column->GetRenderer();
             wxVariant value;
             model->GetValue( value, item, column->GetModelColumn() );
-            wxDataViewRenderer *renderer2 = const_cast<wxDataViewRenderer*>(renderer);
-            renderer2->SetValue( value );
+
+            wxDataViewRenderer *renderer =
+                const_cast<wxDataViewRenderer*>(column->GetRenderer());
+            renderer->SetValue( value );
             height = wxMax( height, renderer->GetSize().y );
-       }
+        }
 
-       yy += height;
-       if (y < yy)
-           return row;
+        yy += height;
+        if (y < yy)
+            return row;
 
-       row++;
+        row++;
     }
 }
 
@@ -3085,7 +2703,7 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
         {
                 // 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);
         }
 
         int height = m_lineHeight;
@@ -3098,14 +2716,17 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
             if (column->IsHidden())
                 continue;      // skip it!
 
-            if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item))
+            if ((col != 0) &&
+                model->IsContainer(item) &&
+                !model->HasContainerColumns(item))
                 continue;      // skip it!
 
-            const wxDataViewRenderer *renderer = column->GetRenderer();
             wxVariant value;
             model->GetValue( value, item, column->GetModelColumn() );
-            wxDataViewRenderer *renderer2 = const_cast<wxDataViewRenderer*>(renderer);
-            renderer2->SetValue( value );
+
+            wxDataViewRenderer *renderer =
+                const_cast<wxDataViewRenderer*>(column->GetRenderer());
+            renderer->SetValue( value );
             height = wxMax( height, renderer->GetSize().y );
         }
 
@@ -3120,14 +2741,15 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
 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))
-         {
+        {
             ret = node->GetItem();
             return DoJob::OK;
         }
@@ -3139,8 +2761,10 @@ public:
         }
         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;
@@ -3155,13 +2779,16 @@ public:
     {
         current ++;
         if( current == static_cast<int>(row))
-         {
+        {
             ret = wxDataViewItem( n );
             return DoJob::OK;
         }
         return DoJob::CONT;
     }
-    wxDataViewItem GetResult(){ return ret; }
+
+    wxDataViewItem GetResult() const
+        { return ret; }
+
 private:
     unsigned int row;
     int current;
@@ -3198,7 +2825,7 @@ public:
     {
         current ++;
         if( current == static_cast<int>(row))
-         {
+        {
             ret = node;
             return DoJob::OK;
         }
@@ -3211,8 +2838,11 @@ public:
         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;
@@ -3224,15 +2854,13 @@ public:
             }
             return DoJob::CONT;
         }
-
-
     }
 
     virtual int operator() ( void * n )
     {
         current ++;
         if( current == static_cast<int>(row))
-         {
+        {
             ret = new wxDataViewTreeNode( parent );
             ret->SetItem( wxDataViewItem( n ));
             ret->SetHasChildren(false);
@@ -3241,7 +2869,10 @@ public:
 
         return DoJob::CONT;
     }
-    wxDataViewTreeNode * GetResult(){ return ret; }
+
+    wxDataViewTreeNode * GetResult() const
+        { return ret; }
+
 private:
     unsigned int row;
     int current;
@@ -3249,7 +2880,6 @@ private:
     wxDataViewTreeNode * parent;
 };
 
-
 wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) const
 {
     wxASSERT( !IsVirtualList() );
@@ -3259,7 +2889,8 @@ wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) co
     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());
@@ -3272,86 +2903,172 @@ wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const
     return le;
 }
 
-void wxDataViewMainWindow::OnExpanding( unsigned int row )
+bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const
 {
     if (IsVirtualList())
-       return;
+        return false;
 
     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;
 
-               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)
 {
     if (IsVirtualList())
-       return;
-       
-    wxDataViewTreeNode * node = GetTreeNodeByRow(row);
-    if( node != NULL )
+        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;
+
+            // 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();
-            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 )
@@ -3360,7 +3077,10 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
     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 );
@@ -3371,8 +3091,8 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
         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;
     for( ItemList::const_iterator iter = list.begin(); iter !=list.end(); iter++ )
     {
@@ -3393,7 +3113,7 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
                 if (nodes[i]->GetItem() == (**iter))
                 {
                     if (nodes[i]->GetItem() == item)
-                       return nodes[i];
+                    return nodes[i];
 
                     node = nodes[i];
                     found = true;
@@ -3409,17 +3129,17 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
     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;
-    unsigned int x_start = 0;
     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!
 
@@ -3434,30 +3154,75 @@ void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item
     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 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()
 {
     if (!m_root)
     {
-        wxDataViewIndexListModel *list_model = (wxDataViewIndexListModel*) GetOwner()->GetModel();
+        wxDataViewIndexListModel *list_model =
+            (wxDataViewIndexListModel*) GetOwner()->GetModel();
 #ifndef __WXMAC__
         return list_model->GetLastIndex() + 1;
 #else
@@ -3475,30 +3240,30 @@ class ItemToRowJob : public DoJob
 public:
     ItemToRowJob(const wxDataViewItem& item_, ItemList::const_iterator iter)
         : m_iter(iter),
-          item(item_)
+        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)
     {
-         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;
+        }
 
     }
 
@@ -3509,8 +3274,10 @@ public:
             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;
@@ -3534,9 +3301,9 @@ int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) const
         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;
-        wxDataViewItem * pItem = NULL;
+        wxDataViewItem * pItem;
         list.DeleteContents( true );
         wxDataViewItem it( item );
         while( it.IsOk() )
@@ -3554,13 +3321,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 ) )
         return;
 
     wxDataViewItemArray children;
     unsigned int num = model->GetChildren( item, children);
+
     unsigned int index = 0;
     while( index < num )
     {
@@ -3597,7 +3366,7 @@ void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
     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);
@@ -3609,12 +3378,9 @@ static void DestroyTreeHelper( wxDataViewTreeNode * node )
     if( node->GetNodeNumber() != 0 )
     {
         int len = node->GetNodeNumber();
-        int i = 0;
         wxDataViewTreeNodes& nodes = node->GetNodes();
-        for(; i < len; i ++ )
-        {
+        for (int i = 0; i < len; i++)
             DestroyTreeHelper(nodes[i]);
-        }
     }
     delete node;
 }
@@ -3623,15 +3389,15 @@ void wxDataViewMainWindow::DestroyTree()
 {
     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 )
 {
-    if ( HandleAsNavigationKey(event) )
+    if ( GetParent()->HandleAsNavigationKey(event) )
         return;
 
     // no item -> nothing to do
@@ -3648,11 +3414,10 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
     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());
@@ -3660,7 +3425,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
                 parent->GetEventHandler()->ProcessEvent(le);
             }
             break;
-        }
+
         case WXK_UP:
             if ( m_currentRow > 0 )
                 OnArrowChar( m_currentRow - 1, event );
@@ -3670,18 +3435,59 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
             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:
-         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())
+            {
+                Collapse(m_currentRow);
+            }
+            else
+            {
+                wxDataViewTreeNode *parent_node = node->GetParent();
+                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 );
+                        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 );
+                SendSelectionChangedEvent( GetItemByRow(row+1) );
+            }
+            break;
+        }
         case WXK_END:
+        {
             if (!IsEmpty())
                 OnArrowChar( GetRowCount() - 1, event );
             break;
-
+        }
         case WXK_HOME:
             if (!IsEmpty())
                 OnArrowChar( 0, event );
@@ -3734,7 +3540,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     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!
 
@@ -3750,14 +3556,14 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
     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;
     }
 
-    //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);
@@ -3765,22 +3571,24 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         {
             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 + EXPANDER_OFFSET);
-            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)
                 {
-                    //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)
                 {
-                    //wxLogMessage("Do the row: %d", current);
+                    // wxLogMessage("Do the row: %d", current);
                     RefreshRow(current);
                 }
                 m_underMouse = node;
@@ -3789,11 +3597,11 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         if (node!=NULL && !node->HasChildren())
             delete node;
     }
-    if (!hover)
+    if (!hoverOverExpander)
     {
         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;
         }
@@ -3801,6 +3609,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
     wxDataViewModel *model = GetOwner()->GetModel();
 
+#if wxUSE_DRAG_AND_DROP
     if (event.Dragging())
     {
         if (m_dragCount == 0)
@@ -3818,7 +3627,30 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
         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
+            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;
     }
@@ -3826,8 +3658,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     {
         m_dragCount = 0;
     }
+#endif // wxUSE_DRAG_AND_DROP
 
-    bool forceClick = false;
+    bool simulateClick = false;
 
     if (event.ButtonDClick())
     {
@@ -3838,12 +3671,17 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     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 ( 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))
             {
@@ -3851,9 +3689,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
                 model->GetValue( value, item, col->GetModelColumn() );
                 cell->SetValue( value );
                 wxRect cell_rect( xpos, GetLineStart( current ),
-                                  col->GetWidth(), GetLineHeight( current ) );
+                                col->GetWidth(), GetLineHeight( current ) );
                 cell->Activate( cell_rect, model, item, col->GetModelColumn() );
-
             }
             else
             {
@@ -3871,47 +3708,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
-            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 );
+            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 + EXPANDER_OFFSET);
-
-                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) )
@@ -3923,7 +3736,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         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
@@ -3960,7 +3773,20 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     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();
 
@@ -3999,7 +3825,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
                 ChangeCurrentRow(current);
 
                 unsigned int lineFrom = oldCurrentRow,
-                       lineTo = current;
+                    lineTo = current;
 
                 if ( lineTo < lineFrom )
                 {
@@ -4025,7 +3851,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         // 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+
@@ -4036,8 +3862,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             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());
+                              col->GetWidth(), GetLineHeight( current ) );
+             /* ignore ret */ cell->LeftClick( event.GetPosition(), cell_rect,
+                              model, item, col->GetModelColumn());
         }
     }
 }
@@ -4073,10 +3900,10 @@ wxDataViewItem wxDataViewMainWindow::GetSelection() const
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------
+
 WX_DEFINE_LIST(wxDataViewColumnList)
 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
-
 BEGIN_EVENT_TABLE(wxDataViewCtrl, wxDataViewCtrlBase)
     EVT_SIZE(wxDataViewCtrl::OnSize)
 END_EVENT_TABLE()
@@ -4093,14 +3920,21 @@ void wxDataViewCtrl::Init()
 {
     m_cols.DeleteContents(true);
     m_notifier = NULL;
+
+    // No sorting column at start
+    m_sortingColumnIdx = wxNOT_FOUND;
+
+    m_headerArea = NULL;
 }
 
 bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos, const wxSize& size,
-           long style, const wxValidator& validator )
+                            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))
@@ -4108,8 +3942,6 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
 
     SetInitialSize(size);
 
-    Init();
-
 #ifdef __WXMAC__
     MacSetClipChildren( true );
 #endif
@@ -4119,7 +3951,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
     if (HasFlag(wxDV_NO_HEADER))
         m_headerArea = NULL;
     else
-        m_headerArea = new wxDataViewHeaderWindow( this, wxID_ANY );
+        m_headerArea = new wxDataViewHeaderWindow(this);
 
     SetTargetWindow( m_clientArea );
 
@@ -4132,10 +3964,15 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
     return true;
 }
 
+wxBorder wxDataViewCtrl::GetDefaultBorder() const
+{
+    return wxBORDER_THEME;
+}
+
 #ifdef __WXMSW__
 WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg,
-                                       WXWPARAM wParam,
-                                       WXLPARAM lParam)
+                                        WXWPARAM wParam,
+                                        WXLPARAM lParam)
 {
     WXLRESULT rc = wxDataViewCtrlBase::MSWWindowProc(nMsg, wParam, lParam);
 
@@ -4151,6 +3988,15 @@ WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg,
 }
 #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
@@ -4165,6 +4011,12 @@ void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
     AdjustScrollbars();
 }
 
+void wxDataViewCtrl::SetFocus()
+{
+    if (m_clientArea)
+        m_clientArea->SetFocus();
+}
+
 bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
 {
     if (!wxDataViewCtrlBase::AssociateModel( model ))
@@ -4183,13 +4035,27 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
     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 );
-    OnColumnChange();
+    OnColumnsCountChanged();
     return true;
 }
 
@@ -4199,7 +4065,7 @@ bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
         return false;
 
     m_cols.Insert( col );
-    OnColumnChange();
+    OnColumnsCountChanged();
     return true;
 }
 
@@ -4209,14 +4075,22 @@ bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col )
         return false;
 
     m_cols.Insert( pos, col );
-    OnColumnChange();
+    OnColumnsCountChanged();
     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)
-        m_headerArea->UpdateDisplay();
+        m_headerArea->SetColumnCount(GetColumnCount());
 
     m_clientArea->UpdateDisplay();
 }
@@ -4236,32 +4110,39 @@ unsigned int wxDataViewCtrl::GetColumnCount() const
     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;
+    const unsigned count = m_cols.size();
+    for ( unsigned n = 0; n < count; n++ )
+    {
+        if ( m_cols[n] == column )
+            return n;
+    }
 
-    // Exchange position
-    m_cols.DeleteContents(false);
-    m_cols.DeleteObject( col );
-    m_cols.Insert( new_pos, col );
-    m_cols.DeleteContents(true);
+    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();
 }
 
@@ -4272,7 +4153,7 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
         return false;
 
     m_cols.Erase(ret);
-    OnColumnChange();
+    OnColumnsCountChanged();
 
     return true;
 }
@@ -4280,23 +4161,24 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
 bool wxDataViewCtrl::ClearColumns()
 {
     m_cols.Clear();
-    OnColumnChange();
+    OnColumnsCountChanged();
     return true;
 }
 
 int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
 {
-    int ret = 0, dead = 0;
-    int len = GetColumnCount();
-    for (int i=0; i<len; i++)
+    int ret = 0,
+        dummy = 0;
+    unsigned int len = GetColumnCount();
+    for ( unsigned int i = 0; i < len; i++ )
     {
-        wxDataViewColumn * col = GetColumn(i);
+        wxDataViewColumn * col = GetColumnAt(i);
         if (col->IsHidden())
             continue;
         ret += col->GetWidth();
         if (column==col)
         {
-            CalcScrolledPosition( ret, dead, &ret, &dead );
+            CalcScrolledPosition( ret, dummy, &ret, &dummy );
             break;
         }
     }
@@ -4305,10 +4187,11 @@ int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) 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();
@@ -4330,22 +4213,37 @@ int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const
 void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
 {
     wxDataViewSelection selection(wxDataViewSelectionCmp);
+
+    wxDataViewItem last_parent;
+
     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) );
     }
+
     m_clientArea->SetSelections( selection );
 }
 
 void wxDataViewCtrl::Select( const wxDataViewItem & item )
 {
+    ExpandAncestors( item );
+
     int row = m_clientArea->GetRowByItem( item );
     if( row >= 0 )
     {
-        //Unselect all rows before select another in the single select mode
+        // Unselect all rows before select another in the single select mode
         if (m_clientArea->IsSingleSel())
             m_clientArea->SelectAllRows(false);
         m_clientArea->SelectRow(row, true);
@@ -4369,7 +4267,7 @@ bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const
     return false;
 }
 
-//Selection code with row number as parameter
+// Selection code with row number as parameter
 int wxDataViewCtrl::GetSelections( wxArrayInt & sel ) const
 {
     sel.Empty();
@@ -4465,33 +4363,29 @@ void wxDataViewCtrl::EnsureVisible( int row, int 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 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);
 }
 
-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);
 }
@@ -4520,8 +4414,25 @@ void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
         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