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

Apply previous paragraph style if pasting plain text, but not if pasting rich text.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2008-05-09 08:47:08 +00:00
parent e10caf88b6
commit 71d8e824aa
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/richtext/richtextbuffer.cpp
View File

@@ -5224,6 +5224,15 @@ bool wxRichTextBuffer::InsertParagraphsWithUndo(long pos, const wxRichTextParagr
action->GetNewParagraphs() = paragraphs; action->GetNewParagraphs() = paragraphs;
if (p && !p->IsDefault())
{
for (wxRichTextObjectList::compatibility_iterator node = action->GetNewParagraphs().GetChildren().GetFirst(); node; node = node->GetNext())
{
wxRichTextObject* child = node->GetData();
child->SetAttributes(*p);
}
}
action->SetPosition(pos); action->SetPosition(pos);
wxRichTextRange range = wxRichTextRange(pos, pos + paragraphs.GetRange().GetEnd() - 1); wxRichTextRange range = wxRichTextRange(pos, pos + paragraphs.GetRange().GetEnd() - 1);
@@ -6086,7 +6095,7 @@ bool wxRichTextBuffer::PasteFromClipboard(long position)
wxRichTextBuffer* richTextBuffer = data.GetRichTextBuffer(); wxRichTextBuffer* richTextBuffer = data.GetRichTextBuffer();
if (richTextBuffer) if (richTextBuffer)
{ {
InsertParagraphsWithUndo(position+1, *richTextBuffer, GetRichTextCtrl(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); InsertParagraphsWithUndo(position+1, *richTextBuffer, GetRichTextCtrl(), 0);
if (GetRichTextCtrl()) if (GetRichTextCtrl())
GetRichTextCtrl()->ShowPosition(position + richTextBuffer->GetRange().GetEnd()); GetRichTextCtrl()->ShowPosition(position + richTextBuffer->GetRange().GetEnd());
delete richTextBuffer; delete richTextBuffer;
@@ -6110,7 +6119,7 @@ bool wxRichTextBuffer::PasteFromClipboard(long position)
#else #else
wxString text2 = text; wxString text2 = text;
#endif #endif
InsertTextWithUndo(position+1, text2, GetRichTextCtrl()); InsertTextWithUndo(position+1, text2, GetRichTextCtrl(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
if (GetRichTextCtrl()) if (GetRichTextCtrl())
GetRichTextCtrl()->ShowPosition(position + text2.Length()); GetRichTextCtrl()->ShowPosition(position + text2.Length());