removed extra wxSTD

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 5aeb20c2e528ceb0b584a234b0fd73798813511a..3ca9aa51ac246068d14ce0ea51f89c1c82a66568 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

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


@@ -131,6 +99,9 @@ static const int AUTOSIZE_COL_MARGIN = 10;
 static const int WIDTH_COL_DEFAULT = 80;
 static const int WIDTH_COL_MIN = 10;
 
 static const int WIDTH_COL_DEFAULT = 80;
 static const int WIDTH_COL_MIN = 10;
 

+// the space between the image and the text in the report mode
+static const int IMAGE_MARGIN_IN_REPORT_MODE = 5;
+

 // ============================================================================
 // private classes
 // ============================================================================
 // ============================================================================
 // private classes
 // ============================================================================


@@ -175,7 +146,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;


@@ -417,10 +395,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


@@ -587,6 +565,9 @@ public:
     void RefreshLine( size_t line );
     void RefreshLines( size_t lineFrom, size_t lineTo );
 
     void RefreshLine( size_t line );
     void RefreshLines( size_t lineFrom, size_t lineTo );
 

+    // refresh all selected items
+    void RefreshSelected();
+

     // refresh all lines below the given one: the difference with
     // RefreshLines() is that the index here might not be a valid one (happens
     // when the last line is deleted)
     // refresh all lines below the given one: the difference with
     // RefreshLines() is that the index here might not be a valid one (happens
     // when the last line is deleted)


@@ -722,6 +703,12 @@ public:
     // get the y position of the given line (only for report view)
     wxCoord GetLineY(size_t line) const;
 
     // get the y position of the given line (only for report view)
     wxCoord GetLineY(size_t line) const;
 

+    // get the brush to use for the item highlighting
+    wxBrush *GetHighlightBrush() const
+    {
+        return m_hasFocus ? m_highlightBrush : m_highlightUnfocusedBrush;
+    }
+

 //protected:
     // the array of all line objects for a non virtual list control
     wxListLineDataArray  m_lines;
 //protected:
     // the array of all line objects for a non virtual list control
     wxListLineDataArray  m_lines;


@@ -746,7 +733,6 @@ public:
     // call
     bool                 m_dirty;
 
     // call
     bool                 m_dirty;
 

-    wxBrush             *m_highlightBrush;

     wxColour            *m_highlightColour;
     int                  m_xScroll,
                          m_yScroll;
     wxColour            *m_highlightColour;
     int                  m_xScroll,
                          m_yScroll;


@@ -845,6 +831,10 @@ private:
     size_t m_lineFrom,
            m_lineTo;
 
     size_t m_lineFrom,
            m_lineTo;
 

+    // the brushes to use for item highlighting when we do/don't have focus
+    wxBrush *m_highlightBrush,
+            *m_highlightUnfocusedBrush;
+

     DECLARE_DYNAMIC_CLASS(wxListMainWindow);
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(wxListMainWindow);
     DECLARE_EVENT_TABLE()
 };


@@ -895,12 +885,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 )
         {


@@ -927,6 +924,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
         {


@@ -950,6 +950,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);
                 }
             }


@@ -957,12 +968,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)


@@ -1518,32 +1548,68 @@ void wxListLineData::SetAttr(wxListItemAttr *attr)
     item->SetAttr(attr);
 }
 
     item->SetAttr(attr);
 }
 

-void wxListLineData::SetAttributes(wxDC *dc,
+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->GetHighlightBrush() );
+        }
+        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 )


@@ -1551,6 +1617,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())
     {


@@ -1562,6 +1637,8 @@ void wxListLineData::Draw( wxDC *dc )
     if (item->HasText())
     {
         wxRect rectLabel = m_gi->m_rectLabel;
     if (item->HasText())
     {
         wxRect rectLabel = m_gi->m_rectLabel;

+
+        wxDCClipper clipper(*dc, rectLabel);

         dc->DrawText( item->GetText(), rectLabel.x, rectLabel.y );
     }
 }
         dc->DrawText( item->GetText(), rectLabel.x, rectLabel.y );
     }
 }


@@ -1571,47 +1648,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();
-

     // TODO: later we should support setting different attributes for
     //       different columns - to do it, just add "col" argument to
     // TODO: later we should support setting different attributes for
     //       different columns - to do it, just add "col" argument to

-    //       GetAttr() and move this code into the loop below
+    //       GetAttr() and move these lines into the loop below

     wxListItemAttr *attr = GetAttr();
     wxListItemAttr *attr = GetAttr();

