X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c4cb6116779e9fc7bcb7009ef0aa6047d2f8874..cc26010927f5bb12825a32487949d063e6c605fc:/src/richtext/richtextxml.cpp

diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index 6c9aed9c6f..2bda9a8ea5 100644
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -181,9 +181,13 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
 
                     // 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;
@@ -491,7 +495,11 @@ static void OutputStringEnt(wxOutputStream& stream, const wxString& str,
             OutputString(stream, str.Mid(last, i - last), convMem, convFile);
 
             wxString s(wxT("&#"));
+#if wxUSE_UNICODE
             s << (int) c;
+#else
+            s << (int) wxUChar(c);
+#endif
             s << wxT(";");
             OutputString(stream, s, NULL, NULL);
             last = i + 1;
@@ -543,7 +551,11 @@ static wxString AttributeToXML(const wxString& str)
             str1 += str.Mid(last, i - last);
 
             wxString s(wxT("&#"));
+#if wxUSE_UNICODE
             s << (int) c;
+#else
+            s << (int) wxUChar(c);
+#endif
             s << wxT(";");
             str1 += s;
             last = i + 1;
@@ -726,32 +738,39 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
         }
         else for (i = 0; i < len; i++)
         {
+#if wxUSE_UNICODE
             int c = (int) text[i];
-            if ((c < 32 || c == 34) && c != 9 && c != 10 && c != 13)
+#else
+            int c = (int) wxUChar(text[i]);
+#endif
+            if ((c < 32 || c == 34) && /* c != 9 && */ c != 10 && c != 13)
             {
                 if (i > 0)
                 {
-                    OutputIndentation(stream, indent);
-                    OutputString(stream, wxT("<") + objectName, convMem, convFile);
-
-                    OutputString(stream, style + wxT(">"), convMem, convFile);
-
                     wxString fragment(text.Mid(last, i-last));
-                    if (!fragment.empty() && (fragment[0] == wxT(' ') || fragment[fragment.length()-1] == wxT(' ')))
+                    if (!fragment.IsEmpty())
                     {
-                        OutputString(stream, wxT("\""), convMem, convFile);
-                        OutputStringEnt(stream, fragment, convMem, convFile);
-                        OutputString(stream, wxT("\""), convMem, convFile);
+                        OutputIndentation(stream, indent);
+                        OutputString(stream, wxT("<") + objectName, convMem, convFile);
+                        
+                        OutputString(stream, style + wxT(">"), convMem, convFile);
+                        
+                        if (!fragment.empty() && (fragment[0] == wxT(' ') || fragment[fragment.length()-1] == wxT(' ')))
+                        {
+                            OutputString(stream, wxT("\""), convMem, convFile);
+                            OutputStringEnt(stream, fragment, convMem, convFile);
+                            OutputString(stream, wxT("\""), convMem, convFile);
+                        }
+                        else
+                            OutputStringEnt(stream, fragment, convMem, convFile);
+                        
+                        OutputString(stream, wxT("</text>"), convMem, convFile);
                     }
-                    else
-                        OutputStringEnt(stream, fragment, convMem, convFile);
-
-                    OutputString(stream, wxT("</text>"), convMem, convFile);
                 }
 
 
                 // Output this character as a number in a separate tag, because XML can't cope
-                // with entities below 32 except for 9, 10 and 13
+                // with entities below 32 except for 10 and 13
                 last = i + 1;
                 OutputIndentation(stream, indent);
                 OutputString(stream, wxT("<symbol"), convMem, convFile);
@@ -1131,9 +1150,9 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttr& attr, wxXmlNode* node, bool isPa
 {
     wxString fontFacename;
     int fontSize = 12;
-    int fontFamily = wxFONTFAMILY_DEFAULT;
-    int fontWeight = wxNORMAL;
-    int fontStyle = wxNORMAL;
+    wxFontFamily fontFamily = wxFONTFAMILY_DEFAULT;
+    wxFontWeight fontWeight = wxFONTWEIGHT_NORMAL;
+    wxFontStyle fontStyle = wxFONTSTYLE_NORMAL;
     bool fontUnderlined = false;
 
     // int fontFlags = 0;
@@ -1150,14 +1169,14 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttr& attr, wxXmlNode* node, bool isPa
     value = node->GetAttribute(wxT("fontfamily"), wxEmptyString);
     if (!value.empty())
     {
-        fontFamily = wxAtoi(value);
+        fontFamily = (wxFontFamily)wxAtoi(value);
         attr.SetFontFamily(fontFamily);
     }
 
     value = node->GetAttribute(wxT("fontstyle"), wxEmptyString);
     if (!value.empty())
     {
-        fontStyle = wxAtoi(value);
+        fontStyle = (wxFontStyle)wxAtoi(value);
         attr.SetFontStyle(fontStyle);
     }
 
@@ -1171,7 +1190,7 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttr& attr, wxXmlNode* node, bool isPa
     value = node->GetAttribute(wxT("fontweight"), wxEmptyString);
     if (!value.empty())
     {
-        fontWeight = wxAtoi(value);
+        fontWeight = (wxFontWeight)wxAtoi(value);
         attr.SetFontWeight(fontWeight);
     }