* 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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index d1cd40d8956cb56fcafc4b6759f2ebe9bbe3ffd5..1563e0b31d72d287dfe8bc7727098c730f2fefa1 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -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);
 }