From: Václav Slavík <vslavik@fastmail.fm>
Date: Sun, 4 Oct 2009 21:19:40 +0000 (+0000)
Subject: fixed wxXmlDocument::Save() to interpret the indentstep argument correctly
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/57cc93eb59cc89992eb136015979effbaa0dd43e

fixed wxXmlDocument::Save() to interpret the indentstep argument correctly

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 892c522778..dc440605b0 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -153,9 +153,14 @@ Changes in behaviour not resulting in compilation errors, please read this!
   and not in both this and the orthogonal directions. This behaviour is what
   most of the people expect but if you really relied on this overload adding
   space in both directions you should change your code to use AddSpacer(x, x).
-  
+
 - wxTextCtrl::LoadFile no longer sends a text update event.
 
+- wxXmlDocument::Save()'s indentstep argument's interpretation was fixed
+  to match the documentation: it now really is the number of spaces in
+  indentation instead of being its double. Its default value was changed
+  accordingly, to 2.
+
 
 Changes in behaviour which may result in compilation errors
 -----------------------------------------------------------
diff --git a/include/wx/xml/xml.h b/include/wx/xml/xml.h
index 939e526098..8df417203b 100644
--- a/include/wx/xml/xml.h
+++ b/include/wx/xml/xml.h
@@ -265,8 +265,8 @@ public:
                       const wxString& encoding = wxT("UTF-8"), int flags = wxXMLDOC_NONE);
 
     // Saves document as .xml file.
-    virtual bool Save(const wxString& filename, int indentstep = 1) const;
-    virtual bool Save(wxOutputStream& stream, int indentstep = 1) const;
+    virtual bool Save(const wxString& filename, int indentstep = 2) const;
+    virtual bool Save(wxOutputStream& stream, int indentstep = 2) const;
 
     bool IsOk() const { return m_root != NULL; }
 
diff --git a/interface/wx/xml/xml.h b/interface/wx/xml/xml.h
index c3491b4f92..a71f580d12 100644
--- a/interface/wx/xml/xml.h
+++ b/interface/wx/xml/xml.h
@@ -597,13 +597,13 @@ public:
         If @a indentstep is @c wxXML_NO_INDENTATION, then, automatic indentation
         is turned off.
     */
-    virtual bool Save(const wxString& filename, int indentstep = 1) const;
+    virtual bool Save(const wxString& filename, int indentstep = 2) const;
 
     /**
         Saves XML tree in the given output stream.
         See Save(const wxString&, int) for a description of @a indentstep.
     */
-    virtual bool Save(wxOutputStream& stream, int indentstep = 1) const;
+    virtual bool Save(wxOutputStream& stream, int indentstep = 2) const;
 
     /**
         Sets the enconding of the document.
diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index 1917c27ba8..534777558a 100644
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -885,7 +885,7 @@ bool OutputIndentation(wxOutputStream& stream,
                        wxMBConv *convFile)
 {
     wxString str(wxS("\n"));
-    str += wxString(2*indent, wxS(' '));
+    str += wxString(indent, wxS(' '));
     return OutputString(stream, str, convMem, convFile);
 }