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

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 14e1357aeeaf64c9990f165c812e5232f4688ede..dd7813621d9f095ad2afcc6792ee110a06fa9d55 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -34,6 +34,7 @@
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/dcscreen.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/dcscreen.h"

+    #include "wx/frame.h"

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


@@ -52,8 +53,14 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

+class wxDataViewColumn;
+class wxDataViewHeaderWindow;

 class wxDataViewCtrl;
 
 class wxDataViewCtrl;
 

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

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


@@ -68,12 +75,36 @@ static const int EXPANDER_OFFSET = 4;
 static const int EXPANDER_OFFSET = 1;
 #endif
 
 static const int EXPANDER_OFFSET = 1;
 #endif
 

-//Below is the compare stuff
-//For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed
-static wxDataViewModel * g_model;
+// Below is the compare stuff.
+// For the generic implementation, both the leaf nodes and the nodes are sorted for
+// fast search when needed
+static wxDataViewModel* g_model;

 static int g_column = -2;
 static bool g_asending = true;
 
 static int g_column = -2;
 static bool g_asending = true;
 

+//-----------------------------------------------------------------------------
+// wxDataViewColumn
+//-----------------------------------------------------------------------------
+
+void wxDataViewColumn::Init(int width, wxAlignment align, int flags)
+{
+    m_width = width == wxCOL_WIDTH_DEFAULT ? wxDVC_DEFAULT_WIDTH : width;
+    m_minWidth = 0;
+    m_align = align;
+    m_flags = flags;
+    m_sort = false;
+    m_sortAscending = true;
+}
+    
+void wxDataViewColumn::UpdateDisplay()
+{
+    if (m_owner)
+    {
+        int idx = m_owner->GetColumnIndex( this );
+        m_owner->OnColumnChange( idx );
+    }
+}
+

 //-----------------------------------------------------------------------------
 // wxDataViewHeaderWindow
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDataViewHeaderWindow
 //-----------------------------------------------------------------------------


@@ -97,6 +128,7 @@ protected:
         return *(GetOwner()->GetColumn(idx));
     }
 
         return *(GetOwner()->GetColumn(idx));
     }
 

+    // FIXME: currently unused

     virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle)
     {
         wxDataViewCtrl * const owner = GetOwner();
     virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle)
     {
         wxDataViewCtrl * const owner = GetOwner();


@@ -175,7 +207,7 @@ private:
             event.Skip();
     }
 
             event.Skip();
     }
 

-    void OnEndResize(wxHeaderCtrlEvent& event)
+    void OnResize(wxHeaderCtrlEvent& event)

     {
         wxDataViewCtrl * const owner = GetOwner();
 
     {
         wxDataViewCtrl * const owner = GetOwner();
 


@@ -188,18 +220,19 @@ private:
     {
         wxDataViewCtrl * const owner = GetOwner();
         owner->ColumnMoved(owner->GetColumn(event.GetColumn()),
     {
         wxDataViewCtrl * const owner = GetOwner();
         owner->ColumnMoved(owner->GetColumn(event.GetColumn()),

-                           event.GetNewOrder());
+                        event.GetNewOrder());

     }
 
     DECLARE_EVENT_TABLE()
     }
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxDataViewHeaderWindow)
+    wxDECLARE_NO_COPY_CLASS(wxDataViewHeaderWindow);

 };
 
 BEGIN_EVENT_TABLE(wxDataViewHeaderWindow, wxHeaderCtrl)
     EVT_HEADER_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnClick)
     EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnRClick)
 
 };
 
 BEGIN_EVENT_TABLE(wxDataViewHeaderWindow, wxHeaderCtrl)
     EVT_HEADER_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnClick)
     EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnRClick)
 

-    EVT_HEADER_END_RESIZE(wxID_ANY, wxDataViewHeaderWindow::OnEndResize)
+    EVT_HEADER_RESIZING(wxID_ANY, wxDataViewHeaderWindow::OnResize)
+    EVT_HEADER_END_RESIZE(wxID_ANY, wxDataViewHeaderWindow::OnResize)

 
     EVT_HEADER_END_REORDER(wxID_ANY, wxDataViewHeaderWindow::OnEndReorder)
 END_EVENT_TABLE()
 
     EVT_HEADER_END_REORDER(wxID_ANY, wxDataViewHeaderWindow::OnEndReorder)
 END_EVENT_TABLE()


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

+

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

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

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


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

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

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


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

-

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


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

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

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


@@ -441,13 +479,17 @@ public:
     int GetCountPerPage() const;
     int GetEndOfLastCol() const;
     unsigned int GetFirstVisibleRow() const;
     int GetCountPerPage() const;
     int GetEndOfLastCol() const;
     unsigned int GetFirstVisibleRow() const;

-    //I change this method to un const because in the tree view, the displaying number of the tree are changing along with the expanding/collapsing of the tree nodes
+
+    // I change this method to un const because in the tree view,
+    // the displaying number of the tree are changing along with the
+    // expanding/collapsing of the tree nodes

     unsigned int GetLastVisibleRow();
     unsigned int GetRowCount();
 
     wxDataViewItem GetSelection() const;
     wxDataViewSelection GetSelections(){ return m_selection; }
     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 );
     void Select( const wxArrayInt& aSelections );
     void SelectAllRows( bool on );
     void SelectRow( unsigned int row, bool on );


@@ -472,20 +514,22 @@ public:
     int GetLineHeight( unsigned int row ) const; // m_lineHeight in fixed mode
     int GetLineAt( unsigned int y ) const;       // y / m_lineHeight in fixed mode
 
     int GetLineHeight( unsigned int row ) const; // m_lineHeight in fixed mode
     int GetLineAt( unsigned int y ) const;       // y / m_lineHeight in fixed mode
 

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

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

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

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

-    void Expand( unsigned int row ) { OnExpanding( row ); }
-    void Collapse( unsigned int row ) { OnCollapsing( row ); }
+    void Expand( unsigned int row );
+    void Collapse( unsigned int row );

     bool IsExpanded( unsigned int row ) const;
     bool 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 );
 
     bool EnableDragSource( const wxDataFormat &format );
     bool EnableDropTarget( const wxDataFormat &format );
 


@@ -494,17 +538,16 @@ public:
     bool OnDrop( wxDataFormat format, wxCoord x, wxCoord y );
     wxDragResult OnData( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def );
     void OnLeave();
     bool OnDrop( wxDataFormat format, wxCoord x, wxCoord y );
     wxDragResult OnData( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def );
     void OnLeave();

