Fixed the drawing of the HRules so they don't try to iterate over all

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 256271c2fdce0c4c67bdecc9ce6769de2a5206d7..5609fdd9973ee6417e57353be534e64d6cdaecf6 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -9,42 +9,10 @@
 /////////////////////////////////////////////////////////////////////////////
 
 /*
 /////////////////////////////////////////////////////////////////////////////
 
 /*

-   FIXME for virtual list controls
+   TODO

 
 

-  +1. clicking on the item with a mouse is awfully slow, what is going on?
-      note that selecting with keyboard seems to be much faster
-   => fixed HighlightAll() - iterating over 1000000 items *is* slow
-
-   2. background colour is wrong?
- */
-
-/*
-   TODO for better virtual list control support:
-
-   1. less dumb line caching, we should cache at least all those visible
-      in the control itself and probably twice as many (we might also need to
-      cache the first one always for geometry calculations?)
-
-  +2. storing selections: we can't use an array to store the selected indices
-      like right now as selecting all in a control with 1000000 items is not
-      doable like this - instead, store selections as collection of individual
-      items and ranges
-
-   => wxSelectionStore
-
-   3. we need to implement searching/sorting somehow
-
-   4. the idea of storing the line index in the line itself is really stupid,
-      we shouldn't need it - but for this we have to get rid of all calles to
-      wxListLineData::GetFoo() and replace them with something like
-        if ( IsVirtual()
-            ... we have it ourselves ...
-        else
-            line->GetFoo();
-
-   => done
-
-   5. attributes support: we need OnGetItemAttr() as well!
+   1. we need to implement searching/sorting for virtual controls somehow
+   2. when changing selection the lines are refreshed twice

  */
 
 // ============================================================================
  */
 
 // ============================================================================


@@ -100,6 +68,7 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_ACTIVATED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_ACTIVATED)

+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_CACHE_HINT)

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -174,7 +143,14 @@ public:
     bool SelectItem(size_t item, bool select = TRUE);
 
     // select the range of items
     bool SelectItem(size_t item, bool select = TRUE);
 
     // select the range of items

-    void SelectRange(size_t itemFrom, size_t itemTo, bool select = TRUE);
+    //
+    // return true and fill the itemsChanged array with the indices of items
+    // which have changed state if "few" of them did, otherwise return false
+    // (meaning that too many items changed state to bother counting them
+    // individually)
+    bool SelectRange(size_t itemFrom, size_t itemTo,
+                     bool select = TRUE,
+                     wxArrayInt *itemsChanged = NULL);

 
     // return true if the given item is selected
     bool IsSelected(size_t item) const;
 
     // return true if the given item is selected
     bool IsSelected(size_t item) const;


@@ -212,7 +188,7 @@ class WXDLLEXPORT wxListItemData
 {
 public:
     wxListItemData(wxListMainWindow *owner);
 {
 public:
     wxListItemData(wxListMainWindow *owner);

-    ~wxListItemData() { delete m_attr; delete m_rect; }
+    ~wxListItemData();

 
     void SetItem( const wxListItem &info );
     void SetImage( int image ) { m_image = image; }
 
     void SetItem( const wxListItem &info );
     void SetImage( int image ) { m_image = image; }


@@ -247,7 +223,8 @@ public:
 
     void GetItem( wxListItem &info ) const;
 
 
     void GetItem( wxListItem &info ) const;
 

-    wxListItemAttr *GetAttributes() const { return m_attr; }
+    void SetAttr(wxListItemAttr *attr) { m_attr = attr; }
+    wxListItemAttr *GetAttr() const { return m_attr; }

 
 public:
     // the item image or -1
 
 public:
     // the item image or -1


@@ -384,6 +361,9 @@ public:
     wxString GetText(int index) const;
     void SetText( int index, const wxString s );
 
     wxString GetText(int index) const;
     void SetText( int index, const wxString s );
 

+    wxListItemAttr *GetAttr() const;
+    void SetAttr(wxListItemAttr *attr);
+

     // return true if the highlighting really changed
     bool Highlight( bool on );
 
     // return true if the highlighting really changed
     bool Highlight( bool on );
 


@@ -412,10 +392,10 @@ private:
     // get the mode (i.e. style)  of the list control
     inline int GetMode() const;
 
     // get the mode (i.e. style)  of the list control
     inline int GetMode() const;
 

-    void SetAttributes(wxDC *dc,
+    // prepare the DC for drawing with these item's attributes, return true if
+    // we need to draw the items background to highlight it, false otherwise
+    bool SetAttributes(wxDC *dc,

                        const wxListItemAttr *attr,
                        const wxListItemAttr *attr,

-                       const wxColour& colText,
-                       const wxFont& font,

                        bool highlight);
 
     // these are only used by GetImage/SetImage above, we don't support images
                        bool highlight);
 
     // these are only used by GetImage/SetImage above, we don't support images


@@ -611,12 +591,17 @@ public:
     // return the hit code for the corresponding position (in this line)
     long HitTestLine(size_t line, int x, int y) const;
 
     // return the hit code for the corresponding position (in this line)
     long HitTestLine(size_t line, int x, int y) const;
 

+    // bring the selected item into view, scrolling to it if necessary
+    void MoveToItem(size_t item);
+
+    // bring the current item into view
+    void MoveToFocus() { MoveToItem(m_current); }
+

     void EditLabel( long item );
     void OnRenameTimer();
     void OnRenameAccept();
 
     void OnMouse( wxMouseEvent &event );
     void EditLabel( long item );
     void OnRenameTimer();
     void OnRenameAccept();
 
     void OnMouse( wxMouseEvent &event );

-    void MoveToFocus();

 
     // called to switch the selection from the current item to newCurrent,
     void OnArrowChar( size_t newCurrent, const wxKeyEvent& event );
 
     // called to switch the selection from the current item to newCurrent,
     void OnArrowChar( size_t newCurrent, const wxKeyEvent& event );


@@ -657,7 +642,7 @@ public:
     int GetSelectedItemCount();
 
     // set the scrollbars and update the positions of the items
     int GetSelectedItemCount();
 
     // set the scrollbars and update the positions of the items

-    void RecalculatePositions();
+    void RecalculatePositions(bool noRefresh = FALSE);

 
     // refresh the window and the header
     void RefreshAll();
 
     // refresh the window and the header
     void RefreshAll();


@@ -814,6 +799,9 @@ private:
     // initialize the current item if needed
     void UpdateCurrent();
 
     // initialize the current item if needed
     void UpdateCurrent();
 

+    // delete all items but don't refresh: called from dtor
+    void DoDeleteAllItems();
+

     // called when an item is [un]focuded, i.e. becomes [not] current
     //
     // currently unused
     // called when an item is [un]focuded, i.e. becomes [not] current
     //
     // currently unused


@@ -882,12 +870,19 @@ bool wxSelectionStore::SelectItem(size_t item, bool select)
     return FALSE;
 }
 
     return FALSE;
 }
 

