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

Make an image block beore writing it, if there's no data in the block

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-04-16 18:37:09 +00:00
parent dd5cb4b197
commit d5363f57fb
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/richtext/richtextbuffer.cpp
View File

@@ -3854,7 +3854,7 @@ bool wxRichTextBuffer::PasteFromClipboard(long position)
wxTextDataObject data; wxTextDataObject data;
wxTheClipboard->GetData(data); wxTheClipboard->GetData(data);
wxString text(data.GetText()); wxString text(data.GetText());
text.Replace(_T("\r\n"), _T("\n")); text.Replace(_T("\r\n"), _T("\n"));
InsertTextWithUndo(position+1, text, GetRichTextCtrl()); InsertTextWithUndo(position+1, text, GetRichTextCtrl());

4
src/richtext/richtexthtml.cpp
View File

@@ -122,6 +122,7 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
node2 = node2->GetNext(); node2 = node2->GetNext();
} }
str << wxT("\n");
//OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream, false); //OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream, false);
} }
node = node->GetNext(); node = node->GetNext();
@@ -486,6 +487,9 @@ void wxRichTextHTMLHandler::Image_to_Base64(wxRichTextImage* image, wxOutputStre
str << GetMimeType(image->GetImageBlock().GetImageType()); str << GetMimeType(image->GetImageBlock().GetImageType());
str << wxT(";base64,"); str << wxT(";base64,");
if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
image->MakeBlock();
wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() ); wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() );
str << data; str << data;