+#endif // wxUSE_DRAG_AND_DROP

 
 private:
     wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const;
 
 private:
     wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const;

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

 
     int RecalculateCount();
 
     wxDataViewEvent SendExpanderEvent( wxEventType type, 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 );
 
 
     wxDataViewTreeNode * FindNode( const wxDataViewItem & item );
 


@@ -522,21 +565,23 @@ private:
 
     bool                        m_hasFocus;
 
 
     bool                        m_hasFocus;
 

+#if wxUSE_DRAG_AND_DROP

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

-    
+

     bool                        m_dragEnabled;
     wxDataFormat                m_dragFormat;
     bool                        m_dragEnabled;
     wxDataFormat                m_dragFormat;

-    
+

     bool                        m_dropEnabled;
     wxDataFormat                m_dropFormat;
     bool                        m_dropHint;
     unsigned int                m_dropHintLine;
     bool                        m_dropEnabled;
     wxDataFormat                m_dropFormat;
     bool                        m_dropHint;
     unsigned int                m_dropHintLine;

+#endif // wxUSE_DRAG_AND_DROP

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

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

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


@@ -544,11 +589,13 @@ private:
     // the pen used to draw the expander and the lines
     wxPen m_penExpander;
 
     // the pen used to draw the expander and the lines
     wxPen m_penExpander;
 

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

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

-    //This is the tree node under the cursor
+
+    // This is the tree node under the cursor

     wxDataViewTreeNode * m_underMouse;
     wxDataViewTreeNode * m_underMouse;

+

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


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

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

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


@@ -589,19 +636,17 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase)
 wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype,
                                         wxDataViewCellMode mode,
                                         int align) :
 wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype,
                                         wxDataViewCellMode mode,
                                         int align) :

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

 {
 {

-    m_dc = NULL;

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

-    m_wantsAttr = false;
-    m_hasAttr = false;
+    m_ellipsizeMode = wxELLIPSIZE_MIDDLE;
+    m_dc = NULL;

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

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

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


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

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

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


@@ -648,30 +680,20 @@ int wxDataViewRenderer::CalculateAlignment() const
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
 
 wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
 
 wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,

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

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

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

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

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

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

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

 {
 }
 
 {
 }
 


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

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

 {
     return true;
 }
 {
     return true;
 }


@@ -695,9 +717,15 @@ bool wxDataViewTextRenderer::HasEditorCtrl()
 wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,
         wxRect labelRect, const wxVariant &value )
 {
 wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,
         wxRect labelRect, const wxVariant &value )
 {

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

 }
 
 bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant &value )
 }
 
 bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant &value )


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

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

 {
 {

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

     return true;
 }
 
     return true;
 }
 


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

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

 }
 
 }
 

-

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

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

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

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

 {
 }
 
 {
 }
 


@@ -823,18 +793,18 @@ wxSize wxDataViewBitmapRenderer::GetSize() const
     else if (m_icon.Ok())
         return wxSize( m_icon.GetWidth(), m_icon.GetHeight() );
 
     else if (m_icon.Ok())
         return wxSize( m_icon.GetWidth(), m_icon.GetHeight() );
 

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

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

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

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

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

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


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

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

     int flags = 0;
     if (m_toggle)
         flags |= wxCONTROL_CHECKED;
     if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE)
         flags |= wxCONTROL_DISABLED;
 
     int flags = 0;
     if (m_toggle)
         flags |= wxCONTROL_CHECKED;
     if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE)
         flags |= wxCONTROL_DISABLED;
 

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

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

-            rect,
+            cell,

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

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

 {
 {

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

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

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

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

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

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

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

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

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

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


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

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

 {
 {

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

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

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

 
     return true;
 }
 
     return true;
 }


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

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

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

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

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

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

 {
 }
 
 {
 }
 


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

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

 {
 {

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

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

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

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

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

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

-    return true;

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

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

 
 wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(
 
 wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(

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

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

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

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


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

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

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

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

     {
     {

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

     }
 
     }
 

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

 
     return true;
 }
 
     return true;
 }


@@ -1119,25 +1080,124 @@ wxSize wxDataViewIconTextRenderer::GetSize() const
     return wxSize(80,20);
 }
 
     return wxSize(80,20);
 }
 

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

 {
 {

-    return NULL;
+    wxDataViewIconText iconText;
+    iconText << value;
+
+    wxString text = iconText.GetText();
+
+    // 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;
+    }
+
+    wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, text,
+                                       wxPoint(labelRect.x,labelRect.y),
+                                       wxSize(labelRect.width,labelRect.height) );
+
+    // select the text in the control an place the cursor at the end
+    ctrl->SetInsertionPointEnd();
+    ctrl->SelectAll();
+
+    return ctrl;

 }
 
 }
 

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

 {
 {

-    return false;
+    wxTextCtrl *text = (wxTextCtrl*) editor;
+
+    wxDataViewIconText iconText(text->GetValue(), m_value.GetIcon());
+    value << iconText;
+    return true;

 }
 
 //-----------------------------------------------------------------------------
 // wxDataViewDropTarget
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxDataViewDropTarget
 //-----------------------------------------------------------------------------
 

+#if wxUSE_DRAG_AND_DROP
+
+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) );
+    }
+
+    void OnPaint( wxPaintEvent &WXUNUSED(event) )
+    {
+        wxPaintDC dc(this);
+        dc.DrawBitmap( m_bitmap, 0, 0);
+    }
+
+    wxBitmap m_bitmap;
+};
+
+class wxDataViewDropSource: public wxDropSource
+{
+public:
+    wxDataViewDropSource( wxDataViewMainWindow *win, unsigned int row ) :
+        wxDropSource( win )
+    {
+        m_win = win;
+        m_row = row;
+        m_hint = NULL;
+    }
+
+    ~wxDataViewDropSource()
+    {
+        delete m_hint;
+    }
+
+    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect) )
+    {
+        wxPoint pos = wxGetMousePosition();
+
+        if (!m_hint)
+        {
+            int liney = m_win->GetLineStart( m_row );
+            int linex = 0;
+            m_win->GetOwner()->CalcUnscrolledPosition( 0, liney, NULL, &liney );
+            m_win->ClientToScreen( &linex, &liney );
+            m_dist_x = pos.x - linex;
+            m_dist_y = pos.y - liney;
+
+            int indent = 0;
+            wxBitmap ib = m_win->CreateItemBitmap( m_row, indent );
+            m_dist_x -= indent;
+            m_hint = new wxFrame( m_win->GetParent(), wxID_ANY, wxEmptyString,
+                                        wxPoint(pos.x - m_dist_x, pos.y + 5 ),
+                                        ib.GetSize(),
+                                        wxFRAME_TOOL_WINDOW |
+                                        wxFRAME_FLOAT_ON_PARENT |
+                                        wxFRAME_NO_TASKBAR |
+                                        wxNO_BORDER );
+            new wxBitmapCanvas( m_hint, ib, ib.GetSize() );
+            m_hint->Show();
+        }
+        else
+        {
+            m_hint->Move( pos.x - m_dist_x, pos.y + 5  );
+            m_hint->SetTransparent( 128 );
+        }
+
+        return false;
+    }
+
+    wxDataViewMainWindow   *m_win;
+    unsigned int            m_row;
+    wxFrame                *m_hint;
+    int m_dist_x,m_dist_y;
+};
+
+

 class wxDataViewDropTarget: public wxDropTarget
 {
 public:
 class wxDataViewDropTarget: public wxDropTarget
 {
 public:


@@ -1148,37 +1208,39 @@ public:
     }
 
     virtual wxDragResult OnDragOver( wxCoord x, wxCoord y, wxDragResult def )
     }
 
     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); 
