more wxListCtrl fixes: inserting/deleting items now works again (tested in the sample) but I somehow broke the scrolling

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/listctrl/listtest.cpp

@@ -354,18 +354,9 @@ void MyFrame::InitWithReportItems()
 
     wxStopWatch sw;
 
-    wxString buf;
     for ( int i = 0; i < NUM_ITEMS; i++ )
     {
-        buf.Printf(_T("This is item %d"), i);
+        m_listCtrl->InsertItemInReportView(i);
-        long tmp = m_listCtrl->InsertItem(i, buf, 0);
-        m_listCtrl->SetItemData(tmp, i);
-
-        buf.Printf(_T("Col 1, item %d"), i);
-        tmp = m_listCtrl->SetItem(i, 1, buf);
-
-        buf.Printf(_T("Item %d in column 2"), i);
-        tmp = m_listCtrl->SetItem(i, 2, buf);
     }
 
     m_logWindow->WriteText(wxString::Format(_T("%d items inserted in %ldms\n"),
@@ -664,10 +655,34 @@ void MyListCtrl::OnActivated(wxListEvent& event)
 
 void MyListCtrl::OnListKeyDown(wxListEvent& event)
 {
+    switch ( event.GetCode() )
+    {
+        case WXK_DELETE:
+            DeleteItem(event.GetIndex());
+
+            wxLogMessage(_T("Item %d deleted"), event.GetIndex());
+            break;
+
+        case WXK_INSERT:
+            if ( GetWindowStyle() & wxLC_REPORT )
+            {
+                if ( GetWindowStyle() & wxLC_VIRTUAL )
+                {
+                    SetItemCount(GetItemCount() + 1);
+                }
+                else // !virtual
+                {
+                    InsertItemInReportView(event.GetIndex());
+                }
+            }
+            //else: fall through
+
+        default:
             LogEvent(event, _T("OnListKeyDown"));
 
             event.Skip();
     }
+}
 
 void MyListCtrl::OnChar(wxKeyEvent& event)
 {
@@ -693,3 +708,17 @@ int MyListCtrl::OnGetItemImage(long item) const
     return 0;
 }
 
+void MyListCtrl::InsertItemInReportView(int i)
+{
+    wxString buf;
+    buf.Printf(_T("This is item %d"), i);
+    long tmp = InsertItem(i, buf, 0);
+    SetItemData(tmp, i);
+
+    buf.Printf(_T("Col 1, item %d"), i);
+    SetItem(i, 1, buf);
+
+    buf.Printf(_T("Item %d in column 2"), i);
+    SetItem(i, 2, buf);
+}
+

samples/listctrl/listtest.h

@@ -25,6 +25,9 @@ public:
         {
         }
 
+    // add one item to the listctrl in report mode
+    void InsertItemInReportView(int i);
+
     void OnColClick(wxListEvent& event);
     void OnBeginDrag(wxListEvent& event);
     void OnBeginRDrag(wxListEvent& event);

src/generic/listctrl.cpp

@@ -56,6 +56,10 @@
     #pragma implementation "listctrlbase.h"
 #endif
 
+#if 0
+#include "listctrl.old.cpp"
+#else
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -348,7 +352,7 @@ public:
     wxListMainWindow *m_owner;
 
 public:
-    wxListLineData( wxListMainWindow *owner, size_t line );
+    wxListLineData(wxListMainWindow *owner);
 
     ~wxListLineData() { delete m_gi; }
 
@@ -367,7 +371,12 @@ public:
     // remember the position this line appears at
     void SetPosition( int x, int y,  int window_width, int spacing );
 
-    long IsHit( int x, int y );
+    // wxListCtrl API
+
+    void SetImage( int image ) { SetImage(0, image); }
+    int GetImage() const { return GetImage(0); }
+    bool HasImage() const { return GetImage() != -1; }
+    bool HasText() const { return !GetText(0).empty(); }
 
     void SetItem( int index, const wxListItem &info );
     void GetItem( int index, wxListItem &info );
@@ -375,33 +384,11 @@ public:
     wxString GetText(int index) const;
     void SetText( int index, const wxString s );
 
-    void SetImage( int index, int image );
-    int GetImage( int index ) const;
-
-    // get the bound rect of this line
-    wxRect GetRect() const;
-
-    // get the bound rect of the label
-    wxRect GetLabelRect() const;
-
-    // get the bound rect of the items icon (only may be called if we do have
-    // an icon!)
-    wxRect GetIconRect() const;
-
-    // get the rect to be highlighted when the item has focus
-    wxRect GetHighlightRect() const;
-
-    // get the size of the total line rect
-    wxSize GetSize() const { return GetRect().GetSize(); }
-
     // return true if the highlighting really changed
     bool Highlight( bool on );
 
     void ReverseHighlight();
 
-    // draw the line on the given DC
-    void Draw( wxDC *dc, int y = 0, int height = 0, bool highlighted = FALSE );
-
     bool IsHighlighted() const
     {
         wxASSERT_MSG( !IsVirtual(), _T("unexpected call to IsHighlighted") );
@@ -409,8 +396,14 @@ public:
         return m_highlighted;
     }
 
-    // only for wxListMainWindow::CacheLineData()
+    // draw the line on the given DC in icon/list mode
-    void SetLineIndex(size_t line) { m_lineIndex = line; }
+    void Draw( wxDC *dc );
+
+    // the same in report mode
+    void DrawInReportMode( wxDC *dc,
+                           const wxRect& rect,
+                           const wxRect& rectHL,
+                           bool highlighted );
 
 private:
     // set the line to contain num items (only can be > 1 in report mode)
@@ -425,11 +418,12 @@ private:
                        const wxFont& font,
                        bool highlight);
 
-    // the index of this line (only used in report mode)
+    // these are only used by GetImage/SetImage above, we don't support images
-    size_t m_lineIndex;
+    // with subitems at the public API level yet
+    void SetImage( int index, int image );
+    int GetImage( int index ) const;
 };
 
