X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a6fd3e2b7bbca96070259c0f8e0295bef756454..0147a7c1409829913d5cdfc29d3d1588f29c64cb:/src/generic/listctrl.cpp

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 4386a99a92..fa1cc35090 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -100,6 +100,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_CACHE_HINT)
 
 // ----------------------------------------------------------------------------
 // constants
@@ -212,7 +213,7 @@ class WXDLLEXPORT wxListItemData
 {
 public:
     wxListItemData(wxListMainWindow *owner);
-    ~wxListItemData() { delete m_attr; delete m_rect; }
+    ~wxListItemData();
 
     void SetItem( const wxListItem &info );
     void SetImage( int image ) { m_image = image; }
@@ -818,6 +819,9 @@ private:
     // 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
@@ -983,6 +987,18 @@ void wxSelectionStore::OnItemDelete(size_t item)
 //  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;
@@ -997,7 +1013,7 @@ wxListItemData::wxListItemData(wxListMainWindow *owner)
 
     m_owner = owner;
 
-    if ( owner->HasFlag(wxLC_REPORT) )
+    if ( owner->InReportView() )
     {
         m_rect = NULL;
     }
@@ -2146,7 +2162,7 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
 
 wxListMainWindow::~wxListMainWindow()
 {
-    DeleteEverything();
+    DoDeleteAllItems();
 
     delete m_highlightBrush;
 
@@ -2469,6 +2485,13 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         wxCoord xOrig, yOrig;
         CalcUnscrolledPosition(0, 0, &xOrig, &yOrig);
 
+        // tell the caller cache to cache the data
+        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);
@@ -3527,7 +3550,10 @@ void wxListMainWindow::SetItemCount(long count)
     m_selStore.SetItemCount(count);
     m_countVirt = count;
 
-    Refresh();
+    ResetVisibleLinesRange();
+
+    // scrollbars must be reset
+    m_dirty = TRUE;
 }
 
 int wxListMainWindow::GetSelectedItemCount()
@@ -3586,9 +3612,6 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos)
 
 void wxListMainWindow::RecalculatePositions()
 {
-    if ( IsEmpty() )
-        return;
-
     wxClientDC dc( this );
     dc.SetFont( GetFont() );
 
@@ -3817,7 +3840,7 @@ void wxListMainWindow::DeleteColumn( int col )
     m_columns.DeleteNode( node );
 }
 
-void wxListMainWindow::DeleteAllItems()
+void wxListMainWindow::DoDeleteAllItems()
 {
     if ( IsEmpty() )
     {
@@ -3825,8 +3848,6 @@ void wxListMainWindow::DeleteAllItems()
         return;
     }
 
-    m_dirty = TRUE;
-
     ResetCurrent();
 
     // to make the deletion of all items faster, we don't send the
@@ -3842,7 +3863,7 @@ void wxListMainWindow::DeleteAllItems()
     {
         m_countVirt = 0;
 
-        ResetVisibleLinesRange();
+        m_selStore.Clear();
     }
 
     if ( InReportView() )
@@ -3851,8 +3872,13 @@ void wxListMainWindow::DeleteAllItems()
     }
 
     m_lines.Clear();
+}
 
-    m_selStore.Clear();
+void wxListMainWindow::DeleteAllItems()
+{
+    DoDeleteAllItems();
+
+    RecalculatePositions();
 }
 
 void wxListMainWindow::DeleteEverything()
@@ -4920,4 +4946,14 @@ void wxListCtrl::SetItemCount(long 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