From 210fbe0ba9a89ee8cfe524d030e7f006e6ea9059 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 7 Nov 2013 12:49:10 +0000 Subject: [PATCH] Fixed border colour parsing typo. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextxml.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp index 6c94051466..250ba47b3f 100644 --- a/src/richtext/richtextxml.cpp +++ b/src/richtext/richtextxml.cpp @@ -1680,13 +1680,13 @@ bool wxRichTextXMLHelper::ImportStyle(wxRichTextAttr& attr, wxXmlNode* node, boo else if (name == wxT("border-bottom-style")) attr.GetTextBoxAttr().GetBorder().GetBottom().SetStyle(wxAtoi(value)); - else if (name == wxT("border-left-colour")) + else if (name == wxT("border-left-color")) attr.GetTextBoxAttr().GetBorder().GetLeft().SetColour(ColourStringToLong(value)); - else if (name == wxT("border-right-colour")) + else if (name == wxT("border-right-color")) attr.GetTextBoxAttr().GetBorder().GetRight().SetColour(ColourStringToLong(value)); - else if (name == wxT("border-top-colour")) + else if (name == wxT("border-top-color")) attr.GetTextBoxAttr().GetBorder().GetTop().SetColour(ColourStringToLong(value)); - else if (name == wxT("border-bottom-colour")) + else if (name == wxT("border-bottom-color")) attr.GetTextBoxAttr().GetBorder().GetBottom().SetColour(ColourStringToLong(value)); else if (name == wxT("border-left-width")) @@ -1709,13 +1709,13 @@ bool wxRichTextXMLHelper::ImportStyle(wxRichTextAttr& attr, wxXmlNode* node, boo else if (name == wxT("outline-bottom-style")) attr.GetTextBoxAttr().GetOutline().GetBottom().SetStyle(wxAtoi(value)); - else if (name == wxT("outline-left-colour")) + else if (name == wxT("outline-left-color")) attr.GetTextBoxAttr().GetOutline().GetLeft().SetColour(ColourStringToLong(value)); - else if (name == wxT("outline-right-colour")) + else if (name == wxT("outline-right-color")) attr.GetTextBoxAttr().GetOutline().GetRight().SetColour(ColourStringToLong(value)); - else if (name == wxT("outline-top-colour")) + else if (name == wxT("outline-top-color")) attr.GetTextBoxAttr().GetOutline().GetTop().SetColour(ColourStringToLong(value)); - else if (name == wxT("outline-bottom-colour")) + else if (name == wxT("outline-bottom-color")) attr.GetTextBoxAttr().GetOutline().GetBottom().SetColour(ColourStringToLong(value)); else if (name == wxT("outline-left-width"))