-
 WX_DECLARE_EXPORTED_OBJARRAY(wxListLineData, wxListLineDataArray);
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxListLineDataArray);
@@ -554,6 +548,9 @@ public:
     // return true if this is a virtual list control
     bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); }
 
+    // return true if the control is in report mode
+    bool InReportView() const { return HasFlag(wxLC_REPORT); }
+
     // return true if we are in single selection mode, false if multi sel
     bool IsSingleSel() const { return HasFlag(wxLC_SINGLE_SEL); }
 
@@ -585,6 +582,30 @@ public:
     // return true if the line is highlighted
     bool IsHighlighted(size_t line) const;
 
+    // the methods which are forwarded to wxListLineData itself in list/icon
+    // modes but are here because the lines don't store their positions in the
+    // report mode
+
+    // get the bound rect for the entire line
+    wxRect GetLineRect(size_t line) const;
+
+    // get the bound rect of the label
+    wxRect GetLineLabelRect(size_t line) const;
+
+    // get the bound rect of the items icon (only may be called if we do have
+    // an icon!)
+    wxRect GetLineIconRect(size_t line) const;
+
+    // get the rect to be highlighted when the item has focus
+    wxRect GetLineHighlightRect(size_t line) const;
+
+    // get the size of the total line rect
+    wxSize GetLineSize(size_t line) const
+        { return GetLineRect(line).GetSize(); }
+
+    // return the hit code for the corresponding position (in this line)
+    long HitTestLine(size_t line, int x, int y) const;
+
     void EditLabel( long item );
     void OnRenameTimer();
     void OnRenameAccept();
@@ -604,8 +625,8 @@ public:
     void OnPaint( wxPaintEvent &event );
 
     void DrawImage( int index, wxDC *dc, int x, int y );
-    void GetImageSize( int index, int &width, int &height );
+    void GetImageSize( int index, int &width, int &height ) const;
-    int GetTextLength( const wxString &s );
+    int GetTextLength( const wxString &s ) const;
 
     void SetImageList( wxImageList *imageList, int which );
     void SetItemSpacing( int spacing, bool isSmall = FALSE );