-void wxSelectionStore::SelectRange(size_t itemFrom, size_t itemTo, bool select)
+bool wxSelectionStore::SelectRange(size_t itemFrom, size_t itemTo,
+                                   bool select,
+                                   wxArrayInt *itemsChanged)

 {
 {

+    // 100 is hardcoded but it shouldn't matter much: the important thing is
+    // that we don't refresh everything when really few (e.g. 1 or 2) items
+    // change state
+    static const size_t MANY_ITEMS = 100;
+

     wxASSERT_MSG( itemFrom <= itemTo, _T("should be in order") );
 
     // are we going to have more [un]selected items than the other ones?
     wxASSERT_MSG( itemFrom <= itemTo, _T("should be in order") );
 
     // are we going to have more [un]selected items than the other ones?

-    if ( itemTo - itemFrom > m_count / 2 )
+    if ( itemTo - itemFrom > m_count/2 )

     {
         if ( select != m_defaultState )
         {
     {
         if ( select != m_defaultState )
         {


@@ -914,6 +909,9 @@ void wxSelectionStore::SelectRange(size_t itemFrom, size_t itemTo, bool select)
                 if ( selOld.Index(item) == wxNOT_FOUND )
                     m_itemsSel.Add(item);
             }
                 if ( selOld.Index(item) == wxNOT_FOUND )
                     m_itemsSel.Add(item);
             }

+
+            // many items (> half) changed state
+            itemsChanged = NULL;

         }
         else // select == m_defaultState
         {
         }
         else // select == m_defaultState
         {


@@ -937,6 +935,17 @@ void wxSelectionStore::SelectRange(size_t itemFrom, size_t itemTo, bool select)
                 // delete all of them (from end to avoid changing indices)
                 for ( int i = end; i >= (int)start; i-- )
                 {
                 // delete all of them (from end to avoid changing indices)
                 for ( int i = end; i >= (int)start; i-- )
                 {

+                    if ( itemsChanged )
+                    {
+                        if ( itemsChanged->GetCount() > MANY_ITEMS )
+                        {
+                            // stop counting (see comment below)
+                            itemsChanged = NULL;
+                        }
+
+                        itemsChanged->Add(m_itemsSel[i]);
+                    }
+

                     m_itemsSel.RemoveAt(i);
                 }
             }
                     m_itemsSel.RemoveAt(i);
                 }
             }


@@ -944,12 +953,31 @@ void wxSelectionStore::SelectRange(size_t itemFrom, size_t itemTo, bool select)
     }
     else // "few" items change state
     {
     }
     else // "few" items change state
     {

+        if ( itemsChanged )
+        {
+            itemsChanged->Empty();
+        }
+

         // just add the items to the selection
         for ( size_t item = itemFrom; item <= itemTo; item++ )
         {
         // just add the items to the selection
         for ( size_t item = itemFrom; item <= itemTo; item++ )
         {

-            SelectItem(item, select);
+            if ( SelectItem(item, select) && itemsChanged )
+            {
+                itemsChanged->Add(item);
+
+                if ( itemsChanged->GetCount() > MANY_ITEMS )
+                {
+                    // stop counting them, we'll just eat gobs of memory
+                    // for nothing at all - faster to refresh everything in
+                    // this case
+                    itemsChanged = NULL;
+                }
+            }

         }
     }
         }
     }