-        }
-        
+    {
+        wxDataFormat format = GetMatchingPair();
+        if (format == wxDF_INVALID)
+            return wxDragNone;
+        return m_win->OnDragOver( format, x, y, def);
+    }
+

     virtual bool OnDrop( wxCoord x, wxCoord y )
     virtual bool OnDrop( wxCoord x, wxCoord y )

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

     virtual wxDragResult OnData( wxCoord x, wxCoord y, wxDragResult def )
     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 );
-        }
-        
+    {
+        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;
 };
 
     virtual void OnLeave()
         { m_win->OnLeave(); }
 
     wxDataViewMainWindow   *m_win;
 };
 

+#endif // wxUSE_DRAG_AND_DROP
+

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


@@ -1197,8 +1259,9 @@ void wxDataViewRenameTimer::Notify()
 // wxDataViewMainWindow
 //-----------------------------------------------------------------------------
 
 // 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 )
 {
 
 int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )
 {


@@ -1207,7 +1270,6 @@ int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )
     return -1;
 }
 
     return -1;
 }
 

-

 IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow)
 
 BEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow)
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow)
 
 BEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow)


@@ -1235,16 +1297,19 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
 
     m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1
 
 
     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_dragCount = 0;
     m_dragStart = wxPoint(0,0);

-    m_lineLastClicked = (unsigned int) -1;
-    m_lineBeforeLastClicked = (unsigned int) -1;
-    m_lineSelectSingleOnUp = (unsigned int) -1;

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

 
     m_hasFocus = false;
 
 
     m_hasFocus = false;
 


@@ -1254,13 +1319,14 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
 
     m_penRule = wxPen(GetRuleColour());
 
 
     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));
     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);
 
     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();
     m_count = -1;
     m_underMouse = NULL;
     UpdateDisplay();


@@ -1272,22 +1338,24 @@ wxDataViewMainWindow::~wxDataViewMainWindow()
     delete m_renameTimer;
 }
 
     delete m_renameTimer;
 }
 

+
+#if wxUSE_DRAG_AND_DROP

 bool wxDataViewMainWindow::EnableDragSource( const wxDataFormat &format )
 {
     m_dragFormat = format;
     m_dragEnabled = format != wxDF_INVALID;
 bool wxDataViewMainWindow::EnableDragSource( const wxDataFormat &format )
 {
     m_dragFormat = format;
     m_dragEnabled = format != wxDF_INVALID;

-    
+

     return true;
 }
     return true;
 }

-    
+

 bool wxDataViewMainWindow::EnableDropTarget( const wxDataFormat &format )
 {
     m_dropFormat = format;
     m_dropEnabled = format != wxDF_INVALID;
 bool wxDataViewMainWindow::EnableDropTarget( const wxDataFormat &format )
 {
     m_dropFormat = format;
     m_dropEnabled = format != wxDF_INVALID;

-    
+

     if (m_dropEnabled)
         SetDropTarget( new wxDataViewDropTarget( new wxCustomDataObject( format ), this ) );
     if (m_dropEnabled)
         SetDropTarget( new wxDataViewDropTarget( new wxCustomDataObject( format ), this ) );

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -1301,7 +1369,8 @@ void wxDataViewMainWindow::RemoveDropHint()
     }
 }
 
     }
 }
 

-wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def )
+wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x,
+                                               wxCoord y, wxDragResult def )

 {
     int xx = x;
     int yy = y;
 {
     int xx = x;
     int yy = y;


@@ -1309,15 +1378,15 @@ wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, w
     unsigned int row = GetLineAt( yy );
 
     if ((row >= GetRowCount()) || (yy > GetEndOfLastCol()))
     unsigned int row = GetLineAt( yy );
 
     if ((row >= GetRowCount()) || (yy > GetEndOfLastCol()))

-    {   
+    {

         RemoveDropHint();
         return wxDragNone;
     }
 
     wxDataViewItem item = GetItemByRow( row );
         RemoveDropHint();
         return wxDragNone;
     }
 
     wxDataViewItem item = GetItemByRow( row );

-    
+

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

-    
+

     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
     event.SetEventObject( m_owner );
     event.SetItem( item );
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
     event.SetEventObject( m_owner );
     event.SetItem( item );


@@ -1335,13 +1404,13 @@ wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, w
         return wxDragNone;
     }
 
         return wxDragNone;
     }
 

-    
+

     if (m_dropHint && (row != m_dropHintLine))
         RefreshRow( m_dropHintLine );
     m_dropHint = true;
     m_dropHintLine = row;
     RefreshRow( row );
     if (m_dropHint && (row != m_dropHintLine))
         RefreshRow( m_dropHintLine );
     m_dropHint = true;
     m_dropHintLine = row;
     RefreshRow( row );

-    
+

     return def;
 }
 
     return def;
 }
 


@@ -1358,9 +1427,9 @@ bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y )
         return false;
 
     wxDataViewItem item = GetItemByRow( row );
         return false;
 
     wxDataViewItem item = GetItemByRow( row );

-    
+

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

-    
+

     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
     event.SetEventObject( m_owner );
     event.SetItem( item );
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
     event.SetEventObject( m_owner );
     event.SetItem( item );


@@ -1375,7 +1444,8 @@ bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y )
     return true;
 }
 
     return true;
 }
 

-wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def )
+wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoord y,
+                                           wxDragResult def )

 {
     int xx = x;
     int yy = y;
 {
     int xx = x;
     int yy = y;


@@ -1386,9 +1456,9 @@ wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoo
         return wxDragNone;
 
     wxDataViewItem item = GetItemByRow( row );
         return wxDragNone;
 
     wxDataViewItem item = GetItemByRow( row );

-    
+

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

-    
+

     wxCustomDataObject *obj = (wxCustomDataObject *) GetDropTarget()->GetDataObject();
 
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, m_owner->GetId() );
     wxCustomDataObject *obj = (wxCustomDataObject *) GetDropTarget()->GetDataObject();
 
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, m_owner->GetId() );


