Binary compatible almost correct workaround for failure to merge the

m_overflow flag


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/generic/grid.cpp

@@ -2542,12 +2542,25 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
                             attr->MergeWith(attrrow);
                             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
                         //attr->IncRef();
                         //m_data->m_mergeAttr.SetAttr(attr, row, col);
                     }
                     else
-        {
+                    {
                         // one or none is non null return it or null.
                         if(attrrow) attr = attrrow;
                         if(attrcol) attr = attrcol;