+
+    // we set it to NULL if there are many items changing state
+    return itemsChanged != NULL;

 }
 
 void wxSelectionStore::OnItemDelete(size_t item)
 }
 
 void wxSelectionStore::OnItemDelete(size_t item)


@@ -979,6 +1007,18 @@ void wxSelectionStore::OnItemDelete(size_t item)
 //  wxListItemData
 //-----------------------------------------------------------------------------
 
 //  wxListItemData
 //-----------------------------------------------------------------------------
 

+wxListItemData::~wxListItemData()
+{
+    // in the virtual list control the attributes are managed by the main
+    // program, so don't delete them
+    if ( !m_owner->IsVirtual() )
+    {
+        delete m_attr;
+    }
+
+    delete m_rect;
+}
+

 void wxListItemData::Init()
 {
     m_image = -1;
 void wxListItemData::Init()
 {
     m_image = -1;


@@ -993,7 +1033,7 @@ wxListItemData::wxListItemData(wxListMainWindow *owner)
 
     m_owner = owner;
 
 
     m_owner = owner;
 

-    if ( owner->HasFlag(wxLC_REPORT) )
+    if ( owner->InReportView() )

     {
         m_rect = NULL;
     }
     {
         m_rect = NULL;
     }


@@ -1475,32 +1515,86 @@ int wxListLineData::GetImage( int index ) const
     return item->GetImage();
 }
 
     return item->GetImage();
 }
 

-void wxListLineData::SetAttributes(wxDC *dc,
+wxListItemAttr *wxListLineData::GetAttr() const
+{
+    wxListItemDataList::Node *node = m_items.GetFirst();
+    wxCHECK_MSG( node, NULL, _T("invalid column index in GetAttr()") );
+
+    wxListItemData *item = node->GetData();
+    return item->GetAttr();
+}
+
+void wxListLineData::SetAttr(wxListItemAttr *attr)
+{
+    wxListItemDataList::Node *node = m_items.GetFirst();
+    wxCHECK_RET( node, _T("invalid column index in SetAttr()") );
+
+    wxListItemData *item = node->GetData();
+    item->SetAttr(attr);
+}
+
+bool wxListLineData::SetAttributes(wxDC *dc,

                                    const wxListItemAttr *attr,
                                    const wxListItemAttr *attr,

-                                   const wxColour& colText,
-                                   const wxFont& font,
-                                   bool highlight)
+                                   bool highlighted)

 {
 {

-    // don't use foregroud colour for drawing highlighted items - this might
+    wxWindow *listctrl = m_owner->GetParent();
+
+    // fg colour
+
+    // don't use foreground colour for drawing highlighted items - this might

     // make them completely invisible (and there is no way to do bit
     // arithmetics on wxColour, unfortunately)
     // make them completely invisible (and there is no way to do bit
     // arithmetics on wxColour, unfortunately)

-    if ( !highlight && attr && attr->HasTextColour() )
+    wxColour colText;
+    if ( highlighted )

     {
     {

-        dc->SetTextForeground(attr->GetTextColour());
+        colText = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);

     }
     else
     {
     }
     else
     {

-        dc->SetTextForeground(colText);
+        if ( attr && attr->HasTextColour() )
+        {
+            colText = attr->GetTextColour();
+        }
+        else
+        {
+            colText = listctrl->GetForegroundColour();
+        }

     }
 
     }
 

+    dc->SetTextForeground(colText);
+
+    // font
+    wxFont font;

     if ( attr && attr->HasFont() )
     {
     if ( attr && attr->HasFont() )
     {

-        dc->SetFont(attr->GetFont());
+        font = attr->GetFont();

     }
     else
     {
     }
     else
     {

-        dc->SetFont(font);
+        font = listctrl->GetFont();
+    }
+
+    dc->SetFont(font);
+
+    // bg colour
+    bool hasBgCol = attr && attr->HasBackgroundColour();
+    if ( highlighted || hasBgCol )
+    {
+        if ( highlighted )
+        {
+            dc->SetBrush( *m_owner->m_highlightBrush );
+        }
+        else
+        {
+            dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
+        }
+
+        dc->SetPen( *wxTRANSPARENT_PEN );
+
+        return TRUE;

     }
     }

+
+    return FALSE;

 }
 
 void wxListLineData::Draw( wxDC *dc )
 }
 
 void wxListLineData::Draw( wxDC *dc )


@@ -1508,6 +1602,15 @@ void wxListLineData::Draw( wxDC *dc )
     wxListItemDataList::Node *node = m_items.GetFirst();
     wxCHECK_RET( node, _T("no subitems at all??") );
 
     wxListItemDataList::Node *node = m_items.GetFirst();
     wxCHECK_RET( node, _T("no subitems at all??") );
 