-    SetAttributes(dc, attr, colText, font, highlighted);
-
-    bool hasBgCol = attr && attr->HasBackgroundColour();
-    if ( highlighted || hasBgCol )
+    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 );
     }
 


@@ -1626,27 +1668,29 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
     {
         wxListItemData *item = node->GetData();
 
     {
         wxListItemData *item = node->GetData();
 

+        int width = m_owner->GetColumnWidth(col++);

         int xOld = x;
         int xOld = x;

+        x += width;

 
         if ( item->HasImage() )
         {
             int ix, iy;
 
         if ( item->HasImage() )
         {
             int ix, iy;

-            m_owner->DrawImage( item->GetImage(), dc, x, y );
+            m_owner->DrawImage( item->GetImage(), dc, xOld, y );

             m_owner->GetImageSize( item->GetImage(), ix, iy );
             m_owner->GetImageSize( item->GetImage(), ix, iy );

-            x += ix + 5; // FIXME: what is "5"?
-        }

 
 

-        int width = m_owner->GetColumnWidth(col++);
+            ix += IMAGE_MARGIN_IN_REPORT_MODE;
+
+            xOld += ix;
+            width -= ix;
+        }

 
 

-        wxDCClipper clipper(*dc, x, y, width, rect.height);
+        wxDCClipper clipper(*dc, xOld, y, width, rect.height);

 
         if ( item->HasText() )
         {
 
         if ( item->HasText() )
         {

-            dc->DrawText( item->GetText(), x, y );
+            dc->DrawText( item->GetText(), xOld, y );

         }
 
         }
 

-        x = xOld + width;
-

         node = node->GetNext();
     }
 }
         node = node->GetNext();
     }
 }


@@ -1820,9 +1864,11 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         dc.SetPen( *wxWHITE_PEN );
 
         DoDrawRect( &dc, x, HEADER_OFFSET_Y, cw, h-2 );
         dc.SetPen( *wxWHITE_PEN );
 
         DoDrawRect( &dc, x, HEADER_OFFSET_Y, cw, h-2 );

-        dc.SetClippingRegion( x, HEADER_OFFSET_Y, cw-5, h-4 );
-        dc.DrawText( item.GetText(), x + EXTRA_WIDTH, HEADER_OFFSET_Y + EXTRA_HEIGHT );
-        dc.DestroyClippingRegion();
+        wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw-5, h-4 );
+
+        dc.DrawText( item.GetText(),
+                     x + EXTRA_WIDTH, HEADER_OFFSET_Y + EXTRA_HEIGHT );
+

         x += wCol;
 
         if (xEnd > w+5)
         x += wCol;
 
         if (xEnd > w+5)


@@ -2138,7 +2184,8 @@ wxListMainWindow::wxListMainWindow()
 {
     Init();
 
 {
     Init();
 

-    m_highlightBrush = (wxBrush *) NULL;
+    m_highlightBrush =
+    m_highlightUnfocusedBrush = (wxBrush *) NULL;

 
     m_xScroll =
     m_yScroll = 0;
 
     m_xScroll =
     m_yScroll = 0;


@@ -2155,7 +2202,24 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
 {
     Init();
 
 {
     Init();
 

-    m_highlightBrush = new wxBrush( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT), wxSOLID );
+    m_highlightBrush = new wxBrush
+                           (
+                            wxSystemSettings::GetSystemColour
+                            (
+                                wxSYS_COLOUR_HIGHLIGHT
+                            ),
+                            wxSOLID
+                           );
+
+    m_highlightUnfocusedBrush = new wxBrush
+                                    (
+                                       wxSystemSettings::GetSystemColour
+                                       (
+                                           wxSYS_COLOUR_BTNSHADOW
+                                       ),
+                                       wxSOLID
+                                    );
+

     wxSize sz = size;
     sz.y = 25;
 
     wxSize sz = size;
     sz.y = 25;
 


@@ -2170,6 +2234,7 @@ wxListMainWindow::~wxListMainWindow()
     DoDeleteAllItems();
 
     delete m_highlightBrush;
     DoDeleteAllItems();
 
     delete m_highlightBrush;

+    delete m_highlightUnfocusedBrush;

 
     delete m_renameTimer;
 }
 
     delete m_renameTimer;
 }


@@ -2332,25 +2397,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);

     }
 }
 
     }
 }
 


