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

Fix for newline breakage

Browse Source 
Inserting text now retains style at current position


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-12-01 13:52:31 +00:00
parent 7bfe6e3091
commit 7c081bd21c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/richtext/richtextbuffer.cpp
View File

@@ -4730,7 +4730,8 @@ bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRich
wxTextAttrEx paraAttr; wxTextAttrEx paraAttr;
if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
{ {
paraAttr = GetStyleForNewParagraph(pos); // Get appropriate paragraph style
paraAttr = GetStyleForNewParagraph(pos, false, false);
if (!paraAttr.IsDefault()) if (!paraAttr.IsDefault())
p = & paraAttr; p = & paraAttr;
} }
@@ -4767,7 +4768,7 @@ bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int
wxTextAttrEx paraAttr; wxTextAttrEx paraAttr;
if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
{ {
paraAttr = GetStyleForNewParagraph(pos); paraAttr = GetStyleForNewParagraph(pos, false, true /* look for next paragraph style */);
if (!paraAttr.IsDefault()) if (!paraAttr.IsDefault())
p = & paraAttr; p = & paraAttr;
} }
@@ -4831,7 +4832,7 @@ bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock&
/// Get the style that is appropriate for a new paragraph at this position. /// Get the style that is appropriate for a new paragraph at this position.
/// If the previous paragraph has a paragraph style name, look up the next-paragraph /// If the previous paragraph has a paragraph style name, look up the next-paragraph
/// style. /// style.
wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPosition) const wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPosition, bool lookUpNewParaStyle) const
{ {
wxRichTextParagraph* para = GetParagraphAtPosition(pos, caretPosition); wxRichTextParagraph* para = GetParagraphAtPosition(pos, caretPosition);
if (para) if (para)
@@ -4840,7 +4841,7 @@ wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPos
bool foundAttributes = false; bool foundAttributes = false;
// Look for a matching paragraph style // Look for a matching paragraph style
if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && GetStyleSheet()) if (lookUpNewParaStyle && !para->GetAttributes().GetParagraphStyleName().IsEmpty() && GetStyleSheet())
{ {
wxRichTextParagraphStyleDefinition* paraDef = GetStyleSheet()->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName()); wxRichTextParagraphStyleDefinition* paraDef = GetStyleSheet()->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
if (paraDef) if (paraDef)
@@ -6041,7 +6042,7 @@ bool wxRichTextAction::Do()
if (m_newParagraphs.GetPartialParagraph()) if (m_newParagraphs.GetPartialParagraph())
newCaretPosition --; newCaretPosition --;
else else
if (m_newParagraphs.GetChildren().GetCount() > 0) if (m_newParagraphs.GetChildren().GetCount() > 1)
{ {
wxRichTextObject* p = (wxRichTextObject*) m_newParagraphs.GetChildren().GetLast()->GetData(); wxRichTextObject* p = (wxRichTextObject*) m_newParagraphs.GetChildren().GetLast()->GetData();
if (p->GetRange().GetLength() == 1) if (p->GetRange().GetLength() == 1)