+    bool highlighted = IsHighlighted();
+
+    wxListItemAttr *attr = GetAttr();
+
+    if ( SetAttributes(dc, attr, highlighted) )
+    {
+        dc->DrawRectangle( m_gi->m_rectHighlight );
+    }
+

     wxListItemData *item = node->GetData();
     if (item->HasImage())
     {
     wxListItemData *item = node->GetData();
     if (item->HasImage())
     {


@@ -1528,48 +1631,12 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
                                        const wxRect& rectHL,
                                        bool highlighted )
 {
                                        const wxRect& rectHL,
                                        bool highlighted )
 {

-    // use our own flag if we maintain it
-    if ( !IsVirtual() )
-        highlighted = m_highlighted;
-
-    // default foreground colour
-    wxWindow *listctrl = m_owner->GetParent();
-    wxColour colText;
-    if ( highlighted )
-    {
-        colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT );
-    }
-    else
-    {
-        colText = listctrl->GetForegroundColour();
-    }
-
-    // default font
-    wxFont font = listctrl->GetFont();
-
-    // VZ: currently we set the colours/fonts only once, but like this (i.e.
-    //     using SetAttributes() inside the loop), it will be trivial to
-    //     customize the subitems (in report mode) too.
-    wxListItemData *item = m_items.GetFirst()->GetData();
-    wxListItemAttr *attr = item->GetAttributes();
-    SetAttributes(dc, attr, colText, font, highlighted);
-
-    bool hasBgCol = attr && attr->HasBackgroundColour();
-    if ( highlighted || hasBgCol )
+    // TODO: later we should support setting different attributes for
+    //       different columns - to do it, just add "col" argument to
+    //       GetAttr() and move these lines into the loop below
+    wxListItemAttr *attr = GetAttr();
+    if ( SetAttributes(dc, attr, highlighted) )

     {
     {

-        if ( highlighted )
-        {
-            dc->SetBrush( *m_owner->m_highlightBrush );
-        }
-        else
-        {
-            if ( hasBgCol )
-                dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
-            else
-                dc->SetBrush( * wxWHITE_BRUSH );
-        }
-
-        dc->SetPen( * wxTRANSPARENT_PEN );

         dc->DrawRectangle( rectHL );
     }
 
         dc->DrawRectangle( rectHL );
     }
 


@@ -2125,7 +2192,7 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
 
 wxListMainWindow::~wxListMainWindow()
 {
 
 wxListMainWindow::~wxListMainWindow()
 {

-    DeleteEverything();
+    DoDeleteAllItems();

 
     delete m_highlightBrush;
 
 
     delete m_highlightBrush;
 


@@ -2145,6 +2212,7 @@ void wxListMainWindow::CacheLineData(size_t line)
     }
 
     ld->SetImage(listctrl->OnGetItemImage(line));
     }
 
     ld->SetImage(listctrl->OnGetItemImage(line));

+    ld->SetAttr(listctrl->OnGetItemAttr(line));

 }
 
 wxListLineData *wxListMainWindow::GetDummyLine() const
 }
 
 wxListLineData *wxListMainWindow::GetDummyLine() const


@@ -2289,25 +2357,37 @@ bool wxListMainWindow::IsHighlighted(size_t line) const
     }
 }
 
     }
 }
 

-void wxListMainWindow::HighlightLines( size_t lineFrom, size_t lineTo, bool highlight )
+void wxListMainWindow::HighlightLines( size_t lineFrom,
+                                       size_t lineTo,
+                                       bool highlight )

 {
     if ( IsVirtual() )
     {
 {
     if ( IsVirtual() )
     {

-        m_selStore.SelectRange(lineFrom, lineTo, highlight);
-        RefreshLines(lineFrom, lineTo);
+        wxArrayInt linesChanged;
+        if ( !m_selStore.SelectRange(lineFrom, lineTo, highlight,
+                                     &linesChanged) )
+        {
+            // meny items changed state, refresh everything
+            RefreshLines(lineFrom, lineTo);
+        }
+        else // only a few items changed state, refresh only them
+        {
+            size_t count = linesChanged.GetCount();
+            for ( size_t n = 0; n < count; n++ )
+            {
+                RefreshLine(linesChanged[n]);
+            }
+        }

     }
     }

-    else
+    else // iterate over all items in non report view

     {
     {

-        // do it the dumb way
-        bool needsRefresh = FALSE;

         for ( size_t line = lineFrom; line <= lineTo; line++ )
         {
             if ( HighlightLine(line, highlight) )
         for ( size_t line = lineFrom; line <= lineTo; line++ )
         {
             if ( HighlightLine(line, highlight) )

-                needsRefresh = TRUE;
+            {
+                RefreshLine(line);
+            }

         }
         }

-
-        if ( needsRefresh )
-            RefreshLines(lineFrom, lineTo);

     }
 }
 
     }
 }
 


