don't overwrite the existing attributes when setting one new one, i.e. SetItemBackgroundColour() after SetItemTextColour() doesn't reset the text colour to default one any more

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-12-22 03:07:48 +00:00
parent 5421785005
commit 0f3888a5f8

View File

@@ -788,12 +788,15 @@ bool wxListCtrl::SetItem(wxListItem& info)
data->lParam = info.m_data;
// attributes
if (info.HasAttributes())
if ( info.HasAttributes() )
{
if (data->attr)
*data->attr = *info.GetAttributes();
const wxListItemAttr& attrNew = *info.GetAttributes();
// don't overwrite the already set attributes if we have them
if ( data->attr )
data->attr->AssignFrom(attrNew);
else
data->attr = new wxListItemAttr(*info.GetAttributes());
data->attr = new wxListItemAttr(attrNew);
};
};