@@ -620,7 +641,7 @@ public:
     // returns the sum of the heights of all columns
     int GetHeaderWidth() const;
 
-    int GetCountPerPage() { return m_linesPerPage; }
+    int GetCountPerPage() const;
 
     void SetItem( wxListItem &item );
     void GetItem( wxListItem &item );
@@ -1184,13 +1205,11 @@ inline bool wxListLineData::IsVirtual() const
     return m_owner->IsVirtual();
 }
 
-wxListLineData::wxListLineData( wxListMainWindow *owner, size_t line )
+wxListLineData::wxListLineData( wxListMainWindow *owner )
 {
     m_owner = owner;
     m_items.DeleteContents( TRUE );
 
-    SetLineIndex(line);
-
     if ( InReportView() )
     {
         m_gi = NULL;
@@ -1205,59 +1224,6 @@ wxListLineData::wxListLineData( wxListMainWindow *owner, size_t line )
     InitItems( GetMode() == wxLC_REPORT ? m_owner->GetColumnCount() : 1 );
 }
 
-wxRect wxListLineData::GetRect() const
-{
-    if ( !InReportView() )
-        return m_gi->m_rectAll;
-
-    wxRect rect;
-    rect.x = HEADER_OFFSET_X;
-    rect.y = m_owner->GetLineY(m_lineIndex);
-    rect.width = m_owner->GetHeaderWidth();
-    rect.height = m_owner->GetLineHeight();
-
-    return rect;
-}
-
-wxRect wxListLineData::GetLabelRect() const
-{
-    if ( !InReportView() )
-        return m_gi->m_rectLabel;
-
-    wxRect rect;
-    rect.x = HEADER_OFFSET_X;
-    rect.y = m_owner->GetLineY(m_lineIndex);
-    rect.width = m_owner->GetColumnWidth(0);
-    rect.height = m_owner->GetLineHeight();
-
-    return rect;
-}
-
-wxRect wxListLineData::GetIconRect() const
-{
-    if ( !InReportView() )
-        return m_gi->m_rectIcon;
-
-    wxRect rect;
-
-    wxListItemDataList::Node *node = m_items.GetFirst();
-    wxCHECK_MSG( node, rect, _T("no subitems at all??") );
-
-    wxListItemData *item = node->GetData();
-    wxASSERT_MSG( item->HasImage(), _T("GetIconRect() called but no image") );
-
-    rect.x = HEADER_OFFSET_X;
-    rect.y = m_owner->GetLineY(m_lineIndex);
-    m_owner->GetImageSize(item->GetImage(), rect.width, rect.height);
-
-    return rect;
-}
-
-wxRect wxListLineData::GetHighlightRect() const
-{
-    return InReportView() ? GetRect() : m_gi->m_rectHighlight;
-}
-
 void wxListLineData::CalculateSize( wxDC *dc, int spacing )
 {
     wxListItemDataList::Node *node = m_items.GetFirst();
@@ -1435,25 +1401,6 @@ void wxListLineData::SetPosition( int x, int y,
     }
 }
 
-long wxListLineData::IsHit( int x, int y )
-{
-    wxListItemDataList::Node *node = m_items.GetFirst();
-    wxCHECK_MSG( node, 0, _T("no subitems at all??") );
-
-    wxListItemData *item = node->GetData();
-    if ( item->HasImage() && GetIconRect().Inside(x, y) )
-        return wxLIST_HITTEST_ONITEMICON;
-
-    if ( item->HasText() )
-    {
-        wxRect rect = InReportView() ? GetRect() : GetLabelRect();
-        if ( rect.Inside(x, y) )
-            return wxLIST_HITTEST_ONITEMLABEL;
-    }
-
-    return 0;
-}
-
 void wxListLineData::InitItems( int num )
 {
     for (int i = 0; i < num; i++)
@@ -1549,21 +1496,43 @@ void wxListLineData::SetAttributes(wxDC *dc,
     }
 }
 
-void wxListLineData::Draw( wxDC *dc, int y, int height, bool highlighted )
+void wxListLineData::Draw( wxDC *dc )
 {
-    wxRect rect = GetRect();
+    wxListItemDataList::Node *node = m_items.GetFirst();
-    m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+    wxCHECK_RET( node, _T("no subitems at all??") );
+
+    wxListItemData *item = node->GetData();
+    if (item->HasImage())
+    {
+        wxRect rectIcon = m_gi->m_rectIcon;
+        m_owner->DrawImage( item->GetImage(), dc,
+                            rectIcon.x, rectIcon.y );
+    }
+
+    if (item->HasText())
+    {
+        wxRect rectLabel = m_gi->m_rectLabel;
+        dc->DrawText( item->GetText(), rectLabel.x, rectLabel.y );
+    }
+}
+
+void wxListLineData::DrawInReportMode( wxDC *dc,
+                                       const wxRect& r,
+                                       const wxRect& rectHL,
+                                       bool highlighted )
+{
+    wxRect rect = r;
+    //m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
 
     if ( !m_owner->IsExposed( rect ) )
         return;
 
-    wxWindow *listctrl = m_owner->GetParent();
-
     // use our own flag if we maintain it
-    if ( !m_owner->IsVirtual() )
+    if ( !IsVirtual() )
         highlighted = m_highlighted;
 
     // default foreground colour
+    wxWindow *listctrl = m_owner->GetParent();
     wxColour colText;
     if ( highlighted )
     {
@@ -1600,17 +1569,16 @@ void wxListLineData::Draw( wxDC *dc, int y, int height, bool highlighted )
         }
 
         dc->SetPen( * wxTRANSPARENT_PEN );
-        dc->DrawRectangle( GetHighlightRect() );
+        dc->DrawRectangle( rectHL );
     }
 
     wxListItemDataList::Node *node = m_items.GetFirst();
+    wxCHECK_RET( node, _T("no subitems at all??") );
 
-    if ( GetMode() == wxLC_REPORT)
-    {
     size_t col = 0;
-        int x = HEADER_OFFSET_X;
+    int x = rect.x + HEADER_OFFSET_X;
 
-        y += (LINE_SPACING + EXTRA_HEIGHT) / 2;
+    rect.y += (LINE_SPACING + EXTRA_HEIGHT) / 2;
 
     while ( node )
     {
@@ -1621,18 +1589,18 @@ void wxListLineData::Draw( wxDC *dc, int y, int height, bool highlighted )
         if ( item->HasImage() )
         {
             int ix, iy;
-                m_owner->DrawImage( item->GetImage(), dc, x, y );
+            m_owner->DrawImage( item->GetImage(), dc, x, rect.y );
             m_owner->GetImageSize( item->GetImage(), ix, iy );
             x += ix + 5; // FIXME: what is "5"?
         }
 
         int width = m_owner->GetColumnWidth(col++);
 
-            dc->SetClippingRegion(x, y, width, height);
+        dc->SetClippingRegion(x, rect.y, width, rect.height);
 
         if ( item->HasText() )
         {
-                dc->DrawText( item->GetText(), x, y + 1 );
+            dc->DrawText( item->GetText(), x, rect.y );
         }
 
         dc->DestroyClippingRegion();
@@ -1642,26 +1610,6 @@ void wxListLineData::Draw( wxDC *dc, int y, int height, bool highlighted )
         node = node->GetNext();
     }
 }
-    else // !report
-    {
-        if (node)
-        {
-            wxListItemData *item = node->GetData();
-            if (item->HasImage())
-            {
-                wxRect rectIcon = GetIconRect();
-                m_owner->DrawImage( item->GetImage(), dc,
-                                    rectIcon.x, rectIcon.y );
-            }
-
-            if (item->HasText())
-            {
-                wxRect rectLabel = GetLabelRect();
-                dc->DrawText( item->GetText(), rectLabel.x, rectLabel.y );
-            }
-        }
-    }
-}
 
 bool wxListLineData::Highlight( bool on )
 {
@@ -2198,8 +2146,7 @@ void wxListMainWindow::CacheLineData(size_t line)
         ld->SetText(col, listctrl->OnGetItemText(line, col));
     }
 