@@ -1412,17 +1482,99 @@ void wxDataViewMainWindow::OnLeave()
     RemoveDropHint();
 }
 
     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 );
+
+        wxDataViewItemAttr attr;
+        model->GetAttr(item, column->GetModelColumn(), attr);
+        cell->SetAttr(attr);
+
+        wxRect item_rect(x, 0, width, height);
+        item_rect.Deflate(PADDING_RIGHTLEFT, 0);
+
+        // dc.SetClippingRegion( item_rect );
+        cell->WXCallRender(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();
     wxAutoBufferedPaintDC dc( this );
 
 #ifdef __WXMSW__
 void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxDataViewModel *model = GetOwner()->GetModel();
     wxAutoBufferedPaintDC dc( this );
 
 #ifdef __WXMSW__

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

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

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

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


@@ -1436,11 +1588,24 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     unsigned int item_start = GetLineAt( wxMax(0,update.y) );
     unsigned int item_count =
         wxMin( (int)(  GetLineAt( wxMax(0,update.y+update.height) ) - item_start + 1),
     unsigned int item_start = GetLineAt( wxMax(0,update.y) );
     unsigned int item_count =
         wxMin( (int)(  GetLineAt( wxMax(0,update.y+update.height) ) - item_start + 1),

-               (int)(GetRowCount( ) - item_start));
+            (int)(GetRowCount( ) - item_start));

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

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

 
     // compute which columns needs to be redrawn
     unsigned int cols = GetOwner()->GetColumnCount();
 
     // compute which columns needs to be redrawn
     unsigned int cols = GetOwner()->GetColumnCount();

+    if ( !cols )
+    {
+        // we assume that we have at least one column below and painting an
+        // empty control is unnecessary anyhow
+        return;
+    }
+

     unsigned int col_start = 0;
     unsigned int x_start;
     for (x_start = 0; col_start < cols; col_start++)
     unsigned int col_start = 0;
     unsigned int x_start;
     for (x_start = 0; col_start < cols; col_start++)


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

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

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


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

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

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


@@ -1529,14 +1695,17 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                                 );
         }
     }
                                 );
         }
     }

-    
+
+#if wxUSE_DRAG_AND_DROP

     if (m_dropHint)
     if (m_dropHint)

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

         dc.SetPen( *wxBLACK_PEN );
         dc.SetBrush( *wxTRANSPARENT_BRUSH );
         dc.DrawRectangle( rect );
     }
         dc.SetPen( *wxBLACK_PEN );
         dc.SetBrush( *wxTRANSPARENT_BRUSH );
         dc.DrawRectangle( rect );
     }

+#endif // wxUSE_DRAG_AND_DROP

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


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

-

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

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

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


@@ -1574,61 +1742,66 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
                 dataitem = node->GetItem();
 
 
                 dataitem = node->GetItem();
 

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

                     continue;
             }
             else
             {
                     continue;
             }
             else
             {

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

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

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

 
             // update cell_rect
             cell_rect.y = GetLineStart( item );
 
             // 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.
+            // deal with the expander

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

-                indent = node->GetIndentLevel();
-
-                //Calculate the indent first
-                indent = cell_rect.x + GetOwner()->GetIndent() * indent;
-
-                int expander_width = m_lineHeight - 2*EXPANDER_MARGIN;
-                // change the cell_rect.x to the appropriate pos
-                int  expander_x = indent + EXPANDER_MARGIN;
-                int expander_y = cell_rect.y + EXPANDER_MARGIN + (GetLineHeight(item) / 2) - (expander_width/2) - EXPANDER_OFFSET;
-                indent = indent + m_lineHeight;  //try to use the m_lineHeight as the expander space
-                dc.SetPen( m_penExpander );
-                dc.SetBrush( wxNullBrush );
-                if( node->HasChildren() )
+                // Calculate the indent first
+                indent = GetOwner()->GetIndent() * node->GetIndentLevel();
+
+                // we reserve m_lineHeight of horizontal space for the expander
+                // but leave EXPANDER_MARGIN around the expander itself
+                int exp_x = cell_rect.x + indent + EXPANDER_MARGIN;
+
+                indent += m_lineHeight;
+
+                // draw expander if needed and visible
+                if ( node->HasChildren() && exp_x < cell_rect.GetRight() )

                 {
                 {

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

                     int flag = 0;
                     int flag = 0;

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

                         flag |= wxCONTROL_CURRENT;
                         flag |= wxCONTROL_CURRENT;

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

                 }
                 }

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

             }
             if (node && !node->HasChildren())
             {
             }
             if (node && !node->HasChildren())
             {


@@ -1637,38 +1810,15 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                 wxDELETE(node);
             }
 
                 wxDELETE(node);
             }
 

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

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

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

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


@@ -1681,9 +1831,9 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             //       respect the given wxRect's top & bottom coords, eventually
             //       violating only the left & right coords - however the user can
             //       make its own renderer and thus we cannot be sure of that.
             //       respect the given wxRect's top & bottom coords, eventually
             //       violating only the left & right coords - however the user can
             //       make its own renderer and thus we cannot be sure of that.

-            dc.SetClippingRegion( item_rect );
-            cell->Render( item_rect, &dc, state );
-            dc.DestroyClippingRegion();
+            wxDCClipper clip(dc, item_rect);
+
+            cell->WXCallRender(item_rect, &dc, state);

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


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

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

     {
     {

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

     }
     }

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

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

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

 
 

+    wxRect labelRect = GetItemRect(item, m_currentCol);
+
+    m_currentCol->GetRenderer()->StartEditing( item, labelRect );

 }
 
 }
 

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

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

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

 class DoJob
 {
 public:
     DoJob() { }
     virtual ~DoJob() { }
 
 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
     // 0: Job done, stop tranverse and return
     // 1: Ignore the current node's subtree and continue
     // 2: Job not done, continue


@@ -1785,7 +1920,7 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func )
                     continue;
                 case DoJob::CONT:
                 default:
                     continue;
                 case DoJob::CONT:
                 default:

