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 6e46661662cf0d5bdc2311a4ed13c73d397aaf7d..dd7813621d9f095ad2afcc6792ee110a06fa9d55 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -53,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


@@ -70,12 +76,35 @@ static const int EXPANDER_OFFSET = 1;
 #endif
 
 // Below is the compare stuff.
 #endif
 
 // Below is the compare stuff.

-// For the generic implementation, both the leaf nodes and the nodes are sorted for 
+// 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;
 
 // fast search when needed
 static wxDataViewModel* g_model;
 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
 //-----------------------------------------------------------------------------


@@ -230,7 +259,7 @@ class wxDataViewTreeNode;
 WX_DEFINE_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes );
 WX_DEFINE_ARRAY( void* , wxDataViewTreeLeaves);
 
 WX_DEFINE_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes );
 WX_DEFINE_ARRAY( void* , wxDataViewTreeLeaves);
 

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

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


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

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

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


@@ -451,15 +480,15 @@ public:
     int GetEndOfLastCol() const;
     unsigned int GetFirstVisibleRow() 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 
+    // 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; }
     // expanding/collapsing of the tree nodes
     unsigned int GetLastVisibleRow();
     unsigned int GetRowCount();
 
     wxDataViewItem GetSelection() const;
     wxDataViewSelection GetSelections(){ return m_selection; }

-    void SetSelections( const wxDataViewSelection & sel ) 
+    void SetSelections( const wxDataViewSelection & sel )

         { m_selection = sel; UpdateDisplay(); }
     void Select( const wxArrayInt& aSelections );
     void SelectAllRows( bool on );
         { m_selection = sel; UpdateDisplay(); }
     void Select( const wxArrayInt& aSelections );
     void SelectAllRows( bool on );


@@ -495,9 +524,10 @@ public:
     void HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column );
     wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column );
 
     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 );
 
 #if wxUSE_DRAG_AND_DROP
     bool EnableDragSource( const wxDataFormat &format );


@@ -518,8 +548,6 @@ private:
     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 );
 


@@ -608,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()


@@ -647,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
 // ---------------------------------------------------------


@@ -672,28 +685,15 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
 {
 }
 
 {
 }
 

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

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

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

 {
 }
 
 {
 }
 


@@ -717,9 +717,15 @@ bool wxDataViewTextRenderer::HasEditorCtrl() const
 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 )


@@ -729,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;
 }
 


@@ -743,69 +749,15 @@ wxSize wxDataViewTextRenderer::GetSize() const
     return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE);
 }
 
     return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE);
 }
 

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

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

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

 {
 }
 
 {
 }
 


@@ -848,11 +800,11 @@ wxSize wxDataViewBitmapRenderer::GetSize() const
 // 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;
 }


@@ -877,6 +829,12 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state
     if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE)
         flags |= wxCONTROL_DISABLED;
 
     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,


@@ -886,15 +844,12 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state
     return true;
 }
 
     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


@@ -908,20 +863,16 @@ wxSize wxDataViewToggleRenderer::GetSize() const
 // 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;


@@ -938,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;
 }


@@ -1006,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 )

 {
 }
 
 {
 }
 


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

-    wxDataViewCustomRenderer( varianttype, mode, 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;


@@ -1101,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;
 }