@@ -2365,7 +2442,7 @@ bool wxListMainWindow::HighlightLine( size_t line, bool highlight )
     else // !virtual
     {
         wxListLineData *ld = GetLine(line);
     else // !virtual
     {
         wxListLineData *ld = GetLine(line);

-        wxCHECK_MSG( ld, FALSE, _T("invalid index in IsHighlighted") );
+        wxCHECK_MSG( ld, FALSE, _T("invalid index in HighlightLine") );

 
         changed = ld->Highlight(highlight);
     }
 
         changed = ld->Highlight(highlight);
     }


@@ -2381,6 +2458,15 @@ bool wxListMainWindow::HighlightLine( size_t line, bool highlight )
 
 void wxListMainWindow::RefreshLine( size_t line )
 {
 
 void wxListMainWindow::RefreshLine( size_t line )
 {

+    if ( HasFlag(wxLC_REPORT) )
+    {
+        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 );


@@ -2452,6 +2538,37 @@ void wxListMainWindow::RefreshAfter( size_t lineFrom )
     }
 }
 
     }
 }
 

+void wxListMainWindow::RefreshSelected()
+{
+    if ( IsEmpty() )
+        return;
+
+    size_t from, to;
+    if ( InReportView() )
+    {
+        GetVisibleLinesRange(&from, &to);
+    }
+    else // !virtual
+    {
+        from = 0;
+        to = GetItemCount() - 1;
+    }
+
+    if ( HasCurrent() && m_current > from && m_current <= to )
+    {
+        RefreshLine(m_current);
+    }
+
+    for ( size_t line = from; line <= to; line++ )
+    {
+        // NB: the test works as expected even if m_current == -1
+        if ( line != m_current && IsHighlighted(line) )
+        {
+            RefreshLine(line);
+        }
+    }
+}
+

 void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     // Note: a wxPaintDC must be constructed even if no drawing is
 void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     // Note: a wxPaintDC must be constructed even if no drawing is


@@ -2572,15 +2689,21 @@ 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 but under other platforms only draw it if we do: it is a bit
+        // silly to draw "focus rect" if we don't have focus!

 #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 )
+#else // !__WXMAC__
+        if ( m_hasFocus )
+#endif // __WXMAC__/!__WXMAC__
+        {
+            dc.SetPen( *wxBLACK_PEN );
+            dc.SetBrush( *wxTRANSPARENT_BRUSH );
+            dc.DrawRectangle( GetLineHighlightRect(m_current) );
+        }

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


@@ -2617,7 +2740,11 @@ void wxListMainWindow::SendNotify( size_t line,
     if ( point != wxDefaultPosition )
         le.m_pointDrag = point;
 
     if ( point != wxDefaultPosition )
         le.m_pointDrag = point;
 

-    if ( command != wxEVT_COMMAND_LIST_DELETE_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 );
     }
     {
         GetLine(line)->GetItem( 0, le.m_item );
     }


@@ -3123,11 +3250,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:


@@ -3159,12 +3291,11 @@ void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {
     m_hasFocus = TRUE;
 
 {
     m_hasFocus = TRUE;
 

-    if ( HasCurrent() )
-        RefreshLine( m_current );
-

     if (!GetParent())
         return;
 
     if (!GetParent())
         return;
 

+    RefreshSelected();
+

 #ifdef __WXGTK__
     g_focusWindow = GetParent();
 #endif
 #ifdef __WXGTK__
     g_focusWindow = GetParent();
 #endif


@@ -3178,8 +3309,7 @@ void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
 {
     m_hasFocus = FALSE;
 
 {
     m_hasFocus = FALSE;
 

-    if ( HasCurrent() )
-        RefreshLine( m_current );
+    RefreshSelected();

 }
 
 void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y )
 }
 
 void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y )


@@ -3448,8 +3578,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 )


@@ -3461,9 +3592,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);
                 }
 


@@ -3477,10 +3612,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;


@@ -3741,7 +3879,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();


@@ -3841,6 +3979,7 @@ 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;
 
     SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM );
     m_dirty = TRUE;
 
     SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM );


@@ -3919,8 +4058,6 @@ void wxListMainWindow::EnsureVisible( long index )
     // been added and its position is not known yet
     if ( m_dirty )
     {
     // been added and its position is not known yet
     if ( m_dirty )
     {

-        m_dirty = FALSE;
-

         RecalculatePositions(TRUE /* no refresh */);
     }
 
         RecalculatePositions(TRUE /* no refresh */);
     }
 


@@ -4254,6 +4391,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)


@@ -4378,36 +4516,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);

         }
     }
 
         }
     }
 


@@ -4798,10 +4935,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 );


@@ -4810,8 +4954,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 )