-                   ;
+                ;

             }
     }
     return false;
             }
     }
     return false;


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

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

     {
     {

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

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


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

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

     {
     {

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

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

+        // TODO: why empty the entire selection?

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


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

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

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

-    //Manuplate selection
+    // Manipolate selection

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


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

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

     m_count = -1;
     node->ChangeSubTreeCount(sub);
 
     m_count = -1;
     node->ChangeSubTreeCount(sub);
 

-    //Change the current row to the last row if the current exceed the max row number
+    // Change the current row to the last row if the current exceed the max row number

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


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

-    //Send event
+    // Send event

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


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

-    //Send event
+    // Send event

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


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

+    m_underMouse = NULL;

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


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

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

 
 

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

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


@@ -2250,7 +2393,7 @@ void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow )
 void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event)
 {
     wxCHECK_RET( newCurrent < GetRowCount(),
 void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event)
 {
     wxCHECK_RET( newCurrent < GetRowCount(),

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

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


@@ -2344,18 +2487,20 @@ int wxDataViewMainWindow::GetLineStart( unsigned int row ) const
                 if (column->IsHidden())
                     continue;      // skip it!
 
                 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!
 
                     continue;      // skip it!
 

-                const wxDataViewRenderer *renderer = column->GetRenderer();

                 wxVariant value;
                 model->GetValue( value, item, column->GetModelColumn() );
                 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 );
             }
 
                 height = wxMax( height, renderer->GetSize().y );
             }
 

-

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


@@ -2380,14 +2525,14 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const
     unsigned int yy = 0;
     for (;;)
     {
     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())
         {
 
         if (node && !node->HasChildren())
         {


@@ -2396,31 +2541,34 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const
             wxDELETE(node);
         }
 
             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!
 
             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!
 
                 continue;      // skip it!
 

-            const wxDataViewRenderer *renderer = column->GetRenderer();

             wxVariant value;
             model->GetValue( value, item, column->GetModelColumn() );
             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 );
             height = wxMax( height, renderer->GetSize().y );

-       }
+        }

 
 

-       yy += height;
-       if (y < yy)
-           return row;
+        yy += height;
+        if (y < yy)
+            return row;

 
 

-       row++;
+        row++;

     }
 }
 
     }
 }
 


@@ -2442,7 +2590,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
         {
                 // 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;
         }
 
         int height = m_lineHeight;


@@ -2455,14 +2603,17 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
             if (column->IsHidden())
                 continue;      // skip it!
 
             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!
 
                 continue;      // skip it!
 

-            const wxDataViewRenderer *renderer = column->GetRenderer();

             wxVariant value;
             model->GetValue( value, item, column->GetModelColumn() );
             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 );
         }
 
             height = wxMax( height, renderer->GetSize().y );
         }
 


