* Fix logical error in m_overflow attribute merging
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
f243e00b4b
commit
ff699386b9
@ -2138,7 +2138,7 @@ void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom)
|
||||
SetReadOnly(mergefrom->IsReadOnly());
|
||||
|
||||
if (!HasOverflowMode() && mergefrom->HasOverflowMode() )
|
||||
SetReadOnly(mergefrom->GetOverflow());
|
||||
SetOverflow(mergefrom->GetOverflow());
|
||||
|
||||
SetDefAttr(mergefrom->m_defGridAttr);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user