@@ -1131,19 +1080,39 @@ 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;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -1291,7 +1260,7 @@ void wxDataViewRenameTimer::Notify()
 //-----------------------------------------------------------------------------
 
 // The tree building helper, declared firstly
 //-----------------------------------------------------------------------------
 
 // The tree building helper, declared firstly

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

                              wxDataViewTreeNode * node);
 
 int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )
                              wxDataViewTreeNode * node);
 
 int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )


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

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

                                                wxCoord y, wxDragResult def )
 {
     int xx = x;
                                                wxCoord y, wxDragResult def )
 {
     int xx = x;


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

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

                                            wxDragResult def )
 {
     int xx = x;
                                            wxDragResult def )
 {
     int xx = x;


@@ -1532,7 +1501,7 @@ wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent )
     {
         wxDataViewTreeNode *node = GetTreeNodeByRow(row);
         indent = GetOwner()->GetIndent() * node->GetIndentLevel();
     {
         wxDataViewTreeNode *node = GetTreeNodeByRow(row);
         indent = GetOwner()->GetIndent() * node->GetIndentLevel();

-        indent = indent + m_lineHeight;  
+        indent = indent + m_lineHeight;

             // try to use the m_lineHeight as the expander space
 
         if(!node->HasChildren())
             // try to use the m_lineHeight as the expander space
 
         if(!node->HasChildren())


@@ -1577,43 +1546,15 @@ wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent )
         model->GetValue( value, item, column->GetModelColumn());
         cell->SetValue( value );
 
         model->GetValue( value, item, column->GetModelColumn());
         cell->SetValue( value );
 

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

 
 

-        wxSize size = cell->GetSize();
-        size.x = wxMin( 2*PADDING_RIGHTLEFT + size.x, width );
-        size.y = height;
-        wxRect item_rect(x, 0, size.x, size.y);
-
-        int align = cell->CalculateAlignment();
-        // horizontal alignment:
-        item_rect.x = x;
-        if (align & wxALIGN_CENTER_HORIZONTAL)
-            item_rect.x = x + (width / 2) - (size.x / 2);
-        else if (align & wxALIGN_RIGHT)
-            item_rect.x = x + width - size.x;
-        // else: wxALIGN_LEFT is the default
-
-        // vertical alignment:
-        item_rect.y = 0;
-        if (align & wxALIGN_CENTER_VERTICAL)
-            item_rect.y = (height / 2) - (size.y / 2);
-        else if (align & wxALIGN_BOTTOM)
-            item_rect.y = height - size.y;
-        // else: wxALIGN_TOP is the default
-
-        // add padding
-        item_rect.x += PADDING_RIGHTLEFT;
-        item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;
+        wxRect item_rect(x, 0, width, height);
+        item_rect.Deflate(PADDING_RIGHTLEFT, 0);

 
         // dc.SetClippingRegion( item_rect );
 
         // dc.SetClippingRegion( item_rect );

-        cell->Render( item_rect, &dc, 0 );
+        cell->WXCallRender(item_rect, &dc, 0);

         // dc.DestroyClippingRegion();
 
         x += width;
         // dc.DestroyClippingRegion();
 
         x += width;


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

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

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

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

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


@@ -1651,9 +1590,22 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         wxMin( (int)(  GetLineAt( wxMax(0,update.y+update.height) ) - item_start + 1),
             (int)(GetRowCount( ) - item_start));
     unsigned int item_last = item_start + item_count;
         wxMin( (int)(  GetLineAt( wxMax(0,update.y+update.height) ) - item_start + 1),
             (int)(GetRowCount( ) - item_start));
     unsigned int item_last = item_start + item_count;

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


@@ -1732,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,


@@ -1747,7 +1700,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     if (m_dropHint)
     {
         wxRect rect( x_start, GetLineStart( m_dropHintLine ),
     if (m_dropHint)
     {
         wxRect rect( x_start, GetLineStart( m_dropHintLine ),

-                    x_last, GetLineHeight( 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 );


@@ -1771,7 +1724,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         wxDataViewRenderer *cell = col->GetRenderer();
         cell_rect.width = col->GetWidth();
 
         wxDataViewRenderer *cell = col->GetRenderer();
         cell_rect.width = col->GetWidth();
 

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

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


@@ -1789,65 +1742,62 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
                 dataitem = node->GetItem();
 
 
                 dataitem = node->GetItem();
 

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

                     !model->HasContainerColumns(dataitem))
                     continue;
             }
             else
             {
                     !model->HasContainerColumns(dataitem))
                     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 );
             cell_rect.height = GetLineHeight( item );
 
 
             // update cell_rect
             cell_rect.y = GetLineStart( item );
             cell_rect.height = GetLineHeight( item );
 

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

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

-                indent = node->GetIndentLevel();
-

                 // Calculate the indent first
                 // Calculate the indent first

-                indent = cell_rect.x + GetOwner()->GetIndent() * indent;
+                indent = GetOwner()->GetIndent() * node->GetIndentLevel();

 
 

-                int expander_width = m_lineHeight - 2*EXPANDER_MARGIN;
+                // 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;

 
 

-                // 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 += m_lineHeight;

 
 

-                indent = indent + m_lineHeight;  
-                    // try to use the m_lineHeight as the expander space
-
-                dc.SetPen( m_penExpander );
-                dc.SetBrush( wxNullBrush );
-                if( node->HasChildren() )
+                // 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
                 }
 
                 // force the expander column to left-center align


@@ -1860,40 +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))