@@ -2477,14 +2628,15 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
 class RowToItemJob: public DoJob
 {
 public:
 class RowToItemJob: public DoJob
 {
 public:

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

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

-         {
+        {

             ret = node->GetItem();
             return DoJob::OK;
         }
             ret = node->GetItem();
             return DoJob::OK;
         }


@@ -2496,8 +2648,10 @@ public:
         }
         else
         {
         }
         else
         {

-            //If the current has no child node, we can find the desired item of the row number directly.
-            //This if can speed up finding in some case, and will has a very good effect when it comes to list view
+            // If the current has no child node, we can find the desired item of the row
+            // number directly.
+            // This if can speed up finding in some case, and will has a very good effect
+            // when it comes to list view

             if( node->GetNodes().GetCount() == 0)
             {
                 int index = static_cast<int>(row) - current - 1;
             if( node->GetNodes().GetCount() == 0)
             {
                 int index = static_cast<int>(row) - current - 1;


@@ -2512,13 +2666,16 @@ public:
     {
         current ++;
         if( current == static_cast<int>(row))
     {
         current ++;
         if( current == static_cast<int>(row))

-         {
+        {

             ret = wxDataViewItem( n );
             return DoJob::OK;
         }
         return DoJob::CONT;
     }
             ret = wxDataViewItem( n );
             return DoJob::OK;
         }
         return DoJob::CONT;
     }

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

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


@@ -2527,9 +2684,9 @@ private:
 
 wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const
 {
 
 wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const
 {

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

     {
     {

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

     }
     else
     {
     }
     else
     {


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

-         {
+        {

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


@@ -2568,8 +2725,11 @@ public:
         else
         {
             parent = node;
         else
         {
             parent = node;

-            //If the current has no child node, we can find the desired item of the row number directly.
-            //This if can speed up finding in some case, and will has a very good effect when it comes to list view
+
+            // If the current node has no children, we can find the desired item of the
+            // row number directly.
+            // This if can speed up finding in some case, and will have a very good
+            // effect for list views.

             if( node->GetNodes().GetCount() == 0)
             {
                 int index = static_cast<int>(row) - current - 1;
             if( node->GetNodes().GetCount() == 0)
             {
                 int index = static_cast<int>(row) - current - 1;


@@ -2581,15 +2741,13 @@ public:
             }
             return DoJob::CONT;
         }
             }
             return DoJob::CONT;
         }

-
-

     }
 
     virtual int operator() ( void * n )
     {
         current ++;
         if( current == static_cast<int>(row))
     }
 
     virtual int operator() ( void * n )
     {
         current ++;
         if( current == static_cast<int>(row))

-         {
+        {

             ret = new wxDataViewTreeNode( parent );
             ret->SetItem( wxDataViewItem( n ));
             ret->SetHasChildren(false);
             ret = new wxDataViewTreeNode( parent );
             ret->SetItem( wxDataViewItem( n ));
             ret->SetHasChildren(false);


@@ -2598,7 +2756,10 @@ public:
 
         return DoJob::CONT;
     }
 
         return DoJob::CONT;
     }

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

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


@@ -2606,7 +2767,6 @@ private:
     wxDataViewTreeNode * parent;
 };
 
     wxDataViewTreeNode * parent;
 };
 

-

 wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) const
 {
     wxASSERT( !IsVirtualList() );
 wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) const
 {
     wxASSERT( !IsVirtualList() );


@@ -2616,7 +2776,8 @@ wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) co
     return job.GetResult();
 }
 
     return job.GetResult();
 }
 

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

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


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

-

 bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const
 {
     if (IsVirtualList())
 bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const
 {
     if (IsVirtualList())

-       return false;
-       
+        return false;
+

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

-       return false;
-       
+        return false;
+

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

-       delete node;
-       return false;
+        delete node;
+        return false;

     }
     }

-    
+

     return node->IsOpen();
 }
 
     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::OnExpanding( unsigned int row )
+void wxDataViewMainWindow::Expand( unsigned int row )

 {
     if (IsVirtualList())
 {
     if (IsVirtualList())

-       return;
+        return;

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

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

     {
     {

-        if( node->HasChildren())
-        {
-            if( !node->IsOpen())
+        delete node;
+        return;
+    }
+
+            if (!node->IsOpen())

             {
             {

-               wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,node->GetItem());
-               //Check if the user prevent expanding
-               if( e.GetSkipped() )
+                wxDataViewEvent e =
+                    SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, node->GetItem());
+
+                // Check if the user prevent expanding
+                if( e.GetSkipped() )

                     return;
 
                     return;
 

-               node->ToggleOpen();
-               //Here I build the children of current node
-               if( node->GetChildrenNumber() == 0 )
-               {
-                   SortPrepare();
-                   ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);
-               }
-               m_count = -1;
-               UpdateDisplay();
-               //Send the expanded event
-               SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem());
-            }
-            else
-            {
-                SelectRow( row, false );
-                SelectRow( row + 1, true );
-                ChangeCurrentRow( row + 1 );
-                SendSelectionChangedEvent( GetItemByRow(row+1));
+                node->ToggleOpen();
+
+                // build the children of current node
+                if( node->GetChildrenNumber() == 0 )
+                {
+                    SortPrepare();
+                    ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);
+                }
+
+                // By expanding the node all row indices that are currently in the selection list
+                // and are greater than our node have become invalid. So we have to correct that now.
+                const unsigned rowAdjustment = node->GetSubTreeCount();
+                for(unsigned i=0; i<m_selection.size(); ++i)
+                {
+                    const unsigned testRow = m_selection[i];
+                    // all rows above us are not affected, so skip them
+                    if(testRow <= row)
+                        continue;
+
+                    m_selection[i] += rowAdjustment;
+                }
+
+                if(m_currentRow > row)
+                    ChangeCurrentRow(m_currentRow + rowAdjustment);
+
+                m_count = -1;
+                UpdateDisplay();
+                // Send the expanded event
+                SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem());

             }
             }

-        }
-        else
-            delete node;
-    }

 }
 
 }
 

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

 {
     if (IsVirtualList())
 {
     if (IsVirtualList())

-       return;
+        return;

 
 

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

     {
     {

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

 
 

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

         {
         {

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

             if( e.GetSkipped() )
                 return;
             if( e.GetSkipped() )
                 return;

+
+            // Find out if there are selected items below the current node.
+            bool selectCollapsingRow = false;
+            const unsigned rowAdjustment = node->GetSubTreeCount();
+            unsigned maxRowToBeTested = row + rowAdjustment;
+            for(unsigned i=0; i<m_selection.size(); ++i)
+            {
+                const unsigned testRow = m_selection[i];
+                if(testRow > row && testRow <= maxRowToBeTested)
+                {
+                    selectCollapsingRow = true;
+                    // get out as soon as we have found a node that is selected
+                    break;
+                }
+            }
+

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

-            m_count = -1;
-            UpdateDisplay();
-            SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,nd->GetItem());
-        }
-        else
-        {
-            node = node->GetParent();
-            if( node != NULL )
+
+            // If the node to be closed has selected items the user won't see those any longer.
+            // We select the collapsing node in this case.
+            if(selectCollapsingRow)
+            {
+                SelectAllRows(false);
+                ChangeCurrentRow(row);
+                SelectRow(row, true);
+                SendSelectionChangedEvent(GetItemByRow(row));
+            }
+            else

             {
             {

-                int  parent = GetRowByItem( node->GetItem() );
-                if( parent >= 0 )
+                // if there were no selected items below our node we still need to "fix" the
+                // selection list to adjust for the changing of the row indices.
+                // We actually do the opposite of what we are doing in Expand().
+                for(unsigned i=0; i<m_selection.size(); ++i)

                 {
                 {

-                    SelectRow( row, false);
-                    SelectRow(parent , true );
-                    ChangeCurrentRow( parent );
-                    SendSelectionChangedEvent( node->GetItem() );
+                    const unsigned testRow = m_selection[i];
+                    // all rows above us are not affected, so skip them
+                    if(testRow <= row)
+                        continue;
+
+                    m_selection[i] -= rowAdjustment;

                 }
                 }

+
+                // if the "current row" is being collapsed away we change it to the current row ;-)
+                if(m_currentRow > row && m_currentRow <= maxRowToBeTested)
+                    ChangeCurrentRow(row);
+                else if(m_currentRow > row)
+                    ChangeCurrentRow(m_currentRow - rowAdjustment);

             }
             }

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

         }
         }

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

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


@@ -2736,11 +2963,11 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
     wxDataViewModel * model = GetOwner()->GetModel();
     if( model == NULL )
         return NULL;
     wxDataViewModel * model = GetOwner()->GetModel();
     if( model == NULL )
         return NULL;

-        
+

     if (!item.IsOk())
         return m_root;
 
     if (!item.IsOk())
         return m_root;
 

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

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


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

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

     wxDataViewTreeNode * node = m_root;
     for( ItemList::const_iterator iter = list.begin(); iter !=list.end(); iter++ )
     {
     wxDataViewTreeNode * node = m_root;
     for( ItemList::const_iterator iter = list.begin(); iter !=list.end(); iter++ )
     {


@@ -2773,7 +3000,7 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
                 if (nodes[i]->GetItem() == (**iter))
                 {
                     if (nodes[i]->GetItem() == item)
                 if (nodes[i]->GetItem() == (**iter))
                 {
                     if (nodes[i]->GetItem() == item)

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

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


@@ -2789,7 +3016,8 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
     return NULL;
 }
 
     return NULL;
 }
 

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

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


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

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

 {
 {

+    int xpos = 0;
+    int width = 0;
+
+    unsigned int cols = GetOwner()->GetColumnCount();
+    // If column is null the loop will compute the combined width of all columns.
+    // Otherwise, it will compute the x position of the column we are looking for.
+    for (unsigned int i = 0; i < cols; i++)
+    {
+        wxDataViewColumn* col = GetOwner()->GetColumnAt( i );
+
+        if (col == column)
+            break;
+
+        if (col->IsHidden())
+            continue;      // skip it!
+
+        xpos += col->GetWidth();
+        width += col->GetWidth();
+    }
+
+    if(column != 0)
+    {
+        // If we have a column, we need can get its width directly.
+        if(column->IsHidden())
+            width = 0;
+        else
+            width = column->GetWidth();
+
+    }
+    else
+    {
+        // If we have no column, we reset the x position back to zero.
+        xpos = 0;
+    }
+
+    // we have to take an expander column into account and compute its indentation
+    // to get the correct x position where the actual text is
+    int indent = 0;

     int row = GetRowByItem(item);
     int row = GetRowByItem(item);

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

     {
     {

-       col = GetOwner()->GetColumnAt( i );
-       x += col->GetWidth();
-       if( GetOwner()->GetColumnAt(i+1) == column )
-           break;
+        wxDataViewTreeNode* node = GetTreeNodeByRow(row);
+        indent = GetOwner()->GetIndent() * node->GetIndentLevel();
+        indent = indent + m_lineHeight; // use m_lineHeight as the width of the expander
+
+        if(!node->HasChildren())
+            delete node;

     }
     }

-    int w = col->GetWidth();
-    m_owner->CalcScrolledPosition( x, y, &x, &y );
-    return wxRect(x, y, w, h);
+
+    wxRect itemRect( xpos + indent,
+                     GetLineStart( row ),
+                     width - indent,
+                     GetLineHeight( row ) );
+
+    GetOwner()->CalcScrolledPosition(  itemRect.x,  itemRect.y,
+                                      &itemRect.x, &itemRect.y );
+
+    return itemRect;

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

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

     {
     {

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

     }
     else
     {
     }
     else
     {


@@ -2854,30 +3124,30 @@ class ItemToRowJob : public DoJob
 public:
     ItemToRowJob(const wxDataViewItem& item_, ItemList::const_iterator iter)
         : m_iter(iter),
 public:
     ItemToRowJob(const wxDataViewItem& item_, ItemList::const_iterator iter)
         : m_iter(iter),

-          item(item_)
+        item(item_)

     {
         ret = -1;
     }
 
     {
         ret = -1;
     }
 

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

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

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

 
 

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

 
     }
 
 
     }
 


@@ -2888,8 +3158,10 @@ public:
             return DoJob::OK;
         return DoJob::CONT;
     }
             return DoJob::OK;
         return DoJob::CONT;
     }

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

 
 private:
     ItemList::const_iterator  m_iter;
 
 private:
     ItemList::const_iterator  m_iter;


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

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

     {
     {

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

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

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

         ItemList list;
         wxDataViewItem * pItem;
         list.DeleteContents( true );
         ItemList list;
         wxDataViewItem * pItem;
         list.DeleteContents( true );


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

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

 {
     if( !model->IsContainer( item ) )
         return;
 
     wxDataViewItemArray children;
     unsigned int num = model->GetChildren( item, children);
 {
     if( !model->IsContainer( item ) )
         return;
 
     wxDataViewItemArray children;
     unsigned int num = model->GetChildren( item, children);

-    
+

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


@@ -2977,7 +3250,7 @@ void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
     m_root = new wxDataViewTreeNode( NULL );
     m_root->SetHasChildren(true);
 
     m_root = new wxDataViewTreeNode( NULL );
     m_root->SetHasChildren(true);
 

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

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


@@ -2989,12 +3262,9 @@ static void DestroyTreeHelper( wxDataViewTreeNode * node )
     if( node->GetNodeNumber() != 0 )
     {
         int len = node->GetNodeNumber();
     if( node->GetNodeNumber() != 0 )
     {
         int len = node->GetNodeNumber();

-        int i = 0;

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

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

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

-        }

     }
     delete node;
 }
     }
     delete node;
 }


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

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

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

-    if ( GetParent()->HandleAsNavigationKey(event) )
+    wxWindow * const parent = GetParent();
+
+    // propagate the char event upwards
+    wxKeyEvent eventForParent(event);
+    eventForParent.SetEventObject(parent);
+    if ( parent->ProcessWindowEvent(eventForParent) )
+        return;
+
+    if ( parent->HandleAsNavigationKey(event) )

         return;
 
     // no item -> nothing to do
         return;
 
     // no item -> nothing to do


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

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

 
     switch ( event.GetKeyCode() )
     {
         case WXK_RETURN:
 
     switch ( event.GetKeyCode() )
     {
         case WXK_RETURN:

-        {
-            if (m_currentRow >= 0)

             {
             {

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

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


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

-        }
+

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


@@ -3050,18 +3326,64 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
             if ( m_currentRow < GetRowCount() - 1 )
                 OnArrowChar( m_currentRow + 1, event );
             break;
             if ( m_currentRow < GetRowCount() - 1 )
                 OnArrowChar( m_currentRow + 1, event );
             break;

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

         case WXK_LEFT:
         case WXK_LEFT:

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

         case WXK_END:
         case WXK_END:

+        {

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

-
+        }

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


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

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

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


@@ -3136,8 +3468,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         return;
     }
 
         return;
     }
 

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

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


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

-            wxRect rect( xpos + indent + EXPANDER_MARGIN,
-                         GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET,
-                         m_lineHeight-2*EXPANDER_MARGIN,
-                         m_lineHeight-2*EXPANDER_MARGIN + 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)
                 {
                 if (m_underMouse && m_underMouse != node)
                 {

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

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

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

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


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

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

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

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

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


@@ -3181,6 +3515,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
     wxDataViewModel *model = GetOwner()->GetModel();
 
 
     wxDataViewModel *model = GetOwner()->GetModel();
 

+#if wxUSE_DRAG_AND_DROP

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


@@ -3198,7 +3533,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
 
         if (event.LeftIsDown())
         {
 
         if (event.LeftIsDown())
         {

-            m_owner->CalcUnscrolledPosition( m_dragStart.x, m_dragStart.y, &m_dragStart.x, &m_dragStart.y );
+            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 );
 
             unsigned int drag_item_row = GetLineAt( m_dragStart.y );
             wxDataViewItem item = GetItemByRow( drag_item_row );
 


@@ -3209,19 +3545,17 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             event.SetModel( model );
             if (!m_owner->HandleWindowEvent( event ))
                 return;
             event.SetModel( model );
             if (!m_owner->HandleWindowEvent( event ))
                 return;

-        
+

             if (!event.IsAllowed())
                 return;
             if (!event.IsAllowed())
                 return;

-        
+

             wxDataObject *obj = event.GetDataObject();
             if (!obj)
                 return;
             wxDataObject *obj = event.GetDataObject();
             if (!obj)
                 return;

-        
-            wxDropSource drag( m_owner );
+
+            wxDataViewDropSource drag( this, drag_item_row );

             drag.SetData( *obj );
             drag.SetData( *obj );

-            // wxImage image( 80, 20 );
-            // wxBitmap bitmap( image );
-            wxDragResult res = drag.DoDragDrop();
+            /* wxDragResult res = */ drag.DoDragDrop();

             delete obj;
         }
         return;
             delete obj;
         }
         return;


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

+#endif // wxUSE_DRAG_AND_DROP

 
 

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

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


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

-         (model->IsContainer(item)) &&
-         (!model->HasContainerColumns(item)));
+        (model->IsContainer(item)) &&
+        (!model->HasContainerColumns(item)));

 
     if (event.LeftDClick())
     {
 
     if (event.LeftDClick())
     {

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

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

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

                 wxVariant value;
                 wxVariant value;

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

 
 

+                    wxRect cell_rect( xpos, GetLineStart( current ),
+                                    col->GetWidth(), GetLineHeight( current ) );
+                    custom->Activate( cell_rect, model, item, colIdx );
+                }

             }
             else
             {
             }
             else
             {


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

-            forceClick = true;
+            simulateClick = true;

         }
     }
 
         }
     }
 

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

     {
         if (m_lineSelectSingleOnUp != (unsigned int)-1)
         {
     {
         if (m_lineSelectSingleOnUp != (unsigned int)-1)
         {


@@ -3289,34 +3637,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             SendSelectionChangedEvent( GetItemByRow(m_lineSelectSingleOnUp) );
         }
 
             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) )
         {
             if ((col == m_currentCol) && (current == m_currentRow) &&
                 (cell->GetMode() & wxDATAVIEW_CELL_EDITABLE) )


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

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

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


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

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

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


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

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

     {
         SetFocus();
 
     {
         SetFocus();
 


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

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

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

-                       lineTo = current;
+                    lineTo = current;

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


@@ -3418,7 +3756,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             else // !ctrl, !shift
             {
                 // test in the enclosing if should make it impossible
             else // !ctrl, !shift
             {
                 // test in the enclosing if should make it impossible

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

             }
         }
 
             }
         }
 


@@ -3430,19 +3768,23 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         // Update selection here...
         m_currentCol = col;
 
         // Update selection here...
         m_currentCol = col;
 

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

                         (current == oldCurrentRow)) && oldWasSelected;
 
         // Call LeftClick after everything else as under GTK+
         if (cell->GetMode() & wxDATAVIEW_CELL_ACTIVATABLE)
         {
                         (current == oldCurrentRow)) && oldWasSelected;
 
         // Call LeftClick after everything else as under GTK+
         if (cell->GetMode() & wxDATAVIEW_CELL_ACTIVATABLE)
         {

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

         }
     }
 }
         }
     }
 }


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

