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

Merge of SOC2010_RTC_IMAGES branch.

Browse Source 
Added floating images and image property dialog to wxRichTextCtrl, by Mingquan
Yang as part of GSOC 2010. Also changed image block creation to use a memory
stream instead of creating a temporary file.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-09-30 10:27:07 +00:00
parent 9bc95da04c
commit cdaed652d7
25 changed files with 3654 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/richtext/richtexthtml.cpp
View File

@@ -470,20 +470,27 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
#if wxUSE_FILESYSTEM
if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY)
{
#if 0
if (!image->GetImage().Ok() && image->GetImageBlock().GetData())
image->LoadFromBlock();
if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
image->MakeBlock();
#endif
if (image->GetImage().Ok())
if (image->GetImageBlock().IsOk())
{
wxString ext(image->GetImageBlock().GetExtension());
wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext));
wxMemoryFSHandler::AddFile(tempFilename, image->GetImage(), image->GetImageBlock().GetImageType());
wxImage img;
image->GetImageBlock().Load(img);
if (img.IsOk())
{
wxString ext(image->GetImageBlock().GetExtension());
wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext));
wxMemoryFSHandler::AddFile(tempFilename, img, image->GetImageBlock().GetImageType());
m_imageLocations.Add(tempFilename);
m_imageLocations.Add(tempFilename);
str << wxT("memory:") << tempFilename;
str << wxT("memory:") << tempFilename;
}
}
else
str << wxT("memory:?");
@@ -492,12 +499,14 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
}
else if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_FILES)
{
#if 0
if (!image->GetImage().Ok() && image->GetImageBlock().GetData())
image->LoadFromBlock();
if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
image->MakeBlock();
#endif
if (image->GetImage().Ok())
if (image->GetImageBlock().Ok())
{
wxString tempDir(GetTempDir());
if (tempDir.IsEmpty())
@@ -522,14 +531,17 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
str << wxT("data:");
str << GetMimeType(image->GetImageBlock().GetImageType());
str << wxT(";base64,");
#if 0
if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
image->MakeBlock();
#endif
if (image->GetImageBlock().Ok())
{
wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() );
str << data;
wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() );
str << data;
delete[] data;
delete[] data;
}
}
str << wxT("\" />");