@@ -2338,6 +2418,12 @@ bool wxListMainWindow::HighlightLine( size_t line, bool highlight )
 
 void wxListMainWindow::RefreshLine( size_t line )
 {
 
 void wxListMainWindow::RefreshLine( size_t line )
 {

+    size_t visibleFrom, visibleTo;
+    GetVisibleLinesRange(&visibleFrom, &visibleTo);
+
+    if ( line < visibleFrom || line > visibleTo )
+        return;
+

     wxRect rect = GetLineRect(line);
 
     CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
     wxRect rect = GetLineRect(line);
 
     CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );


@@ -2365,7 +2451,7 @@ void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo )
         rect.x = 0;
         rect.y = GetLineY(lineFrom);
         rect.width = GetClientSize().x;
         rect.x = 0;
         rect.y = GetLineY(lineFrom);
         rect.width = GetClientSize().x;

-        rect.height = GetLineY(lineTo) - rect.y;
+        rect.height = GetLineY(lineTo) - rect.y + GetLineHeight();

 
         CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
         RefreshRect( rect );
 
         CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
         RefreshRect( rect );


@@ -2447,6 +2533,17 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         wxCoord xOrig, yOrig;
         CalcUnscrolledPosition(0, 0, &xOrig, &yOrig);
 
         wxCoord xOrig, yOrig;
         CalcUnscrolledPosition(0, 0, &xOrig, &yOrig);
 

+        // tell the caller cache to cache the data
+        if ( IsVirtual() )
+        {
+            wxListEvent evCache(wxEVT_COMMAND_LIST_CACHE_HINT,
+                                GetParent()->GetId());
+            evCache.SetEventObject( GetParent() );
+            evCache.m_oldItemIndex = visibleFrom;
+            evCache.m_itemIndex = visibleTo;
+            GetParent()->GetEventHandler()->ProcessEvent( evCache );
+        }
+

         for ( size_t line = visibleFrom; line <= visibleTo; line++ )
         {
             rectLine = GetLineRect(line);
         for ( size_t line = visibleFrom; line <= visibleTo; line++ )
         {
             rectLine = GetLineRect(line);


@@ -2461,7 +2558,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             GetLine(line)->DrawInReportMode( &dc,
                                              rectLine,
                                              GetLineHighlightRect(line),
             GetLine(line)->DrawInReportMode( &dc,
                                              rectLine,
                                              GetLineHighlightRect(line),

-                                             IsHighlighted(line) );
+                                             m_hasFocus && IsHighlighted(line) );

         }
 
         if ( HasFlag(wxLC_HRULES) )
         }
 
         if ( HasFlag(wxLC_HRULES) )


@@ -2518,15 +2615,18 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         }
     }
 
         }
     }
 

-    if ( HasCurrent() && m_hasFocus )
+    if ( HasCurrent() )

     {
     {

+        // don't draw rect outline under Max if we already have the background
+        // color

 #ifdef __WXMAC__
 #ifdef __WXMAC__

-        // no rect outline, we already have the background color
-#else
-        dc.SetPen( *wxBLACK_PEN );
-        dc.SetBrush( *wxTRANSPARENT_BRUSH );
-        dc.DrawRectangle( GetLineHighlightRect(m_current) );
-#endif
+        if ( !m_hasFocus )
+#endif // !__WXMAC__
+        {
+            dc.SetPen( *wxBLACK_PEN );
+            dc.SetBrush( *wxTRANSPARENT_BRUSH );
+            dc.DrawRectangle( GetLineHighlightRect(m_current) );
+        }

     }
 
     dc.EndDrawing();
     }
 
     dc.EndDrawing();


@@ -2563,7 +2663,16 @@ void wxListMainWindow::SendNotify( size_t line,
     if ( point != wxDefaultPosition )
         le.m_pointDrag = point;
 
     if ( point != wxDefaultPosition )
         le.m_pointDrag = point;
 

-    GetLine(line)->GetItem( 0, le.m_item );
+    // don't try to get the line info for virtual list controls: the main
+    // program has it anyhow and if we did it would result in accessing all
+    // the lines, even those which are not visible now and this is precisely
+    // what we're trying to avoid
+    if ( !IsVirtual() && (command != wxEVT_COMMAND_LIST_DELETE_ITEM) )
+    {
+        GetLine(line)->GetItem( 0, le.m_item );
+    }
+    //else: there may be no more such item
+

     GetParent()->GetEventHandler()->ProcessEvent( le );
 }
 
     GetParent()->GetEventHandler()->ProcessEvent( le );
 }
 


@@ -2822,12 +2931,12 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     }
 }
 
     }
 }
 

-void wxListMainWindow::MoveToFocus()
+void wxListMainWindow::MoveToItem(size_t item)

 {
 {

-    if ( !HasCurrent() )
+    if ( item == (size_t)-1 )

         return;
 
         return;
 

-    wxRect rect = GetLineRect(m_current);
+    wxRect rect = GetLineRect(item);

 
     int client_w, client_h;
     GetClientSize( &client_w, &client_h );
 
     int client_w, client_h;
     GetClientSize( &client_w, &client_h );


@@ -3064,11 +3173,16 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
                 le.m_itemIndex = m_current;
                 GetLine(m_current)->GetItem( 0, le.m_item );
                 GetParent()->GetEventHandler()->ProcessEvent( le );
                 le.m_itemIndex = m_current;
                 GetLine(m_current)->GetItem( 0, le.m_item );
                 GetParent()->GetEventHandler()->ProcessEvent( le );

+
+                if ( IsHighlighted(m_current) )
+                {
+                    // don't unselect the item in single selection mode
+                    break;
+                }
+                //else: select it in ReverseHighlight() below if unselected

             }
             }