+

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

-

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


@@ -3506,11 +3848,11 @@ void wxDataViewCtrl::Init()
 }
 
 bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,

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

 {
 {

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

 
     Init();
 
 
     Init();
 


@@ -3526,6 +3868,11 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
 
     m_clientArea = new wxDataViewMainWindow( this, wxID_ANY );
 
 
     m_clientArea = new wxDataViewMainWindow( this, wxID_ANY );
 

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

     if (HasFlag(wxDV_NO_HEADER))
         m_headerArea = NULL;
     else
     if (HasFlag(wxDV_NO_HEADER))
         m_headerArea = NULL;
     else


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

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

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

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

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


@@ -3565,7 +3917,7 @@ wxSize wxDataViewCtrl::GetSizeAvailableForScrollTarget(const wxSize& size)
 {
     wxSize newsize = size;
     if (!HasFlag(wxDV_NO_HEADER) && (m_headerArea))
 {
     wxSize newsize = size;
     if (!HasFlag(wxDV_NO_HEADER) && (m_headerArea))

-       newsize.y -= m_headerArea->GetSize().y;
+    newsize.y -= m_headerArea->GetSize().y;

 
     return newsize;
 }
 
     return newsize;
 }


@@ -3608,6 +3960,8 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
     return true;
 }
 
     return true;
 }
 

