Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Second part of #15224 fix: AddRows, AddColumns (dghart)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-09-19 11:09:34 +00:00
parent 0cae0a4e18
commit d9dd0c95df
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/richtext/richtextbuffer.cpp
View File

@@ -10641,6 +10641,10 @@ bool wxRichTextTable::AddRows(int startRow, int noRows, const wxRichTextAttr& at
action->SetPosition(GetRange().GetStart()); action->SetPosition(GetRange().GetStart());
} }
wxRichTextAttr cellattr = attr;
if (!cellattr.GetTextColour().IsOk())
cellattr.SetTextColour(buffer->GetBasicStyle().GetTextColour());
int i, j; int i, j;
for (i = 0; i < noRows; i++) 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++) for (j = 0; j < m_colCount; j++)
{ {
wxRichTextCell* cell = new wxRichTextCell; wxRichTextCell* cell = new wxRichTextCell;
cell->GetAttributes() = attr; cell->GetAttributes() = cellattr;
AppendChild(cell); AppendChild(cell);
cell->AddParagraph(wxEmptyString); cell->AddParagraph(wxEmptyString);
@@ -10699,6 +10703,10 @@ bool wxRichTextTable::AddColumns(int startCol, int noCols, const wxRichTextAttr&
action->SetPosition(GetRange().GetStart()); action->SetPosition(GetRange().GetStart());
} }
wxRichTextAttr cellattr = attr;
if (!cellattr.GetTextColour().IsOk())
cellattr.SetTextColour(buffer->GetBasicStyle().GetTextColour());
int i, j; int i, j;
for (i = 0; i < m_rowCount; i++) 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++) for (j = 0; j < noCols; j++)
{ {
wxRichTextCell* cell = new wxRichTextCell; wxRichTextCell* cell = new wxRichTextCell;
cell->GetAttributes() = attr; cell->GetAttributes() = cellattr;
AppendChild(cell); AppendChild(cell);
cell->AddParagraph(wxEmptyString); cell->AddParagraph(wxEmptyString);