Commit Haakan Wiman's cdata XML patch.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index 990d6aa81fb2e44650c88fd3c1824a7ea48d2223..d53297f0aec7badc27109bbf425ff9211e9aa598 100644 (file)
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -406,6 +406,7 @@ struct wxXmlParsingContext
     wxXmlNode *lastAsText;
     wxString   encoding;
     wxString   version;
+       bool    bLastCdata;
 };
 
 extern "C" {
@@ -449,8 +450,16 @@ static void TextHnd(void *userData, const char *s, int len)
 
     if (ctx->lastAsText)
     {
-        ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() +
+               if ( ctx->bLastCdata )
+               {
+                       ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() +
+                                    CharToString(NULL, buf));
+               }
+               else
+               {
+                       ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() +
                                     CharToString(ctx->conv, buf));
+               }
     }
     else
     {
@@ -473,6 +482,27 @@ static void TextHnd(void *userData, const char *s, int len)
 }
 }
 
+extern "C" {
+static void StartCdataHnd(void *userData)
+{
+    wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
+
+       ctx->bLastCdata = true;
+   
+       ctx->lastAsText = new wxXmlNode(wxXML_CDATA_SECTION_NODE, wxT("cdata"),wxT(""));
+    ctx->node->AddChild(ctx->lastAsText);         
+}
+}
+
+extern "C" {
+static void EndCdataHnd(void *userData)
+{
+    wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
+
+       ctx->bLastCdata = false;      
+}
+}
+
 extern "C" {
 static void CommentHnd(void *userData, const char *data)
 {
@@ -565,10 +595,12 @@ bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding)
     if ( encoding != wxT("UTF-8") && encoding != wxT("utf-8") )
         ctx.conv = new wxCSConv(encoding);
 #endif
+       ctx.bLastCdata = false;
 
     XML_SetUserData(parser, (void*)&ctx);
     XML_SetElementHandler(parser, StartElementHnd, EndElementHnd);
     XML_SetCharacterDataHandler(parser, TextHnd);
+       XML_SetCdataSectionHandler(parser, StartCdataHnd, EndCdataHnd );
     XML_SetCommentHandler(parser, CommentHnd);
     XML_SetDefaultHandler(parser, DefaultHnd);
     XML_SetUnknownEncodingHandler(parser, UnknownEncodingHnd, NULL);
@@ -711,6 +743,12 @@ static void OutputNode(wxOutputStream& stream, wxXmlNode *node, int indent,
 
     switch (node->GetType())
     {
+               case wxXML_CDATA_SECTION_NODE:
+                       OutputString( stream, wxT("<![CDATA["));
+                       OutputString( stream, node->GetContent() );
+                       OutputString( stream, wxT("]]>") );
+                       break;
+
         case wxXML_TEXT_NODE:
             OutputStringEnt(stream, node->GetContent(), convMem, convFile);
             break;