+#if wxUSE_DRAG_AND_DROP
+

 bool wxDataViewCtrl::EnableDragSource( const wxDataFormat &format )
 {
     return m_clientArea->EnableDragSource( format );
 bool wxDataViewCtrl::EnableDragSource( const wxDataFormat &format )
 {
     return m_clientArea->EnableDragSource( format );


@@ -3618,6 +3972,8 @@ bool wxDataViewCtrl::EnableDropTarget( const wxDataFormat &format )
     return m_clientArea->EnableDropTarget( format );
 }
 
     return m_clientArea->EnableDropTarget( format );
 }
 

+#endif // wxUSE_DRAG_AND_DROP
+

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


@@ -3689,7 +4045,7 @@ 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]
     // 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;
+                                    : pos;

 
     return GetColumn(idx);
 }
 
     return GetColumn(idx);
 }


@@ -3707,7 +4063,7 @@ int wxDataViewCtrl::GetColumnIndex(const wxDataViewColumn *column) const
 }
 
 void wxDataViewCtrl::ColumnMoved(wxDataViewColumn * WXUNUSED(col),
 }
 
 void wxDataViewCtrl::ColumnMoved(wxDataViewColumn * WXUNUSED(col),

-                                 unsigned int WXUNUSED(new_pos))
+                                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
 {
     // 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


@@ -3736,6 +4092,18 @@ bool wxDataViewCtrl::ClearColumns()
 
 int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
 {
 
 int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
 {

+#if 1
+    unsigned int len = GetColumnCount();
+    for ( unsigned int i = 0; i < len; i++ )
+    {
+        wxDataViewColumn * col = GetColumnAt(i);
+        if (column==col)
+            return i;
+    }
+    
+    return wxNOT_FOUND;
+#else
+    // This returns the position in pixels which is not what we want.

     int ret = 0,
         dummy = 0;
     unsigned int len = GetColumnCount();
     int ret = 0,
         dummy = 0;
     unsigned int len = GetColumnCount();


@@ -3752,15 +4120,16 @@ int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
         }
     }
     return ret;
         }
     }
     return ret;

+#endif

 }
 
 wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
 {
     return m_sortingColumnIdx == wxNOT_FOUND ? NULL
 }
 
 wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
 {
     return m_sortingColumnIdx == wxNOT_FOUND ? NULL

-                                             : GetColumn(m_sortingColumnIdx);
+                                            : GetColumn(m_sortingColumnIdx);

 }
 
 }
 

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

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


@@ -3795,27 +4164,31 @@ void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
             if (parent != last_parent)
                 ExpandAncestors(item);
         }
             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) );
     }
         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 );
     m_clientArea->SetSelections( selection );
 }
 
 void wxDataViewCtrl::Select( const wxDataViewItem & item )
 {
     ExpandAncestors( item );

-    
+

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

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

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

+            

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

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

     }
 }
 
     }
 }
 


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

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

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


@@ -3933,7 +4306,7 @@ void wxDataViewCtrl::EnsureVisible( int row, int column )
 void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn * column )
 {
     ExpandAncestors( item );
 void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn * column )
 {
     ExpandAncestors( item );

-  
+

     m_clientArea->RecalculateDisplay();
 
     int row = m_clientArea->GetRowByItem(item);
     m_clientArea->RecalculateDisplay();
 
     int row = m_clientArea->GetRowByItem(item);


@@ -3947,12 +4320,14 @@ void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataVie
 
 }
 
 
 }
 

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

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

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

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


@@ -3989,9 +4364,17 @@ bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
     return false;
 }
 
     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_GENERICDATAVIEWCTRL

 
 

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