Merge new item attributes if any are already existing

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index d47af77952d2d21f11471e7e15d4006b1f389ca0..eea37b0384f24d4af3a97d0f04fef0d60b75322f 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -888,7 +888,7 @@ void wxListItemData::SetItem( const wxListItem &info )
     if ( info.HasAttributes() )
     {
         if ( m_attr )
     if ( info.HasAttributes() )
     {
         if ( m_attr )

-            *m_attr = *info.GetAttributes();
+            m_attr->AssignFrom(*info.GetAttributes());

         else
             m_attr = new wxListItemAttr(*info.GetAttributes());
     }
         else
             m_attr = new wxListItemAttr(*info.GetAttributes());
     }