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

Take basic style into account when applying style sheet

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@51415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2008-01-27 17:58:43 +00:00
parent a5e384ca8d
commit fbd42050d5
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/richtext/richtextbuffer.cpp
View File

@@ -2544,6 +2544,29 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh
int foundCount = 0; int foundCount = 0;
wxRichTextAttr attr(GetBasicStyle());
if (GetBasicStyle().HasParagraphStyleName())
{
wxRichTextParagraphStyleDefinition* paraDef = styleSheet->FindParagraphStyle(GetBasicStyle().GetParagraphStyleName());
if (paraDef)
{
attr.Apply(paraDef->GetStyleMergedWithBase(styleSheet));
SetBasicStyle(attr);
foundCount ++;
}
}
if (GetBasicStyle().HasCharacterStyleName())
{
wxRichTextCharacterStyleDefinition* charDef = styleSheet->FindCharacterStyle(GetBasicStyle().GetCharacterStyleName());
if (charDef)
{
attr.Apply(charDef->GetStyleMergedWithBase(styleSheet));
SetBasicStyle(attr);
foundCount ++;
}
}
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
while (node) while (node)
{ {