another 64 bit fix: make SendMsg() return wxIntPtr instead of long too

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

diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index 2d6df34af1013252f4e1769759e2362e23c33221..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"


@@ -101,7 +102,7 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
 
     if (name == wxT("paragraphlayout"))
     {
 
     if (name == wxT("paragraphlayout"))
     {

-        wxString partial = node->GetPropVal(wxT("partialparagraph"), wxEmptyString);
+        wxString partial = node->GetAttribute(wxT("partialparagraph"), wxEmptyString);

         if (partial == wxT("true"))
             buffer->SetPartialParagraph(true);
     }
         if (partial == wxT("true"))
             buffer->SetPartialParagraph(true);
     }


@@ -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->GetPropVal(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;
 


@@ -200,6 +209,7 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
                 if (!data.empty())
                 {
                     wxRichTextImage* imageObj = new wxRichTextImage(para);
                 if (!data.empty())
                 {
                     wxRichTextImage* imageObj = new wxRichTextImage(para);

+                    GetStyle(imageObj->GetAttributes(), child, false);

                     para->AppendChild(imageObj);
 
                     wxStringInputStream strStream(data);
                     para->AppendChild(imageObj);
 
                     wxStringInputStream strStream(data);


@@ -217,8 +227,8 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
         if (GetFlags() & wxRICHTEXT_HANDLER_INCLUDE_STYLESHEET)
         {
             wxRichTextStyleSheet* sheet = new wxRichTextStyleSheet;
         if (GetFlags() & wxRICHTEXT_HANDLER_INCLUDE_STYLESHEET)
         {
             wxRichTextStyleSheet* sheet = new wxRichTextStyleSheet;

-            wxString sheetName = node->GetPropVal(wxT("name"), wxEmptyString);
-            wxString sheetDescription = node->GetPropVal(wxT("description"), wxEmptyString);
+            wxString sheetName = node->GetAttribute(wxT("name"), wxEmptyString);
+            wxString sheetDescription = node->GetAttribute(wxT("description"), wxEmptyString);

             sheet->SetName(sheetName);
             sheet->SetDescription(sheetDescription);
 
             sheet->SetName(sheetName);
             sheet->SetDescription(sheetDescription);
 


@@ -254,8 +264,8 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
 bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wxXmlNode* node)
 {
     wxString styleType = node->GetName();
 bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wxXmlNode* node)
 {
     wxString styleType = node->GetName();

-    wxString styleName = node->GetPropVal(wxT("name"), wxEmptyString);
-    wxString baseStyleName = node->GetPropVal(wxT("basestyle"), wxEmptyString);
+    wxString styleName = node->GetAttribute(wxT("name"), wxEmptyString);
+    wxString baseStyleName = node->GetAttribute(wxT("basestyle"), wxEmptyString);

 
     if (styleName.IsEmpty())
         return false;
 
     if (styleName.IsEmpty())
         return false;


@@ -270,7 +280,7 @@ bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wx
         {
             if (child->GetName() == wxT("style"))
             {
         {
             if (child->GetName() == wxT("style"))
             {

-                wxTextAttrEx attr;
+                wxTextAttr attr;

                 GetStyle(attr, child, false);
                 def->SetStyle(attr);
             }
                 GetStyle(attr, child, false);
                 def->SetStyle(attr);
             }


@@ -283,7 +293,7 @@ bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wx
     {
         wxRichTextParagraphStyleDefinition* def = new wxRichTextParagraphStyleDefinition(styleName);
 
     {
         wxRichTextParagraphStyleDefinition* def = new wxRichTextParagraphStyleDefinition(styleName);
 

-        wxString nextStyleName = node->GetPropVal(wxT("nextstyle"), wxEmptyString);
+        wxString nextStyleName = node->GetAttribute(wxT("nextstyle"), wxEmptyString);

         def->SetNextStyle(nextStyleName);
         def->SetBaseStyle(baseStyleName);
 
         def->SetNextStyle(nextStyleName);
         def->SetBaseStyle(baseStyleName);
 


@@ -292,7 +302,7 @@ bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wx
         {
             if (child->GetName() == wxT("style"))
             {
         {
             if (child->GetName() == wxT("style"))
             {

-                wxTextAttrEx attr;
+                wxTextAttr attr;

                 GetStyle(attr, child, false);
                 def->SetStyle(attr);
             }
                 GetStyle(attr, child, false);
                 def->SetStyle(attr);
             }


@@ -305,7 +315,7 @@ bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wx
     {
         wxRichTextListStyleDefinition* def = new wxRichTextListStyleDefinition(styleName);
 
     {
         wxRichTextListStyleDefinition* def = new wxRichTextListStyleDefinition(styleName);
 

-        wxString nextStyleName = node->GetPropVal(wxT("nextstyle"), wxEmptyString);
+        wxString nextStyleName = node->GetAttribute(wxT("nextstyle"), wxEmptyString);

         def->SetNextStyle(nextStyleName);
         def->SetBaseStyle(baseStyleName);
 
         def->SetNextStyle(nextStyleName);
         def->SetBaseStyle(baseStyleName);
 


@@ -314,10 +324,10 @@ bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wx
         {
             if (child->GetName() == wxT("style"))
             {
         {
             if (child->GetName() == wxT("style"))
             {

-                wxTextAttrEx attr;
+                wxTextAttr attr;

                 GetStyle(attr, child, false);
 
                 GetStyle(attr, child, false);
 

-                wxString styleLevel = child->GetPropVal(wxT("level"), wxEmptyString);
+                wxString styleLevel = child->GetAttribute(wxT("level"), wxEmptyString);

                 if (styleLevel.IsEmpty())
                 {
                     def->SetStyle(attr);
                 if (styleLevel.IsEmpty())
                 {
                     def->SetStyle(attr);


@@ -490,6 +500,59 @@ static void OutputStringEnt(wxOutputStream& stream, const wxString& str,
     OutputString(stream, str.Mid(last, i - last), convMem, convFile);
 }
 
     OutputString(stream, str.Mid(last, i - last), convMem, convFile);
 }
 

+static wxString AttributeToXML(const wxString& str)
+{
+    wxString str1;
+    size_t i, last, len;
+    wxChar c;
+
+    len = str.Len();
+    last = 0;
+    for (i = 0; i < len; i++)
+    {
+        c = str.GetChar(i);
+
+        // Original code excluded "&amp;" but we _do_ want to convert
+        // the ampersand beginning &amp; because otherwise when read in,
+        // the original "&amp;" becomes "&".
+
+        if (c == wxT('<') || c == wxT('>') || c == wxT('"') ||
+            (c == wxT('&') /* && (str.Mid(i+1, 4) != wxT("amp;")) */ ))
+        {
+            str1 += str.Mid(last, i - last);
+            switch (c)
+            {
+            case wxT('<'):
+                str1 += wxT("&lt;");
+                break;
+            case wxT('>'):
+                str1 += wxT("&gt;");
+                break;
+            case wxT('&'):
+                str1 += wxT("&amp;");
+                break;
+            case wxT('"'):
+                str1 += wxT("&quot;");
+                break;
+            default: break;
+            }
+            last = i + 1;
+        }
+        else if (wxUChar(c) > 127)
+        {
+            str1 += str.Mid(last, i - last);
+
+            wxString s(wxT("&#"));
+            s << (int) c;
+            s << wxT(";");
+            str1 += s;
+            last = i + 1;
+        }
+    }
+    str1 += str.Mid(last, i - last);
+    return str1;
+}
+

 inline static void OutputIndentation(wxOutputStream& stream, int indent)
 {
     wxString str = wxT("\n");
 inline static void OutputIndentation(wxOutputStream& stream, int indent)
 {
     wxString str = wxT("\n");


@@ -573,7 +636,7 @@ bool wxRichTextXMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
 
     wxString s ;
     s.Printf(wxT("<?xml version=\"%s\" encoding=\"%s\"?>\n"),
 
     wxString s ;
     s.Printf(wxT("<?xml version=\"%s\" encoding=\"%s\"?>\n"),

-        (const wxChar*) version, (const wxChar*) fileEncoding );
+             version, fileEncoding);

     OutputString(stream, s, NULL, NULL);
     OutputString(stream, wxT("<richtext version=\"1.0.0.0\" xmlns=\"http://www.wxwidgets.org\">") , NULL, NULL);
 
     OutputString(stream, s, NULL, NULL);
     OutputString(stream, wxT("<richtext version=\"1.0.0.0\" xmlns=\"http://www.wxwidgets.org\">") , NULL, NULL);
 


@@ -652,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)
                 {


@@ -720,6 +792,8 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
     {
         wxRichTextImage& imageObj = (wxRichTextImage&) obj;
 
     {
         wxRichTextImage& imageObj = (wxRichTextImage&) obj;
 

+        wxString style = CreateStyle(obj.GetAttributes(), false);
+

         if (imageObj.GetImage().Ok() && !imageObj.GetImageBlock().Ok())
             imageObj.MakeBlock();
 
         if (imageObj.GetImage().Ok() && !imageObj.GetImageBlock().Ok())
             imageObj.MakeBlock();
 


@@ -728,11 +802,11 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
         if (!imageObj.GetImageBlock().Ok())
         {
             // No data
         if (!imageObj.GetImageBlock().Ok())
         {
             // No data

-            OutputString(stream, wxT(">"), convMem, convFile);
+            OutputString(stream, style + wxT(">"), convMem, convFile);

         }
         else
         {
         }
         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);
         }
 
         OutputIndentation(stream, indent+1);


@@ -834,7 +908,7 @@ bool wxRichTextXMLHandler::ExportStyleDefinition(wxOutputStream& stream, wxMBCon
         int i;
         for (i = 0; i < 10; i ++)
         {
         int i;
         for (i = 0; i < 10; i ++)
         {

-            wxRichTextAttr* levelAttr = listDef->GetLevelAttributes(i);
+            wxTextAttr* levelAttr = listDef->GetLevelAttributes(i);

             if (levelAttr)
             {
                 wxString style = CreateStyle(def->GetStyle(), false);
             if (levelAttr)
             {
                 wxString style = CreateStyle(def->GetStyle(), false);


@@ -882,7 +956,7 @@ bool wxRichTextXMLHandler::ExportStyleDefinition(wxOutputStream& stream, wxMBCon
 }
 
 /// Create style parameters
 }
 
 /// Create style parameters

-wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& attr, bool isPara)
+wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttr& attr, bool isPara)

 {
     wxString str;
     if (attr.HasTextColour() && attr.GetTextColour().Ok())
 {
     wxString str;
     if (attr.HasTextColour() && attr.GetTextColour().Ok())


@@ -894,26 +968,23 @@ wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& attr, bool isPara
         str << wxT(" bgcolor=\"#") << ColourToHexString(attr.GetBackgroundColour()) << wxT("\"");
     }
 
         str << wxT(" bgcolor=\"#") << ColourToHexString(attr.GetBackgroundColour()) << wxT("\"");
     }
 

-    if (attr.GetFont().Ok())
-    {
-        if (attr.HasFontSize())
-            str << wxT(" fontsize=\"") << attr.GetFont().GetPointSize() << wxT("\"");
+    if (attr.HasFontSize())
+        str << wxT(" fontsize=\"") << attr.GetFontSize() << wxT("\"");

 
 

-        //if (attr.HasFontFamily())
-        //    str << wxT(" fontfamily=\"") << attr.GetFont().GetFamily() << wxT("\"");
+    //if (attr.HasFontFamily())
+    //    str << wxT(" fontfamily=\"") << attr.GetFont().GetFamily() << wxT("\"");

 
 

-        if (attr.HasFontItalic())
-            str << wxT(" fontstyle=\"") << attr.GetFont().GetStyle() << wxT("\"");
+    if (attr.HasFontItalic())
+        str << wxT(" fontstyle=\"") << attr.GetFontStyle() << wxT("\"");

 
 

-        if (attr.HasFontWeight())
-            str << wxT(" fontweight=\"") << attr.GetFont().GetWeight() << wxT("\"");
+    if (attr.HasFontWeight())
+        str << wxT(" fontweight=\"") << attr.GetFontWeight() << wxT("\"");

 
 

-        if (attr.HasFontUnderlined())
-            str << wxT(" fontunderlined=\"") << (int) attr.GetFont().GetUnderlined() << wxT("\"");
+    if (attr.HasFontUnderlined())
+        str << wxT(" fontunderlined=\"") << (int) attr.GetFontUnderlined() << wxT("\"");

 
 

-        if (attr.HasFontFaceName())
-            str << wxT(" fontface=\"") << attr.GetFont().GetFaceName() << wxT("\"");
-    }
+    if (attr.HasFontFaceName())
+        str << wxT(" fontface=\"") << attr.GetFontFaceName() << wxT("\"");

 
     if (attr.HasTextEffects())
     {
 
     if (attr.HasTextEffects())
     {


@@ -929,6 +1000,9 @@ wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& attr, bool isPara
     if (!attr.GetCharacterStyleName().empty())
         str << wxT(" characterstyle=\"") << wxString(attr.GetCharacterStyleName()) << wxT("\"");
 
     if (!attr.GetCharacterStyleName().empty())
         str << wxT(" characterstyle=\"") << wxString(attr.GetCharacterStyleName()) << wxT("\"");
 

+    if (attr.HasURL())
+        str << wxT(" url=\"") << AttributeToXML(attr.GetURL()) << wxT("\"");
+

     if (isPara)
     {
         if (attr.HasAlignment())
     if (isPara)
     {
         if (attr.HasAlignment())


@@ -973,9 +1047,6 @@ wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& attr, bool isPara
         if (attr.HasBulletName())
             str << wxT(" bulletname=\"") << attr.GetBulletName() << wxT("\"");
 
         if (attr.HasBulletName())
             str << wxT(" bulletname=\"") << attr.GetBulletName() << wxT("\"");
 

-        if (attr.HasURL())
-            str << wxT(" url=\"") << attr.GetURL() << wxT("\"");
-

         if (!attr.GetParagraphStyleName().empty())
             str << wxT(" parstyle=\"") << wxString(attr.GetParagraphStyleName()) << wxT("\"");
 
         if (!attr.GetParagraphStyleName().empty())
             str << wxT(" parstyle=\"") << wxString(attr.GetParagraphStyleName()) << wxT("\"");
 


@@ -1008,64 +1079,108 @@ wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& 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
 /// Get style parameters

-bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool isPara)
+bool wxRichTextXMLHandler::GetStyle(wxTextAttr& attr, wxXmlNode* node, bool isPara)

 {
     wxString fontFacename;
     int fontSize = 12;
 {
     wxString fontFacename;
     int fontSize = 12;

-    int fontFamily = wxDEFAULT;
+    // int fontFamily = wxDEFAULT;

     int fontWeight = wxNORMAL;
     int fontStyle = wxNORMAL;
     bool fontUnderlined = false;
 
     int fontWeight = wxNORMAL;
     int fontStyle = wxNORMAL;
     bool fontUnderlined = false;
 

-    int fontFlags = 0;
+    // int fontFlags = 0;

 
 

-    fontFacename = node->GetPropVal(wxT("fontface"), wxEmptyString);
+    fontFacename = node->GetAttribute(wxT("fontface"), wxEmptyString);

     if (!fontFacename.IsEmpty())
     if (!fontFacename.IsEmpty())

-        fontFlags |= wxTEXT_ATTR_FONT_FACE;
+    {
+        attr.SetFontFaceName(fontFacename);
+        if (GetFlags() & wxRICHTEXT_HANDLER_CONVERT_FACENAMES)
+            wxRichTextFixFaceName(fontFacename);
+    }
+

 
     wxString value;
 
     wxString value;

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

     //if (!value.empty())
     //    fontFamily = wxAtoi(value);
 
     //if (!value.empty())
     //    fontFamily = wxAtoi(value);
 

-    value = node->GetPropVal(wxT("fontstyle"), wxEmptyString);
+    value = node->GetAttribute(wxT("fontstyle"), wxEmptyString);

     if (!value.empty())
     {
         fontStyle = wxAtoi(value);
     if (!value.empty())
     {
         fontStyle = wxAtoi(value);

-        fontFlags |= wxTEXT_ATTR_FONT_ITALIC;
+        attr.SetFontStyle(fontStyle);

     }
 
     }
 

-    value = node->GetPropVal(wxT("fontsize"), wxEmptyString);
+    value = node->GetAttribute(wxT("fontsize"), wxEmptyString);

     if (!value.empty())
     {
         fontSize = wxAtoi(value);
     if (!value.empty())
     {
         fontSize = wxAtoi(value);

-        fontFlags |= wxTEXT_ATTR_FONT_SIZE;
+        attr.SetFontSize(fontSize);

     }
 
     }
 

-    value = node->GetPropVal(wxT("fontweight"), wxEmptyString);
+    value = node->GetAttribute(wxT("fontweight"), wxEmptyString);

     if (!value.empty())
     {
         fontWeight = wxAtoi(value);
     if (!value.empty())
     {
         fontWeight = wxAtoi(value);

-        fontFlags |= wxTEXT_ATTR_FONT_WEIGHT;
+        attr.SetFontWeight(fontWeight);

     }
 
     }
 

-    value = node->GetPropVal(wxT("fontunderlined"), wxEmptyString);
+    value = node->GetAttribute(wxT("fontunderlined"), wxEmptyString);

     if (!value.empty())
     {
         fontUnderlined = wxAtoi(value) != 0;
     if (!value.empty())
     {
         fontUnderlined = wxAtoi(value) != 0;

-        fontFlags |= wxTEXT_ATTR_FONT_UNDERLINE;
+        attr.SetFontUnderlined(fontUnderlined);

     }
 
     }
 

-    attr.SetFlags(fontFlags);
-
-    if (attr.HasFlag(wxTEXT_ATTR_FONT))
-        attr.SetFont(* wxTheFontList->FindOrCreateFont(fontSize, fontFamily, fontStyle, fontWeight, fontUnderlined, fontFacename));
-
-    // Restore correct font flags
-    attr.SetFlags(fontFlags);
-
-    value = node->GetPropVal(wxT("textcolor"), wxEmptyString);
+    value = node->GetAttribute(wxT("textcolor"), wxEmptyString);

     if (!value.empty())
     {
         if (value[0] == wxT('#'))
     if (!value.empty())
     {
         if (value[0] == wxT('#'))


@@ -1074,7 +1189,7 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
             attr.SetTextColour(value);
     }
 
             attr.SetTextColour(value);
     }
 

-    value = node->GetPropVal(wxT("backgroundcolor"), wxEmptyString);
+    value = node->GetAttribute(wxT("bgcolor"), wxEmptyString);

     if (!value.empty())
     {
         if (value[0] == wxT('#'))
     if (!value.empty())
     {
         if (value[0] == wxT('#'))


@@ -1083,26 +1198,30 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
             attr.SetBackgroundColour(value);
     }
 
             attr.SetBackgroundColour(value);
     }
 

-    value = node->GetPropVal(wxT("characterstyle"), wxEmptyString);
+    value = node->GetAttribute(wxT("characterstyle"), wxEmptyString);

     if (!value.empty())
         attr.SetCharacterStyleName(value);
 
     if (!value.empty())
         attr.SetCharacterStyleName(value);
 

-    value = node->GetPropVal(wxT("texteffects"), wxEmptyString);
+    value = node->GetAttribute(wxT("texteffects"), wxEmptyString);

     if (!value.IsEmpty())
     {
         attr.SetTextEffects(wxAtoi(value));
     }
 
     if (!value.IsEmpty())
     {
         attr.SetTextEffects(wxAtoi(value));
     }
 

-    value = node->GetPropVal(wxT("texteffectflags"), wxEmptyString);
+    value = node->GetAttribute(wxT("texteffectflags"), wxEmptyString);

     if (!value.IsEmpty())
     {
         attr.SetTextEffectFlags(wxAtoi(value));
     }
 
     if (!value.IsEmpty())
     {
         attr.SetTextEffectFlags(wxAtoi(value));
     }
 

+    value = node->GetAttribute(wxT("url"), wxEmptyString);
+    if (!value.empty())
+        attr.SetURL(value);
+

     // Set paragraph attributes
     if (isPara)
     {
     // Set paragraph attributes
     if (isPara)
     {

-        value = node->GetPropVal(wxT("alignment"), wxEmptyString);
+        value = node->GetAttribute(wxT("alignment"), wxEmptyString);

         if (!value.empty())
             attr.SetAlignment((wxTextAttrAlignment) wxAtoi(value));
 
         if (!value.empty())
             attr.SetAlignment((wxTextAttrAlignment) wxAtoi(value));
 


@@ -1110,14 +1229,14 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
         int leftIndent = 0;
         bool hasLeftIndent = false;
 
         int leftIndent = 0;
         bool hasLeftIndent = false;
 

-        value = node->GetPropVal(wxT("leftindent"), wxEmptyString);
+        value = node->GetAttribute(wxT("leftindent"), wxEmptyString);

         if (!value.empty())
         {
             leftIndent = wxAtoi(value);
             hasLeftIndent = true;
         }
 
         if (!value.empty())
         {
             leftIndent = wxAtoi(value);
             hasLeftIndent = true;
         }
 

-        value = node->GetPropVal(wxT("leftsubindent"), wxEmptyString);
+        value = node->GetAttribute(wxT("leftsubindent"), wxEmptyString);

         if (!value.empty())
         {
             leftSubIndent = wxAtoi(value);
         if (!value.empty())
         {
             leftSubIndent = wxAtoi(value);


@@ -1127,31 +1246,31 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
         if (hasLeftIndent)
             attr.SetLeftIndent(leftIndent, leftSubIndent);
 
         if (hasLeftIndent)
             attr.SetLeftIndent(leftIndent, leftSubIndent);
 

-        value = node->GetPropVal(wxT("rightindent"), wxEmptyString);
+        value = node->GetAttribute(wxT("rightindent"), wxEmptyString);

         if (!value.empty())
             attr.SetRightIndent(wxAtoi(value));
 
         if (!value.empty())
             attr.SetRightIndent(wxAtoi(value));
 

-        value = node->GetPropVal(wxT("parspacingbefore"), wxEmptyString);
+        value = node->GetAttribute(wxT("parspacingbefore"), wxEmptyString);

         if (!value.empty())
             attr.SetParagraphSpacingBefore(wxAtoi(value));
 
         if (!value.empty())
             attr.SetParagraphSpacingBefore(wxAtoi(value));
 

-        value = node->GetPropVal(wxT("parspacingafter"), wxEmptyString);
+        value = node->GetAttribute(wxT("parspacingafter"), wxEmptyString);

         if (!value.empty())
             attr.SetParagraphSpacingAfter(wxAtoi(value));
 
         if (!value.empty())
             attr.SetParagraphSpacingAfter(wxAtoi(value));
 

-        value = node->GetPropVal(wxT("linespacing"), wxEmptyString);
+        value = node->GetAttribute(wxT("linespacing"), wxEmptyString);

         if (!value.empty())
             attr.SetLineSpacing(wxAtoi(value));
 
         if (!value.empty())
             attr.SetLineSpacing(wxAtoi(value));
 

-        value = node->GetPropVal(wxT("bulletstyle"), wxEmptyString);
+        value = node->GetAttribute(wxT("bulletstyle"), wxEmptyString);

         if (!value.empty())
             attr.SetBulletStyle(wxAtoi(value));
 
         if (!value.empty())
             attr.SetBulletStyle(wxAtoi(value));
 

-        value = node->GetPropVal(wxT("bulletnumber"), wxEmptyString);
+        value = node->GetAttribute(wxT("bulletnumber"), wxEmptyString);

         if (!value.empty())
             attr.SetBulletNumber(wxAtoi(value));
 
         if (!value.empty())
             attr.SetBulletNumber(wxAtoi(value));
 

-        value = node->GetPropVal(wxT("bulletsymbol"), wxEmptyString);
+        value = node->GetAttribute(wxT("bulletsymbol"), wxEmptyString);

         if (!value.empty())
         {
             wxChar ch = wxAtoi(value);
         if (!value.empty())
         {
             wxChar ch = wxAtoi(value);


@@ -1160,31 +1279,27 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
             attr.SetBulletText(s);
         }
 
             attr.SetBulletText(s);
         }
 

-        value = node->GetPropVal(wxT("bullettext"), wxEmptyString);
+        value = node->GetAttribute(wxT("bullettext"), wxEmptyString);

         if (!value.empty())
             attr.SetBulletText(value);
 
         if (!value.empty())
             attr.SetBulletText(value);
 

-        value = node->GetPropVal(wxT("bulletfont"), wxEmptyString);
+        value = node->GetAttribute(wxT("bulletfont"), wxEmptyString);

         if (!value.empty())
             attr.SetBulletFont(value);
 
         if (!value.empty())
             attr.SetBulletFont(value);
 

-        value = node->GetPropVal(wxT("bulletname"), wxEmptyString);
+        value = node->GetAttribute(wxT("bulletname"), wxEmptyString);

         if (!value.empty())
             attr.SetBulletName(value);
 
         if (!value.empty())
             attr.SetBulletName(value);
 

-        value = node->GetPropVal(wxT("url"), wxEmptyString);
-        if (!value.empty())
-            attr.SetURL(value);
-
-        value = node->GetPropVal(wxT("parstyle"), wxEmptyString);
+        value = node->GetAttribute(wxT("parstyle"), wxEmptyString);

         if (!value.empty())
             attr.SetParagraphStyleName(value);
 
         if (!value.empty())
             attr.SetParagraphStyleName(value);
 

-        value = node->GetPropVal(wxT("liststyle"), wxEmptyString);
+        value = node->GetAttribute(wxT("liststyle"), wxEmptyString);

         if (!value.empty())
             attr.SetListStyleName(value);
 
         if (!value.empty())
             attr.SetListStyleName(value);
 

-        value = node->GetPropVal(wxT("tabs"), wxEmptyString);
+        value = node->GetAttribute(wxT("tabs"), wxEmptyString);

         if (!value.empty())
         {
             wxArrayInt tabs;
         if (!value.empty())
         {
             wxArrayInt tabs;


@@ -1197,16 +1312,16 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
             attr.SetTabs(tabs);
         }
 
             attr.SetTabs(tabs);
         }
 

-        value = node->GetPropVal(wxT("pagebreak"), wxEmptyString);
+        value = node->GetAttribute(wxT("pagebreak"), wxEmptyString);

         if (!value.IsEmpty())
         {
             attr.SetPageBreak(wxAtoi(value) != 0);
         }
 
         if (!value.IsEmpty())
         {
             attr.SetPageBreak(wxAtoi(value) != 0);
         }
 

-        value = node->GetPropVal(wxT("outlinelevel"), wxEmptyString);
+        value = node->GetAttribute(wxT("outlinelevel"), wxEmptyString);

         if (!value.IsEmpty())
         {
         if (!value.IsEmpty())
         {

-            attr.SetOutlineLevel(wxAtoi(value) != 0);
+            attr.SetOutlineLevel(wxAtoi(value));

         }
     }
 
         }
     }