From bd7bd09eb3921fd928ca6b459dac01a1df6a4e06 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 21 Apr 2009 17:31:03 +0000
Subject: [PATCH] don't readd items in SetImageList() after changing the
 control mode, they are supposed to be preserved by wxListCtrl itself
 (correction for #9484)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/listbkg.cpp | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index 855c1c71a4..96eed8b955 100644
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -304,22 +304,8 @@ void wxListbook::SetImageList(wxImageList *imageList)
     // If imageList presence has changed, we update the list control view
     if ( (imageList != NULL) != (GetImageList() != NULL) )
     {
-        wxArrayString labels;
-        labels.Alloc(GetPageCount());
-
-        wxArrayInt imageIds;
-        imageIds.Alloc(GetPageCount());
-
+        // Preserve the selection which is lost when changing the mode
         const int oldSel = GetSelection();
-        size_t i;
-
-        // Grab snapshot of all list control items before changing the window
-        // style (which deletes the items)
-        for ( i = 0; i < GetPageCount(); i++ )
-        {
-           labels.Add(GetPageText(i));
-           imageIds.Add(GetPageImage(i));
-        }
 
         // Update the style to use icon view for images, report view otherwise
         long style = wxLC_SINGLE_SEL;
@@ -336,12 +322,6 @@ void wxListbook::SetImageList(wxImageList *imageList)
         if ( !imageList )
             list->InsertColumn(0, wxT("Pages"));
 
-        // Add back the list control items
-        for ( i = 0; i < GetPageCount(); i++ )
-        {
-           list->InsertItem(i, labels[i], imageIds[i]);
-        }
-
         // Restore selection
         if ( oldSel != wxNOT_FOUND )
            SetSelection(oldSel);