From ff699386b9b709c069ecc3c24acd6f7f4644d23e Mon Sep 17 00:00:00 2001
From: Roger Gammans <rgammans@computer-surgery.co.uk>
Date: Sun, 18 May 2003 15:07:40 +0000
Subject: [PATCH]  * 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
---
 src/generic/grid.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index d1cd40d895..1563e0b31d 100644
--- 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);
 }
-- 
2.47.2