Reworked wxPGCell. It is now reference counted, and therefore much more user friendly...

[wxWidgets.git] / src / richtext / richtextxml.cpp

diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index 8b914fb646eefc773d33eb313451f47866b2e7f8..71052d291054338011d427394ba449e237f020c9 100644 (file)
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -23,6 +23,7 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/module.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/module.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/filename.h"
 #endif
 
 #include "wx/filename.h"


@@ -172,10 +173,18 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
             }
             else if (childName == wxT("image"))
             {
             }
             else if (childName == wxT("image"))
             {

-                int imageType = wxBITMAP_TYPE_PNG;
-                wxString value = node->GetAttribute(wxT("imagetype"), wxEmptyString);
+                wxBitmapType imageType = wxBITMAP_TYPE_PNG;
+                wxString value = child->GetAttribute(wxT("imagetype"), wxEmptyString);

                 if (!value.empty())
                 if (!value.empty())

-                    imageType = wxAtoi(value);
+                {
+                    int type = wxAtoi(value);
+
+                    // note: 0 == wxBITMAP_TYPE_INVALID
+                    if (type <= 0 || type >= wxBITMAP_TYPE_MAX)
+                        wxLogWarning("Invalid bitmap type specified for <image> tag: %d", type);
+                    else
+                        imageType = (wxBitmapType)type;
+                }

 
                 wxString data;
 
 
                 wxString data;
 


@@ -706,10 +715,19 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
         int last = 0;
         const wxString& text = textObj.GetText();
         int len = (int) text.Length();
         int last = 0;
         const wxString& text = textObj.GetText();
         int len = (int) text.Length();

-        for (i = 0; i < len; i++)
+
+        if (len == 0)
+        {
+            i = 0;
+            OutputIndentation(stream, indent);
+            OutputString(stream, wxT("<") + objectName, convMem, convFile);
+            OutputString(stream, style + wxT(">"), convMem, convFile);
+            OutputString(stream, wxT("</text>"), convMem, convFile);
+        }
+        else for (i = 0; i < len; i++)

         {
             int c = (int) text[i];
         {
             int c = (int) text[i];

-            if (c < 32 && c != 9 && c != 10 && c != 13)
+            if ((c < 32 || c == 34) && c != 9 && c != 10 && c != 13)

             {
                 if (i > 0)
                 {
             {
                 if (i > 0)
                 {


@@ -1061,6 +1079,53 @@ wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttr& attr, bool isPara)
     return str;
 }
 
     return str;
 }
 

+/// Replace face name with current name for platform.
+/// TODO: introduce a virtual function or settable table to
+/// do this comprehensively.
+bool wxRichTextFixFaceName(wxString& facename)
+{
+    if (facename.IsEmpty())
+        return false;
+
+#ifdef __WXMSW__
+    if (facename == wxT("Times"))
+    {
+        facename = wxT("Times New Roman");
+        return true;
+    }
+    else if (facename == wxT("Helvetica"))
+    {
+        facename = wxT("Arial");
+        return true;
+    }
+    else if (facename == wxT("Courier"))
+    {
+        facename = wxT("Courier New");
+        return true;
+    }
+    else
+        return false;
+#else
+    if (facename == wxT("Times New Roman"))
+    {
+        facename = wxT("Times");
+        return true;
+    }
+    else if (facename == wxT("Arial"))
+    {
+        facename = wxT("Helvetica");
+        return true;
+    }
+    else if (facename == wxT("Courier New"))
+    {
+        facename = wxT("Courier");
+        return true;
+    }
+    else
+        return false;
+#endif
+}
+

 /// Get style parameters
 bool wxRichTextXMLHandler::GetStyle(wxTextAttr& attr, wxXmlNode* node, bool isPara)
 {
 /// Get style parameters
 bool wxRichTextXMLHandler::GetStyle(wxTextAttr& attr, wxXmlNode* node, bool isPara)
 {


@@ -1075,7 +1140,12 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttr& attr, wxXmlNode* node, bool isPa
 
     fontFacename = node->GetAttribute(wxT("fontface"), wxEmptyString);
     if (!fontFacename.IsEmpty())
 
     fontFacename = node->GetAttribute(wxT("fontface"), wxEmptyString);
     if (!fontFacename.IsEmpty())

+    {

         attr.SetFontFaceName(fontFacename);
         attr.SetFontFaceName(fontFacename);

+        if (GetFlags() & wxRICHTEXT_HANDLER_CONVERT_FACENAMES)
+            wxRichTextFixFaceName(fontFacename);
+    }
+

 
     wxString value;
     //value = node->GetAttribute(wxT("fontfamily"), wxEmptyString);
 
     wxString value;
     //value = node->GetAttribute(wxT("fontfamily"), wxEmptyString);