Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace wxTreeItemAttr and wxListItemAttr with wxItemAttr

Browse Source 
The two existing structs were completely identical, just replace them with a
single wxItemAttr.

Notice that wxDataViewItemAttr is not quite the same, although pretty similar,
so it remains separate for now. It would be nice to combine it with this one
too in the future, e.g. to make it simpler to make items bold in a wxListCtrl.
This commit is contained in:
Vadim Zeitlin
2016-04-16 17:44:19 +02:00
parent c592363e95
commit 246ae58c19
24 changed files with 232 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/msw/listctrl.cpp
View File

@@ -198,7 +198,7 @@ private:
///////////////////////////////////////////////////////
// Problem:
// The MSW version had problems with SetTextColour() et
// al as the wxListItemAttr's were stored keyed on the
// al as the wxItemAttr's were stored keyed on the
// item index. If a item was inserted anywhere but the end
// of the list the text attributes (colour etc) for
// the following items were out of sync.
@@ -223,7 +223,7 @@ public:
wxMSWListItemData() : attr(NULL), lParam(0) {}
~wxMSWListItemData() { delete attr; }
wxListItemAttr *attr;
wxItemAttr *attr;
LPARAM lParam; // real user data
wxDECLARE_NO_COPY_CLASS(wxMSWListItemData);
@@ -811,13 +811,13 @@ bool wxListCtrl::SetItem(wxListItem& info)
// attributes
if ( info.HasAttributes() )
{
const wxListItemAttr& attrNew = *info.GetAttributes();
const wxItemAttr& 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(attrNew);
data->attr = new wxItemAttr(attrNew);
}
}
@@ -1754,7 +1754,7 @@ long wxListCtrl::InsertItem(const wxListItem& info)
if ( info.HasAttributes() )
{
// take copy of attributes
data->attr = new wxListItemAttr(*info.GetAttributes());
data->attr = new wxItemAttr(*info.GetAttributes());
// and remember that we have some now...
m_hasAnyAttr = true;
@@ -2858,7 +2858,7 @@ static void HandleItemPaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont)
static WXLPARAM HandleItemPrepaint(wxListCtrl *listctrl,
LPNMLVCUSTOMDRAW pLVCD,
wxListItemAttr *attr)
wxItemAttr *attr)
{
if ( !attr )
{
@@ -3103,7 +3103,7 @@ int wxListCtrl::OnGetItemColumnImage(long item, long column) const
return -1;
}
wxListItemAttr *wxListCtrl::DoGetItemColumnAttr(long item, long column) const
wxItemAttr *wxListCtrl::DoGetItemColumnAttr(long item, long column) const
{
if ( IsVirtual() )
return OnGetItemColumnAttr(item, column);