Image objects should load and save attributes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@51371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2008-01-25 12:10:56 +00:00
parent 123cc0e9d7
commit b97ff943c6

View File

@@ -200,6 +200,7 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
if (!data.empty())
{
wxRichTextImage* imageObj = new wxRichTextImage(para);
GetStyle(imageObj->GetAttributes(), child, false);
para->AppendChild(imageObj);
wxStringInputStream strStream(data);
@@ -719,6 +720,8 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
{
wxRichTextImage& imageObj = (wxRichTextImage&) obj;
wxString style = CreateStyle(obj.GetAttributes(), false);
if (imageObj.GetImage().Ok() && !imageObj.GetImageBlock().Ok())
imageObj.MakeBlock();
@@ -727,11 +730,11 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
if (!imageObj.GetImageBlock().Ok())
{
// No data
OutputString(stream, wxT(">"), convMem, convFile);
OutputString(stream, style + wxT(">"), convMem, convFile);
}
else
{
OutputString(stream, wxString::Format(wxT(" imagetype=\"%d\">"), (int) imageObj.GetImageBlock().GetImageType()));
OutputString(stream, wxString::Format(wxT(" imagetype=\"%d\"") + style + wxT(">"), (int) imageObj.GetImageBlock().GetImageType()));
}
OutputIndentation(stream, indent+1);