wxXmlNode *lastAsText;
wxString encoding;
wxString version;
- bool bLastCdata;
+ bool bLastCdata;
bool removeWhiteOnlyNodes;
};
if (ctx->lastAsText)
{
- if ( ctx->bLastCdata )
- {
- ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() +
+ if ( ctx->bLastCdata )
+ {
+ ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() +
CharToString(NULL, s, len));
- }
- else
- {
+ }
+ else
+ {
ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() + str);
- }
+ }
}
else
{
{
wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
- ctx->bLastCdata = true;
-
- ctx->lastAsText = new wxXmlNode(wxXML_CDATA_SECTION_NODE, wxT("cdata"),wxT(""));
- ctx->node->AddChild(ctx->lastAsText);
+ ctx->bLastCdata = true;
+
+ ctx->lastAsText = new wxXmlNode(wxXML_CDATA_SECTION_NODE, wxT("cdata"),wxT(""));
+ ctx->node->AddChild(ctx->lastAsText);
}
}
{
wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
- ctx->bLastCdata = false;
+ ctx->bLastCdata = false;
}
}
ctx.conv = new wxCSConv(encoding);
#endif
ctx.removeWhiteOnlyNodes = (flags & wxXMLDOC_KEEP_WHITESPACE_NODES) == 0;
- ctx.bLastCdata = false;
+ ctx.bLastCdata = false;
XML_SetUserData(parser, (void*)&ctx);
XML_SetElementHandler(parser, StartElementHnd, EndElementHnd);
XML_SetCharacterDataHandler(parser, TextHnd);
- XML_SetCdataSectionHandler(parser, StartCdataHnd, EndCdataHnd );
+ XML_SetCdataSectionHandler(parser, StartCdataHnd, EndCdataHnd );
XML_SetCommentHandler(parser, CommentHnd);
XML_SetDefaultHandler(parser, DefaultHnd);
XML_SetUnknownEncodingHandler(parser, UnknownEncodingHnd, NULL);
switch (node->GetType())
{
- case wxXML_CDATA_SECTION_NODE:
- OutputString( stream, wxT("<![CDATA["));
- OutputString( stream, node->GetContent() );
- OutputString( stream, wxT("]]>") );
- break;
+ 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);