mention that wxBufferedDC doesn't inherit from wxMemoryDC any more

[wxWidgets.git] / src / xml / xml.cpp

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index 4a13a5e8792e31b786e086b02d8c90b8fa047ac6..6a76beb7c62e81220aa8a6cebd50983d25363caf 100644 (file)
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -455,7 +455,7 @@ struct wxXmlParsingContext
     wxXmlNode *lastAsText;
     wxString   encoding;
     wxString   version;
     wxXmlNode *lastAsText;
     wxString   encoding;
     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 )
-               {
-                       ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() +
+        if ( ctx->bLastCdata )
+        {
+            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->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);

 }
 }
 
 }
 }
 


@@ -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);
 #endif
     ctx.removeWhiteOnlyNodes = (flags & wxXMLDOC_KEEP_WHITESPACE_NODES) == 0;
         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_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);
     XML_SetCommentHandler(parser, CommentHnd);
     XML_SetDefaultHandler(parser, DefaultHnd);
     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:
-                       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);
 
         case wxXML_TEXT_NODE:
             OutputStringEnt(stream, node->GetContent(), convMem, convFile);