Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed tabs and trailing whitespace

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-09-11 11:13:05 +00:00
parent 538f383019
commit eac789ff9c
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/xml/xml.cpp
View File

@@ -455,7 +455,7 @@ struct wxXmlParsingContext
wxXmlNode *lastAsText; wxXmlNode *lastAsText;
wxString encoding; wxString encoding;
wxString version; wxString version;
bool bLastCdata; bool bLastCdata;
bool removeWhiteOnlyNodes; bool removeWhiteOnlyNodes;
}; };
@@ -497,15 +497,15 @@ static void TextHnd(void *userData, const char *s, int len)
if (ctx->lastAsText) if (ctx->lastAsText)
{ {
if ( ctx->bLastCdata ) if ( ctx->bLastCdata )
{ {
ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() + ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() +
CharToString(NULL, s, len)); CharToString(NULL, s, len));
} }
else else
{ {
ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() + str); ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() + str);
} }
} }
else else
{ {
@@ -527,10 +527,10 @@ static void StartCdataHnd(void *userData)
{ {
wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData; wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
ctx->bLastCdata = true; ctx->bLastCdata = true;
ctx->lastAsText = new wxXmlNode(wxXML_CDATA_SECTION_NODE, wxT("cdata"),wxT("")); ctx->lastAsText = new wxXmlNode(wxXML_CDATA_SECTION_NODE, wxT("cdata"),wxT(""));
ctx->node->AddChild(ctx->lastAsText); ctx->node->AddChild(ctx->lastAsText);
} }
} }
@@ -539,7 +539,7 @@ static void EndCdataHnd(void *userData)
{ {
wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData; wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
ctx->bLastCdata = false; ctx->bLastCdata = false;
} }
} }
@@ -636,12 +636,12 @@ bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding, int fl
ctx.conv = new wxCSConv(encoding); ctx.conv = new wxCSConv(encoding);
#endif #endif
ctx.removeWhiteOnlyNodes = (flags & wxXMLDOC_KEEP_WHITESPACE_NODES) == 0; ctx.removeWhiteOnlyNodes = (flags & wxXMLDOC_KEEP_WHITESPACE_NODES) == 0;
ctx.bLastCdata = false; ctx.bLastCdata = false;
XML_SetUserData(parser, (void*)&ctx); XML_SetUserData(parser, (void*)&ctx);
XML_SetElementHandler(parser, StartElementHnd, EndElementHnd); XML_SetElementHandler(parser, StartElementHnd, EndElementHnd);
XML_SetCharacterDataHandler(parser, TextHnd); XML_SetCharacterDataHandler(parser, TextHnd);
XML_SetCdataSectionHandler(parser, StartCdataHnd, EndCdataHnd ); XML_SetCdataSectionHandler(parser, StartCdataHnd, EndCdataHnd );
XML_SetCommentHandler(parser, CommentHnd); XML_SetCommentHandler(parser, CommentHnd);
XML_SetDefaultHandler(parser, DefaultHnd); XML_SetDefaultHandler(parser, DefaultHnd);
XML_SetUnknownEncodingHandler(parser, UnknownEncodingHnd, NULL); XML_SetUnknownEncodingHandler(parser, UnknownEncodingHnd, NULL);
@@ -784,11 +784,11 @@ static void OutputNode(wxOutputStream& stream, wxXmlNode *node, int indent,
switch (node->GetType()) switch (node->GetType())
{ {
case wxXML_CDATA_SECTION_NODE: case wxXML_CDATA_SECTION_NODE:
OutputString( stream, wxT("<![CDATA[")); OutputString( stream, wxT("<![CDATA["));
OutputString( stream, node->GetContent() ); OutputString( stream, node->GetContent() );
OutputString( stream, wxT("]]>") ); OutputString( stream, wxT("]]>") );
break; break;
case wxXML_TEXT_NODE: case wxXML_TEXT_NODE:
OutputStringEnt(stream, node->GetContent(), convMem, convFile); OutputStringEnt(stream, node->GetContent(), convMem, convFile);