@@ -1906,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;


@@ -1926,42 +1851,10 @@ void wxDataViewMainWindow::OnRenameTimer()
         wxSafeYield();
     }
 
         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();
-    }
-
-    // we have to take an expander column into account and compute its indentation
-    // to get the editor at the correct x position where the actual text is
-    int indent = 0;
-    if (!IsVirtualList() && GetOwner()->GetExpanderColumn() == m_currentCol)
-    {
-        wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
-        indent = GetOwner()->GetIndent() * node->GetIndentLevel();
-        indent = indent + m_lineHeight;
-
-        if(!node->HasChildren())
-            delete node;
-    }
-
-    wxRect labelRect( xpos + indent,
-                    GetLineStart( m_currentRow ),
-                    m_currentCol->GetWidth() - indent,
-                    GetLineHeight( m_currentRow ) );
+    wxDataViewItem item = GetItemByRow( m_currentRow );

 
 

-    GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y,
-                                    &labelRect.x, &labelRect.y);
+    wxRect labelRect = GetItemRect(item, m_currentCol);

 
 

-    wxDataViewItem item = GetItemByRow( m_currentRow );

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


@@ -2035,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;
     }


@@ -2073,14 +1968,18 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
 static void DestroyTreeHelper( wxDataViewTreeNode * node);
 
 bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
 static void DestroyTreeHelper( wxDataViewTreeNode * node);
 
 bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,

-                                    const wxDataViewItem& item)
+                                       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();


@@ -2091,7 +1990,7 @@ 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, 
+    wxCHECK_MSG( node->GetChildren().Index( item.GetID() ) != wxNOT_FOUND,

                  false, "item not found" );
 
     int sub = -1;
                  false, "item not found" );
 
     int sub = -1;


@@ -2202,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()


@@ -2493,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())


@@ -2587,15 +2487,15 @@ 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) && 
+                if ((col != 0) &&
+                    model->IsContainer(item) &&

                     !model->HasContainerColumns(item))
                     continue;      // skip it!
 
                 wxVariant value;
                 model->GetValue( value, item, column->GetModelColumn() );
 
                     !model->HasContainerColumns(item))
                     continue;      // skip it!
 
                 wxVariant value;
                 model->GetValue( value, item, column->GetModelColumn() );
 

-                wxDataViewRenderer *renderer = 
+                wxDataViewRenderer *renderer =

                     const_cast<wxDataViewRenderer*>(column->GetRenderer());
                 renderer->SetValue( value );
                 height = wxMax( height, renderer->GetSize().y );
                     const_cast<wxDataViewRenderer*>(column->GetRenderer());
                 renderer->SetValue( value );
                 height = wxMax( height, renderer->GetSize().y );


@@ -2650,15 +2550,15 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const
             if (column->IsHidden())
                 continue;      // skip it!
 
             if (column->IsHidden())
                 continue;      // skip it!
 

-            if ((col != 0) && 
-                model->IsContainer(item) && 
+            if ((col != 0) &&
+                model->IsContainer(item) &&

                 !model->HasContainerColumns(item))
                 continue;      // skip it!
 
             wxVariant value;
             model->GetValue( value, item, column->GetModelColumn() );
 
                 !model->HasContainerColumns(item))
                 continue;      // skip it!
 
             wxVariant value;
             model->GetValue( value, item, column->GetModelColumn() );
 

