From a2ac9be2aca8921833adf1086b062566095fa14a Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 2 Aug 2010 13:26:07 +0000 Subject: [PATCH] Don't create a font when converting to wxTextAttrEx unless one exists in the wxRichTextAttr git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@65157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextbuffer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index b386ff627f..390576b21f 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -8704,7 +8704,8 @@ wxRichTextAttr::operator wxTextAttrEx () const attr.SetTabs(GetTabs()); attr.SetLeftIndent(GetLeftIndent(), GetLeftSubIndent()); attr.SetRightIndent(GetRightIndent()); - attr.SetFont(CreateFont()); + if (HasFont()) + attr.SetFont(CreateFont()); attr.SetParagraphSpacingAfter(m_paragraphSpacingAfter); attr.SetParagraphSpacingBefore(m_paragraphSpacingBefore);