-    ld->SetImage(0, listctrl->OnGetItemImage(line));
+    ld->SetImage(listctrl->OnGetItemImage(line));
-    ld->SetLineIndex(line);
 }
 
 wxListLineData *wxListMainWindow::GetDummyLine() const
@@ -2213,15 +2160,17 @@ wxListLineData *wxListMainWindow::GetDummyLine() const
         wxASSERT_MSG( IsVirtual(), _T("logic error") );
 
         wxListMainWindow *self = wxConstCast(this, wxListMainWindow);
-        wxListLineData *line = new wxListLineData( self, 0 );
+        wxListLineData *line = new wxListLineData(self);
         self->m_lines.Add(line);
     }
 
-    m_lines[0].SetLineIndex(0);
-
     return &m_lines[0];
 }
 
+// ----------------------------------------------------------------------------
+// line geometry (report mode only)
+// ----------------------------------------------------------------------------
+
 wxCoord wxListMainWindow::GetLineHeight() const
 {
     wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("only works in report mode") );
@@ -2254,6 +2203,79 @@ wxCoord wxListMainWindow::GetLineY(size_t line) const
     return LINE_SPACING + line*GetLineHeight();
 }
 
+wxRect wxListMainWindow::GetLineRect(size_t line) const
+{
+    if ( !InReportView() )
+        return GetLine(line)->m_gi->m_rectAll;
+
+    wxRect rect;
+    rect.x = HEADER_OFFSET_X;
+    rect.y = GetLineY(line);
+    rect.width = GetHeaderWidth();
+    rect.height = GetLineHeight();
+
+    return rect;
+}
+
+wxRect wxListMainWindow::GetLineLabelRect(size_t line) const
+{
+    if ( !InReportView() )
+        return GetLine(line)->m_gi->m_rectLabel;
+
+    wxRect rect;
+    rect.x = HEADER_OFFSET_X;
+    rect.y = GetLineY(line);
+    rect.width = GetColumnWidth(0);
+    rect.height = GetLineHeight();
+
+    return rect;
+}
+
+wxRect wxListMainWindow::GetLineIconRect(size_t line) const
+{
+    if ( !InReportView() )
+        return GetLine(line)->m_gi->m_rectIcon;
+
+    wxListLineData *ld = GetLine(line);
+    wxASSERT_MSG( ld->HasImage(), _T("should have an image") );
+
+    wxRect rect;
+    rect.x = HEADER_OFFSET_X;
+    rect.y = GetLineY(line);
+    GetImageSize(ld->GetImage(), rect.width, rect.height);
+
+    return rect;
+}
+
+wxRect wxListMainWindow::GetLineHighlightRect(size_t line) const
+{
+    return InReportView() ? GetLineRect(line)
+                          : GetLine(line)->m_gi->m_rectHighlight;
+}
+
+long wxListMainWindow::HitTestLine(size_t line, int x, int y) const
+{
+    wxListLineData *ld = GetLine(line);
+
+    if ( ld->HasImage() && GetLineIconRect(line).Inside(x, y) )
+        return wxLIST_HITTEST_ONITEMICON;
+
+    if ( ld->HasText() )
+    {
+        wxRect rect = InReportView() ? GetLineRect(line)
+                                     : GetLineLabelRect(line);
+
+        if ( rect.Inside(x, y) )
+            return wxLIST_HITTEST_ONITEMLABEL;
+    }
+
+    return 0;
+}
+
+// ----------------------------------------------------------------------------
+// highlight (selection) handling
+// ----------------------------------------------------------------------------
+
 bool wxListMainWindow::IsHighlighted(size_t line) const
 {
     if ( IsVirtual() )
@@ -2318,7 +2340,7 @@ bool wxListMainWindow::HighlightLine( size_t line, bool highlight )
 
 void wxListMainWindow::RefreshLine( size_t line )
 {
-    wxRect rect = GetLine(line)->GetRect();
+    wxRect rect = GetLineRect(line);
 
     CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
     RefreshRect( rect );
@@ -2387,9 +2409,9 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         GetVisibleLinesRange(&visibleFrom, &visibleTo);
         for ( size_t line = visibleFrom; line <= visibleTo; line++ )
         {
-            GetLine(line)->Draw( &dc,
+            GetLine(line)->DrawInReportMode( &dc,
-                                 GetLineY(line),
+                                             GetLineRect(line),
-                                 lineHeight,
+                                             GetLineHighlightRect(line),
                                              IsHighlighted(line) );
         }
 
@@ -2449,25 +2471,12 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     if ( HasCurrent() && m_hasFocus )
     {
-        wxRect rect;
-
-        if ( IsVirtual() )
-        {
-            // just offset the rect of the first line to position it correctly
-            wxListLineData *line = GetDummyLine();
-            rect = line->GetHighlightRect();
-            rect.y = GetLineY(m_current);
-        }
-        else
-        {
-            rect = GetLine(m_current)->GetHighlightRect();
-        }
 #ifdef __WXMAC__
         // no rect outline, we already have the background color
 #else
         dc.SetPen( *wxBLACK_PEN );
         dc.SetBrush( *wxTRANSPARENT_BRUSH );
-        dc.DrawRectangle( rect );
+        dc.DrawRectangle( GetLineHighlightRect(m_current) );
 #endif
     }
 
@@ -2546,7 +2555,7 @@ void wxListMainWindow::EditLabel( long item )
     PrepareDC( dc );
 
     wxString s = data->GetText(0);
-    wxRect rectLabel = data->GetLabelRect();
+    wxRect rectLabel = GetLineLabelRect(m_currentEdit);
 
     rectLabel.x = dc.LogicalToDeviceX( rectLabel.x );
     rectLabel.y = dc.LogicalToDeviceY( rectLabel.y );
@@ -2622,22 +2631,16 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
 
     if ( HasFlag(wxLC_REPORT) )
     {
-        wxCoord lineHeight = GetLineHeight();
+        current = y / GetLineHeight();
-
+        hitResult = HitTestLine(current, x, y);
-        current = y / lineHeight;
-        hitResult = GetDummyLine()->IsHit( x, y % lineHeight );
     }
     else // !report
     {
         // TODO: optimize it too! this is less simple than for report view but
         //       enumerating all items is still not a way to do it!!
-        for ( current = 0; current < count; current++ )
+        for ( current = 0; current < count && !hitResult; current++ )
         {
-            wxListLineData *line = (wxListLineData *) NULL;
+            hitResult = HitTestLine(current, x, y);
-            line = GetLine(current);
-            hitResult = line->IsHit( x, y );
-            if (hitResult)
-                break;
         }
     }
 
@@ -2772,19 +2775,7 @@ void wxListMainWindow::MoveToFocus()
     if ( !HasCurrent() )
         return;
 
-    wxRect rect;
+    wxRect rect = GetLineRect(m_current);
-
-    if ( IsVirtual() )
-    {
-        // just offset the rect of the first line to position it correctly
-        wxListLineData *line = GetDummyLine();
-        rect = line->GetRect();
-        rect.y = GetLineY(m_current);
-    }
-    else
-    {
-        rect = GetLine(m_current)->GetRect();
-    }
 
     int client_w, client_h;
     GetClientSize( &client_w, &client_h );
@@ -3100,7 +3091,7 @@ void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y )
     }
 }
 
