From 3087eaea04bb4f8fe6aef1c649fe86fa1691894a Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 19 Feb 2007 18:32:07 +0000 Subject: [PATCH] Layout correction git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextbuffer.cpp | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 47f1e8d8e3..41351256a6 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -4398,24 +4398,7 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, c /// Lay the item out bool wxRichTextPlainText::Layout(wxDC& dc, const wxRect& WXUNUSED(rect), int WXUNUSED(style)) { - wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph); - wxASSERT (para != NULL); - - wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes()); - - if (textAttr.GetFont().Ok()) - dc.SetFont(textAttr.GetFont()); - - wxString str = m_text; - if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS)) - str.MakeUpper(); - - wxString toReplace = wxRichTextLineBreakChar; - str.Replace(toReplace, wxT(" ")); - - wxCoord w, h; - dc.GetTextExtent(str, & w, & h, & m_descent); - m_size = wxSize(w, dc.GetCharHeight()); + GetRangeSize(GetRange(), m_size, m_descent, dc, 0, wxPoint(0, 0)); return true; } -- 2.45.2