-            else
-            {
-                ReverseHighlight(m_current);
-            }
+
+            ReverseHighlight(m_current);

             break;
 
         case WXK_RETURN:
             break;
 
         case WXK_RETURN:


@@ -3365,19 +3479,21 @@ void wxListMainWindow::SetItem( wxListItem &item )
     wxCHECK_RET( id >= 0 && (size_t)id < GetItemCount(),
                  _T("invalid item index in SetItem") );
 
     wxCHECK_RET( id >= 0 && (size_t)id < GetItemCount(),
                  _T("invalid item index in SetItem") );
 

-    if ( IsVirtual() )
+    if ( !IsVirtual() )
+    {
+        wxListLineData *line = GetLine((size_t)id);
+        line->SetItem( item.m_col, item );
+    }
+
+    if ( InReportView() )

     {
         // just refresh the line to show the new value of the text/image
         RefreshLine((size_t)id);
     }
     {
         // just refresh the line to show the new value of the text/image
         RefreshLine((size_t)id);
     }

-    else // !virtual
+    else // !report

     {
     {

+        // refresh everything (resulting in horrible flicker - FIXME!)

         m_dirty = TRUE;
         m_dirty = TRUE;

-
-        wxListLineData *line = GetLine((size_t)id);
-        if ( HasFlag(wxLC_REPORT) )
-            item.m_width = GetColumnWidth( item.m_col );
-        line->SetItem( item.m_col, item );

     }
 }
 
     }
 }
 


@@ -3387,8 +3503,9 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
                   _T("invalid list ctrl item index in SetItem") );
 
     size_t oldCurrent = m_current;
                   _T("invalid list ctrl item index in SetItem") );
 
     size_t oldCurrent = m_current;

-    size_t item = (size_t)litem;    // sdafe because of the check above
+    size_t item = (size_t)litem;    // safe because of the check above

 
 

+    // do we need to change the focus?

     if ( stateMask & wxLIST_STATE_FOCUSED )
     {
         if ( state & wxLIST_STATE_FOCUSED )
     if ( stateMask & wxLIST_STATE_FOCUSED )
     {
         if ( state & wxLIST_STATE_FOCUSED )


@@ -3400,9 +3517,13 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
                 m_current = item;
                 OnFocusLine( m_current );
 
                 m_current = item;
                 OnFocusLine( m_current );
 

-                if ( IsSingleSel() && (oldCurrent != (size_t)-1) )
+                if ( oldCurrent != (size_t)-1 )

                 {
                 {

-                    HighlightLine(oldCurrent, FALSE);
+                    if ( IsSingleSel() )
+                    {
+                        HighlightLine(oldCurrent, FALSE);
+                    }
+

                     RefreshLine(oldCurrent);
                 }
 
                     RefreshLine(oldCurrent);
                 }
 


@@ -3416,10 +3537,13 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
             {
                 OnUnfocusLine( m_current );
                 m_current = (size_t)-1;
             {
                 OnUnfocusLine( m_current );
                 m_current = (size_t)-1;

+
+                RefreshLine( oldCurrent );

             }
         }
     }
 
             }
         }
     }
 

+    // do we need to change the selection state?

     if ( stateMask & wxLIST_STATE_SELECTED )
     {
         bool on = (state & wxLIST_STATE_SELECTED) != 0;
     if ( stateMask & wxLIST_STATE_SELECTED )
     {
         bool on = (state & wxLIST_STATE_SELECTED) != 0;


@@ -3503,7 +3627,10 @@ void wxListMainWindow::SetItemCount(long count)
     m_selStore.SetItemCount(count);
     m_countVirt = count;
 
     m_selStore.SetItemCount(count);
     m_countVirt = count;
 

-    Refresh();
+    ResetVisibleLinesRange();
+
+    // scrollbars must be reset
+    m_dirty = TRUE;

 }
 
 int wxListMainWindow::GetSelectedItemCount()
 }
 
 int wxListMainWindow::GetSelectedItemCount()


@@ -3560,11 +3687,8 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos)
 // geometry calculation
 // ----------------------------------------------------------------------------
 
 // geometry calculation
 // ----------------------------------------------------------------------------
 

