From d9dd0c95df369be61d3dfa9314e87b589e50526a Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 19 Sep 2013 11:09:34 +0000 Subject: [PATCH] Second part of #15224 fix: AddRows, AddColumns (dghart) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextbuffer.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 6c682aacad..236faf844a 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -10641,6 +10641,10 @@ bool wxRichTextTable::AddRows(int startRow, int noRows, const wxRichTextAttr& at action->SetPosition(GetRange().GetStart()); } + wxRichTextAttr cellattr = attr; + if (!cellattr.GetTextColour().IsOk()) + cellattr.SetTextColour(buffer->GetBasicStyle().GetTextColour()); + int i, j; for (i = 0; i < noRows; i++) { @@ -10660,7 +10664,7 @@ bool wxRichTextTable::AddRows(int startRow, int noRows, const wxRichTextAttr& at for (j = 0; j < m_colCount; j++) { wxRichTextCell* cell = new wxRichTextCell; - cell->GetAttributes() = attr; + cell->GetAttributes() = cellattr; AppendChild(cell); cell->AddParagraph(wxEmptyString); @@ -10699,6 +10703,10 @@ bool wxRichTextTable::AddColumns(int startCol, int noCols, const wxRichTextAttr& action->SetPosition(GetRange().GetStart()); } + wxRichTextAttr cellattr = attr; + if (!cellattr.GetTextColour().IsOk()) + cellattr.SetTextColour(buffer->GetBasicStyle().GetTextColour()); + int i, j; for (i = 0; i < m_rowCount; i++) { @@ -10706,7 +10714,7 @@ bool wxRichTextTable::AddColumns(int startCol, int noCols, const wxRichTextAttr& for (j = 0; j < noCols; j++) { wxRichTextCell* cell = new wxRichTextCell; - cell->GetAttributes() = attr; + cell->GetAttributes() = cellattr; AppendChild(cell); cell->AddParagraph(wxEmptyString); -- 2.47.2