Merge of SOC2010_RTC_IMAGES branch.

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

src/richtext/richtextxml.cpp

@@ -813,8 +813,8 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
 
         wxString style = CreateStyle(obj.GetAttributes(), false);
 
-        if (imageObj.GetImage().Ok() && !imageObj.GetImageBlock().Ok())
-            imageObj.MakeBlock();
+        //if (imageObj.GetImage().Ok() && !imageObj.GetImageBlock().Ok())
+        //    imageObj.MakeBlock();
 
         OutputIndentation(stream, indent);
         OutputString(stream, wxT("<") + objectName, convMem, convFile);