-            wxDataViewRenderer *renderer = 
+            wxDataViewRenderer *renderer =

                 const_cast<wxDataViewRenderer*>(column->GetRenderer());
             renderer->SetValue( value );
             height = wxMax( height, renderer->GetSize().y );
                 const_cast<wxDataViewRenderer*>(column->GetRenderer());
             renderer->SetValue( value );
             height = wxMax( height, renderer->GetSize().y );


@@ -2703,15 +2603,15 @@ 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) && 
+            if ((col != 0) &&
+                model->IsContainer(item) &&

                 !model->HasContainerColumns(item))
                 continue;      // skip it!
 
             wxVariant value;
             model->GetValue( value, item, column->GetModelColumn() );
 
                 !model->HasContainerColumns(item))
                 continue;      // skip it!
 
             wxVariant value;
             model->GetValue( value, item, column->GetModelColumn() );
 

-            wxDataViewRenderer *renderer = 
+            wxDataViewRenderer *renderer =

                 const_cast<wxDataViewRenderer*>(column->GetRenderer());
             renderer->SetValue( value );
             height = wxMax( height, renderer->GetSize().y );
                 const_cast<wxDataViewRenderer*>(column->GetRenderer());
             renderer->SetValue( value );
             height = wxMax( height, renderer->GetSize().y );


