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

compilation fixes for the wxListItemAttr

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-12-04 22:57:59 +00:00
parent bdc72a2268
commit aaa37c0d23
3 changed files with 283 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/generic/listctrl.cpp
View File

@@ -48,7 +48,7 @@ wxListItemData::wxListItemData( const wxListItem &info )
{
m_image = -1;
m_data = 0;
m_colour = info.m_colour;
m_colour = (wxColour *)&info.GetTextColour();
SetItem( info );
}
@@ -57,7 +57,7 @@ void wxListItemData::SetItem( const wxListItem &info )
if (info.m_mask & wxLIST_MASK_TEXT) m_text = info.m_text;
if (info.m_mask & wxLIST_MASK_IMAGE) m_image = info.m_image;
if (info.m_mask & wxLIST_MASK_DATA) m_data = info.m_data;
m_colour = info.m_colour;
m_colour = (wxColour *)&info.GetTextColour();
m_xpos = 0;
m_ypos = 0;
m_width = info.m_width;
@@ -146,7 +146,7 @@ void wxListItemData::GetItem( wxListItem &info )
info.m_text = m_text;
info.m_image = m_image;
info.m_data = m_data;
info.m_colour = m_colour;
info.SetTextColour(*m_colour);
}
wxColour *wxListItemData::GetColour()
@@ -1302,7 +1302,7 @@ void wxListMainWindow::OnRenameAccept()
info.m_mask = wxLIST_MASK_TEXT;
info.m_itemId = le.m_itemIndex;
info.m_text = m_renameRes;
info.m_colour = le.m_item.GetTextColour();
info.SetTextColour(le.m_item.GetTextColour());
SetItem( info );
}
@@ -2528,7 +2528,8 @@ wxListItem::wxListItem()
m_data = 0;
m_format = wxLIST_FORMAT_CENTRE;
m_width = 0;
m_colour = wxBLACK;
m_attr = NULL;
}
// -------------------------------------------------------------------------------------
@@ -2571,7 +2572,11 @@ void wxListEvent::CopyObject(wxObject& object_dest) const
obj->m_item.m_data = m_item.m_data;
obj->m_item.m_format = m_item.m_format;
obj->m_item.m_width = m_item.m_width;
obj->m_item.m_colour = m_item.m_colour;
if ( m_item.HasAttributes() )
{
obj->m_item.SetTextColour(m_item.GetTextColour());
}
}
// -------------------------------------------------------------------------------------