-void wxListMainWindow::GetImageSize( int index, int &width, int &height )
+void wxListMainWindow::GetImageSize( int index, int &width, int &height ) const
 {
     if ( HasFlag(wxLC_ICON) && m_normal_image_list )
     {
@@ -3125,9 +3116,9 @@ void wxListMainWindow::GetImageSize( int index, int &width, int &height )
     }
 }
 
-int wxListMainWindow::GetTextLength( const wxString &s )
+int wxListMainWindow::GetTextLength( const wxString &s ) const
 {
-    wxClientDC dc( this );
+    wxClientDC dc( wxConstCast(this, wxListMainWindow) );
     dc.SetFont( GetFont() );
 
     wxCoord lw;
@@ -3497,15 +3488,7 @@ void wxListMainWindow::GetItemRect( long index, wxRect &rect )
     wxCHECK_RET( index >= 0 && (size_t)index < GetItemCount(),
                  _T("invalid index in GetItemRect") );
 
-    if ( HasFlag(wxLC_REPORT) )
+    rect = GetLineRect((size_t)index);
-    {
-        rect = GetDummyLine()->GetRect();
-        rect.y = GetLineY((size_t)index);
-    }
-    else
-    {
-        rect = GetLine((size_t)index)->GetRect();
-    }
 
     CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y);
 }