@@ -2728,7 +2628,7 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
 class RowToItemJob: public DoJob
 {
 public:
 class RowToItemJob: public DoJob
 {
 public:

-    RowToItemJob( unsigned int row , int current ) 
+    RowToItemJob( unsigned int row , int current )

         { this->row = row; this->current = current; }
     virtual ~RowToItemJob() {}
 
         { this->row = row; this->current = current; }
     virtual ~RowToItemJob() {}
 


@@ -2748,9 +2648,9 @@ public:
         }
         else
         {
         }
         else
         {

-            // If the current has no child node, we can find the desired item of the row 
+            // If the current has no child node, we can find the desired item of the row

             // number directly.
             // number directly.

-            // This if can speed up finding in some case, and will has a very good effect 
+            // 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)
             {
             // when it comes to list view
             if( node->GetNodes().GetCount() == 0)
             {


@@ -2784,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
     {


@@ -2826,9 +2726,9 @@ public:
         {
             parent = node;
 
         {
             parent = node;
 

-            // If the current node has no children, we can find the desired item of the 
+            // If the current node has no children, we can find the desired item of the

             // row number directly.
             // row number directly.

-            // This if can speed up finding in some case, and will have a very good 
+            // This if can speed up finding in some case, and will have a very good

             // effect for list views.
             if( node->GetNodes().GetCount() == 0)
             {
             // effect for list views.
             if( node->GetNodes().GetCount() == 0)
             {


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

-wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, 
+wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type,

                                                          const wxDataViewItem & item )
 {
     wxWindow *parent = GetParent();
                                                          const wxDataViewItem & item )
 {
     wxWindow *parent = GetParent();


@@ -2908,20 +2808,42 @@ bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const
     return node->IsOpen();
 }
 
     return node->IsOpen();
 }
 

+bool wxDataViewMainWindow::HasChildren( unsigned int row ) const
+{
+    if (IsVirtualList())
+        return false;

 
 

-void wxDataViewMainWindow::OnExpanding( unsigned int row )
+    wxDataViewTreeNode * node = GetTreeNodeByRow(row);
+    if (!node)
+        return false;
+
+    if (!node->HasChildren())
+    {
+        delete node;
+        return false;
+    }
+
+    return true;
+}
+
+void wxDataViewMainWindow::Expand( unsigned int row )

 {
     if (IsVirtualList())
         return;
 
     wxDataViewTreeNode * node = GetTreeNodeByRow(row);
 {
     if (IsVirtualList())
         return;
 
     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 = 
+                wxDataViewEvent e =

                     SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, node->GetItem());
 
                 // Check if the user prevent expanding
                     SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, node->GetItem());
 
                 // Check if the user prevent expanding


@@ -2958,23 +2880,9 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row )
                 // Send the expanded event
                 SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem());
             }
                 // Send the expanded event
                 SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem());
             }

-            else
-            {
-#if 0
-                // Why should we select the next row here???
-                SelectRow( row, false );
-                SelectRow( row + 1, true );
-                ChangeCurrentRow( row + 1 );
-                SendSelectionChangedEvent( GetItemByRow(row+1));
-#endif
-            }
-        }
-        else
-            delete node;
-    }

 }
 
 }
 

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

 {
     if (IsVirtualList())
         return;
 {
     if (IsVirtualList())
         return;


@@ -2982,16 +2890,16 @@ void wxDataViewMainWindow::OnCollapsing(unsigned int row)
     wxDataViewTreeNode *node = GetTreeNodeByRow(row);
     if (!node)
         return;
     wxDataViewTreeNode *node = GetTreeNodeByRow(row);
     if (!node)
         return;

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

     {
         delete node;
         return;
     }
 
     {
         delete node;
         return;
     }
 

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

         {
         {

-            wxDataViewEvent e = 
+            wxDataViewEvent e =

                 SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem());
             if( e.GetSkipped() )
                 return;
                 SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem());
             if( e.GetSkipped() )
                 return;


@@ -3026,7 +2934,7 @@ void wxDataViewMainWindow::OnCollapsing(unsigned int row)
             {
                 // 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.
             {
                 // 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 OnExpanding().
+                // We actually do the opposite of what we are doing in Expand().

                 for(unsigned i=0; i<m_selection.size(); ++i)
                 {
                     const unsigned testRow = m_selection[i];
                 for(unsigned i=0; i<m_selection.size(); ++i)
                 {
                     const unsigned testRow = m_selection[i];


@@ -3048,21 +2956,6 @@ void wxDataViewMainWindow::OnCollapsing(unsigned int row)
             UpdateDisplay();
             SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,node->GetItem());
         }
             UpdateDisplay();
             SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,node->GetItem());
         }

-        else
-        {
-            node = node->GetParent();
-            if( node != NULL )
-            {
-                int  parent = GetRowByItem( node->GetItem() );
-                if( parent >= 0 )
-                {
-                    SelectRow( row, false);
-                    SelectRow(parent , true );
-                    ChangeCurrentRow( parent );
-                    SendSelectionChangedEvent( node->GetItem() );
-                }
-            }
-        }

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


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

-void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, 
+void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item,

                                     wxDataViewColumn* &column )
 {
     wxDataViewColumn *col = NULL;
                                     wxDataViewColumn* &column )
 {
     wxDataViewColumn *col = NULL;


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

-wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, 
+wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item,

                                           const wxDataViewColumn* column )
 {
                                           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
     {


@@ -3243,9 +3176,9 @@ 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
     {
     }
     else
     {


@@ -3272,7 +3205,7 @@ int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) const
     }
 }
 
     }
 }
 

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

                              wxDataViewTreeNode * node)
 {
     if( !model->IsContainer( item ) )
                              wxDataViewTreeNode * node)
 {
     if( !model->IsContainer( item ) )


@@ -3348,7 +3281,15 @@ void wxDataViewMainWindow::DestroyTree()
 
 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


@@ -3360,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());


@@ -3377,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 );


@@ -3389,16 +3328,62 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
             break;
         // Add the process for tree expanding/collapsing
         case WXK_LEFT:
             break;
         // Add the process for tree expanding/collapsing
         case WXK_LEFT:

-        OnCollapsing(m_currentRow);
-        break;
-    case WXK_RIGHT:
-        OnExpanding( m_currentRow);
-        break;
+        {
+            if (IsVirtualList())
+               break;
+
+            wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
+            if (!node)
+                break;
+
+            if (node->HasChildren() && 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 );


@@ -3427,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();
     }


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

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