-void wxListMainWindow::RecalculatePositions()
+void wxListMainWindow::RecalculatePositions(bool noRefresh)

 {
 {

-    if ( IsEmpty() )
-        return;
-

     wxClientDC dc( this );
     dc.SetFont( GetFont() );
 
     wxClientDC dc( this );
     dc.SetFont( GetFont() );
 


@@ -3665,10 +3789,13 @@ void wxListMainWindow::RecalculatePositions()
         SetScrollbars( m_xScroll, m_yScroll, (entireWidth+SCROLL_UNIT_X) / m_xScroll, 0, scroll_pos, 0, TRUE );
     }
 
         SetScrollbars( m_xScroll, m_yScroll, (entireWidth+SCROLL_UNIT_X) / m_xScroll, 0, scroll_pos, 0, TRUE );
     }
 

-    // FIXME: why should we call it from here?
-    UpdateCurrent();
+    if ( !noRefresh )
+    {
+        // FIXME: why should we call it from here?
+        UpdateCurrent();

 
 

-    RefreshAll();
+        RefreshAll();
+    }

 }
 
 void wxListMainWindow::RefreshAll()
 }
 
 void wxListMainWindow::RefreshAll()


@@ -3677,7 +3804,7 @@ void wxListMainWindow::RefreshAll()
     Refresh();
 
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     Refresh();
 
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;

-    if ( headerWin )
+    if ( headerWin && headerWin->m_dirty )

     {
         headerWin->m_dirty = FALSE;
         headerWin->Refresh();
     {
         headerWin->m_dirty = FALSE;
         headerWin->Refresh();


@@ -3749,20 +3876,18 @@ void wxListMainWindow::DeleteItem( long lindex )
 
     size_t index = (size_t)lindex;
 
 
     size_t index = (size_t)lindex;
 

-    m_dirty = TRUE;
-
-    // select the next item when the selected one is deleted
-    if ( m_current == index )
+    // we don't need to adjust the index for the previous items
+    if ( HasCurrent() && m_current >= index )

     {
     {

-        // the last valid index after deleting the item will be count-2
-        if ( m_current == count - 1 )
+        // if the current item is being deleted, we want the next one to
+        // become selected - unless there is no next one - so don't adjust
+        // m_current in this case
+        if ( m_current != index || m_current == count - 1 )

         {
             m_current--;
         }
     }
 
         {
             m_current--;
         }
     }
 

-    SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM );
-

     if ( InReportView() )
     {
         ResetVisibleLinesRange();
     if ( InReportView() )
     {
         ResetVisibleLinesRange();


@@ -3779,7 +3904,11 @@ void wxListMainWindow::DeleteItem( long lindex )
         m_lines.RemoveAt( index );
     }
 
         m_lines.RemoveAt( index );
     }
 

+    // we need to refresh the (vert) scrollbar as the number of items changed

     m_dirty = TRUE;
     m_dirty = TRUE;

+
+    SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM );
+

     RefreshAfter(index);
 }
 
     RefreshAfter(index);
 }
 


@@ -3793,7 +3922,7 @@ void wxListMainWindow::DeleteColumn( int col )
     m_columns.DeleteNode( node );
 }
 
     m_columns.DeleteNode( node );
 }
 

-void wxListMainWindow::DeleteAllItems()
+void wxListMainWindow::DoDeleteAllItems()

 {
     if ( IsEmpty() )
     {
 {
     if ( IsEmpty() )
     {


@@ -3801,8 +3930,6 @@ void wxListMainWindow::DeleteAllItems()
         return;
     }
 
         return;
     }
 

-    m_dirty = TRUE;
-

     ResetCurrent();
 
     // to make the deletion of all items faster, we don't send the
     ResetCurrent();
 
     // to make the deletion of all items faster, we don't send the


@@ -3818,7 +3945,7 @@ void wxListMainWindow::DeleteAllItems()
     {
         m_countVirt = 0;
 
     {
         m_countVirt = 0;
 

-        ResetVisibleLinesRange();
+        m_selStore.Clear();

     }
 
     if ( InReportView() )
     }
 
     if ( InReportView() )


@@ -3827,8 +3954,13 @@ void wxListMainWindow::DeleteAllItems()
     }
 
     m_lines.Clear();
     }
 
     m_lines.Clear();

+}

 
 

-    m_selStore.Clear();
+void wxListMainWindow::DeleteAllItems()
+{
+    DoDeleteAllItems();
+
+    RecalculatePositions();

 }
 
 void wxListMainWindow::DeleteEverything()
 }
 
 void wxListMainWindow::DeleteEverything()


@@ -3848,14 +3980,15 @@ void wxListMainWindow::EnsureVisible( long index )
                  _T("invalid index in EnsureVisible") );
 
     // We have to call this here because the label in question might just have
                  _T("invalid index in EnsureVisible") );
 
     // We have to call this here because the label in question might just have

-    // been added and no screen update taken place.
-    if (m_dirty)
-        wxSafeYield();
+    // been added and its position is not known yet
+    if ( m_dirty )
+    {
+        m_dirty = FALSE;

 
 

-    size_t oldCurrent = m_current;
-    m_current = (size_t)index;
-    MoveToFocus();
-    m_current = oldCurrent;
+        RecalculatePositions(TRUE /* no refresh */);
+    }
+
+    MoveToItem((size_t)index);

 }
 
 long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(partial) )
 }
 
 long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(partial) )