@@ -3606,7 +3589,7 @@ void wxListMainWindow::RecalculatePositions()
                 line->CalculateSize( &dc, iconSpacing );
                 line->SetPosition( x, y, clientWidth, iconSpacing );
 
-                wxSize sizeLine = line->GetSize();
+                wxSize sizeLine = GetLineSize(i);
 
                 if ( maxWidth < sizeLine.x )
                     maxWidth = sizeLine.x;
@@ -3732,9 +3715,9 @@ void wxListMainWindow::DeleteItem( long lindex )
     if ( m_current == index )
     {
         // the last valid index after deleting the item will be count-2
-        if ( ++m_current >= count - 2 )
+        if ( m_current == count - 1 )
         {
-            m_current = count - 2;
+            m_current--;
         }
     }
 
@@ -3753,6 +3736,8 @@ void wxListMainWindow::DeleteItem( long lindex )
     {
         m_lines.RemoveAt( index );
     }
+
+    RefreshLines(index, GetItemCount() - 1);
 }
 
 void wxListMainWindow::DeleteColumn( int col )
@@ -3866,15 +3851,23 @@ long wxListMainWindow::HitTest( int x, int y, int &flags )
 {
     CalcUnscrolledPosition( x, y, &x, &y );
 
+    if ( HasFlag(wxLC_REPORT) )
+    {
+        size_t current = y / GetLineHeight();
+        flags = HitTestLine(current, x, y);
+        if ( flags )
+            return current;
+    }
+    else // !report
+    {
+        // TODO: optimize it too! this is less simple than for report view but
+        //       enumerating all items is still not a way to do it!!
         size_t count = GetItemCount();
-    for (size_t i = 0; i < count; i++)
+        for ( size_t current = 0; current < count; current++ )
         {
-        wxListLineData *line = GetLine(i);
+            flags = HitTestLine(current, x, y);
-        long ret = line->IsHit( x, y );
+            if ( flags )
-        if (ret)
+                return current;
-        {
-            flags = (int)ret;
-            return i;
         }
     }
 
@@ -3911,11 +3904,13 @@ void wxListMainWindow::InsertItem( wxListItem &item )
         wxFAIL_MSG( _T("unknown mode") );
     }
 
-    wxListLineData *line = new wxListLineData( this, id );
+    wxListLineData *line = new wxListLineData(this);
 
     line->SetItem( 0, item );
 
     m_lines.Insert( line, id );
+
+    RefreshLines(id, GetItemCount() - 1);
 }
 
 void wxListMainWindow::InsertColumn( long col, wxListItem &item )
@@ -3994,6 +3989,17 @@ void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
     }
 }
 
+int wxListMainWindow::GetCountPerPage() const
+{
+    if ( !m_linesPerPage )
+    {
+        wxConstCast(this, wxListMainWindow)->
+            m_linesPerPage = GetClientSize().y / GetLineHeight();
+    }
+
+    return m_linesPerPage;
+}
+
 void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)
 {
     wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("this is for report mode only") );
@@ -4818,3 +4824,5 @@ void wxListCtrl::SetItemCount(long count)
 }
 
 #endif // wxUSE_LISTCTRL
+
+#endif