@@ -3596,12 +3591,21 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         {
             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
             {


@@ -3633,7 +3637,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             SendSelectionChangedEvent( GetItemByRow(m_lineSelectSingleOnUp) );
         }
 
             SendSelectionChangedEvent( GetItemByRow(m_lineSelectSingleOnUp) );
         }
 

-        // If the user click the expander, we do not do editing even if the column 
+        // 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)
         {
         // with expander are editable
         if (m_lastOnSame && !ignore_other_columns)
         {


@@ -3670,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();


@@ -3689,13 +3695,13 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     {
         wxDataViewTreeNode* node = GetTreeNodeByRow(current);
 
     {
         wxDataViewTreeNode* node = GetTreeNodeByRow(current);
 

-        // hoverOverExpander being true tells us that our node must be 
+        // 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() )
         // valid and have children.
         // So we don't need any extra checks.
         if( node->IsOpen() )

-            OnCollapsing(current);
+            Collapse(current);

         else
         else

-            OnExpanding(current);
+            Expand(current);

     }
     else if ((event.LeftDown() || simulateClick) && !hoverOverExpander)
     {
     }
     else if ((event.LeftDown() || simulateClick) && !hoverOverExpander)
     {


@@ -3729,7 +3735,7 @@ 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())
             {
             }
             else if (event.ShiftDown())
             {


@@ -3750,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?") );

             }
         }
 
             }
         }
 


@@ -3768,14 +3774,17 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         // Call LeftClick after everything else as under GTK+
         if (cell->GetMode() & wxDATAVIEW_CELL_ACTIVATABLE)
         {
         // 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());
+            }

         }
     }
 }
         }
     }
 }


@@ -3859,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


@@ -4078,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();


@@ -4094,6 +4120,7 @@ int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
         }
     }
     return ret;
         }
     }
     return ret;

+#endif

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


@@ -4157,7 +4184,11 @@ void wxDataViewCtrl::Select( const wxDataViewItem & item )
         // Unselect all rows before select another in the single select mode
         if (m_clientArea->IsSingleSel())
             m_clientArea->SelectAllRows(false);
         // Unselect all rows before select another in the single select mode
         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 );

     }
 }
 
     }
 }
 


@@ -4289,13 +4320,13 @@ void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataVie
 
 }
 
 
 }
 

-void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item, 
+void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item,

                               wxDataViewColumn* &column ) const
 {
     m_clientArea->HitTest(point, item, column);
 }
 
                               wxDataViewColumn* &column ) const
 {
     m_clientArea->HitTest(point, item, column);
 }
 

-wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem & item, 
+wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem & item,

                                     const wxDataViewColumn* column ) const
 {
     return m_clientArea->GetItemRect(item, column);
                                     const wxDataViewColumn* column ) const
 {
     return m_clientArea->GetItemRect(item, column);


@@ -4321,7 +4352,6 @@ void wxDataViewCtrl::Expand( const wxDataViewItem & item )
 void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
 {
     int row = m_clientArea->GetRowByItem( item );
 void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
 {
     int row = m_clientArea->GetRowByItem( item );

-    wxPrintf( "row %d\n", row );

     if (row != -1)
         m_clientArea->Collapse(row);
 }
     if (row != -1)
         m_clientArea->Collapse(row);
 }


@@ -4334,8 +4364,17 @@ bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
     return false;
 }
 
     return false;
 }
 

-#endif
-    // !wxUSE_GENERICDATAVIEWCTRL
+void wxDataViewCtrl::StartEditor( const wxDataViewItem & item, unsigned int column )
+{
+    wxDataViewColumn* col = GetColumn( column );
+    if (!col)
+        return;

 
 

-#endif
-    // wxUSE_DATAVIEWCTRL
+    wxRect itemRect = GetItemRect(item, col);
+    wxDataViewRenderer* renderer = col->GetRenderer();
+    renderer->StartEditing(item, itemRect);
+}
+
+#endif // !wxUSE_GENERICDATAVIEWCTRL
+
+#endif // wxUSE_DATAVIEWCTRL