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

Binary compatible almost correct workaround for failure to merge the

Browse Source 
m_overflow flag


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-05-07 17:47:51 +00:00
parent 1b4c5c70bb
commit 268df712a3
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/generic/grid.cpp
View File

@@ -2542,6 +2542,19 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
attr->MergeWith(attrrow); attr->MergeWith(attrrow);
attrrow->DecRef(); attrrow->DecRef();
} }
// This is a binary compatible workaround for the fact that
// wxGridCellAttr::MergeWith doesn't merge m_oveflow.
// DO NOT port this fix to 2.5, it should be done the
// Right Way there instead.
if (attrrow)
attr->SetOverflow(attrrow->GetOverflow());
if (attrcol)
attr->SetOverflow(attrcol->GetOverflow());
if (attrcell)
attr->SetOverflow(attrcell->GetOverflow());
//store merge attr if cache implemented //store merge attr if cache implemented
//attr->IncRef(); //attr->IncRef();
//m_data->m_mergeAttr.SetAttr(attr, row, col); //m_data->m_mergeAttr.SetAttr(attr, row, col);