@@ -4185,6 +4318,7 @@ void wxListEvent::CopyObject(wxObject& object_dest) const
 // -------------------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
 // -------------------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)

+IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)

 
 BEGIN_EVENT_TABLE(wxListCtrl,wxControl)
   EVT_SIZE(wxListCtrl::OnSize)
 
 BEGIN_EVENT_TABLE(wxListCtrl,wxControl)
   EVT_SIZE(wxListCtrl::OnSize)


@@ -4309,36 +4443,35 @@ void wxListCtrl::SetWindowStyleFlag( long flag )
     {
         m_mainWin->DeleteEverything();
 
     {
         m_mainWin->DeleteEverything();
 

-        int width = 0;
-        int height = 0;
-        GetClientSize( &width, &height );
+        // has the header visibility changed?
+        bool hasHeader = HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER),
+             willHaveHeader = (flag & wxLC_REPORT) && !(flag & wxLC_NO_HEADER);

 
 

-        if (flag & wxLC_REPORT)
+        if ( hasHeader != willHaveHeader )

         {
         {

-            if (!HasFlag(wxLC_REPORT))
+            // toggle it
+            if ( hasHeader )
+            {
+                if ( m_headerWin )
+                {
+                    // don't delete, just hide, as we can reuse it later
+                    m_headerWin->Show(FALSE);
+                }
+                //else: nothing to do
+            }
+            else // must show header

             {
                 if (!m_headerWin)
                 {
                     CreateHeaderWindow();
             {
                 if (!m_headerWin)
                 {
                     CreateHeaderWindow();

-
-                    if (HasFlag(wxLC_NO_HEADER))
-                        m_headerWin->Show( FALSE );

                 }
                 }

-                else
+                else // already have it, just show

                 {
                 {

-                    if (flag & wxLC_NO_HEADER)
-                        m_headerWin->Show( FALSE );
-                    else
-                        m_headerWin->Show( TRUE );
+                    m_headerWin->Show( TRUE );

                 }
             }
                 }
             }

-        }
-        else // !report
-        {
-            if ( m_mainWin->HasHeader() )
-            {
-                m_headerWin->Show( FALSE );
-            }
+
+            ResizeReportView(willHaveHeader);

         }
     }
 
         }
     }
 


@@ -4729,10 +4862,17 @@ void wxListCtrl::OnSize(wxSizeEvent& event)
     if ( !m_mainWin )
         return;
 
     if ( !m_mainWin )
         return;
 

+    ResizeReportView(m_mainWin->HasHeader());
+
+    m_mainWin->RecalculatePositions();
+}
+
+void wxListCtrl::ResizeReportView(bool showHeader)
+{

     int cw, ch;
     GetClientSize( &cw, &ch );
 
     int cw, ch;
     GetClientSize( &cw, &ch );
 

-    if ( m_mainWin->HasHeader() )
+    if ( showHeader )

     {
         m_headerWin->SetSize( 0, 0, cw, HEADER_HEIGHT );
         m_mainWin->SetSize( 0, HEADER_HEIGHT + 1, cw, ch - HEADER_HEIGHT - 1 );
     {
         m_headerWin->SetSize( 0, 0, cw, HEADER_HEIGHT );
         m_mainWin->SetSize( 0, HEADER_HEIGHT + 1, cw, ch - HEADER_HEIGHT - 1 );


@@ -4741,8 +4881,6 @@ void wxListCtrl::OnSize(wxSizeEvent& event)
     {
         m_mainWin->SetSize( 0, 0, cw, ch );
     }
     {
         m_mainWin->SetSize( 0, 0, cw, ch );
     }

-
-    m_mainWin->RecalculatePositions();

 }
 
 void wxListCtrl::OnIdle( wxIdleEvent & event )
 }
 
 void wxListCtrl::OnIdle( wxIdleEvent & event )


@@ -4880,6 +5018,15 @@ int wxListCtrl::OnGetItemImage(long item) const
     return -1;
 }
 
     return -1;
 }
 

+wxListItemAttr *wxListCtrl::OnGetItemAttr(long item) const
+{
+    wxASSERT_MSG( item >= 0 && item < GetItemCount(),
+                  _T("invalid item index in OnGetItemAttr()") );
+
+    // no attributes by default
+    return NULL;
+}
+

 void wxListCtrl::SetItemCount(long count)
 {
     wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );
 void wxListCtrl::SetItemCount(long count)
 {
     wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );


@@ -4887,4 +5034,14 @@ void wxListCtrl::SetItemCount(long count)
     m_mainWin->SetItemCount(count);
 }
 
     m_mainWin->SetItemCount(count);
 }
 

+void wxListCtrl::RefreshItem(long item)
+{
+    m_mainWin->RefreshLine(item);
+}
+
+void wxListCtrl::RefreshItems(long itemFrom, long itemTo)
+{
+    m_mainWin->RefreshLines(itemFrom, itemTo);
+}
+

 #endif // wxUSE_LISTCTRL
 #endif // wxUSE_LISTCTRL