fix for rather mysterious problem when deleting the list ctrl

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 8ea0eada4e4197f1175b451e2f7a822802903929..fa1cc35090e26ec946932cc4a9aabc9bb628e6db 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -819,6 +819,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


@@ -2159,7 +2162,7 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
 
 wxListMainWindow::~wxListMainWindow()
 {
 
 wxListMainWindow::~wxListMainWindow()
 {

-    DeleteEverything();
+    DoDeleteAllItems();

 
     delete m_highlightBrush;
 
 
     delete m_highlightBrush;
 


@@ -3549,7 +3552,8 @@ void wxListMainWindow::SetItemCount(long count)
 
     ResetVisibleLinesRange();
 
 
     ResetVisibleLinesRange();
 

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

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


@@ -3608,9 +3612,6 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos)
 
 void wxListMainWindow::RecalculatePositions()
 {
 
 void wxListMainWindow::RecalculatePositions()
 {

-    if ( IsEmpty() )
-        return;
-

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


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

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

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


@@ -3871,11 +3872,13 @@ void wxListMainWindow::DeleteAllItems()
     }
 
     m_lines.Clear();
     }
 
     m_lines.Clear();

+}

 
 

-    // NB: don't just set m_dirty to TRUE here as RecalculatePositions()
-    //     doesn't do anything if the control is empty and so we won't be
-    //     refreshed
-    Refresh();
+void wxListMainWindow::DeleteAllItems()
+{
+    DoDeleteAllItems();
+
+    RecalculatePositions();

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