reformat for readability; more prep. for patch 1376506

[wxWidgets.git] / src / richtext / richtextxml.cpp

diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index f8d267d2e4dbc2800315ab5d06dd5a7de67484d4..555ceac23c46da4e86234d202e940671f173df81 100644 (file)
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -16,14 +16,14 @@
   #pragma hdrstop
 #endif
 
+#if wxUSE_RICHTEXT && wxUSE_XML
+
+#include "wx/richtext/richtextxml.h"
+
 #ifndef WX_PRECOMP
   #include "wx/wx.h"
 #endif
 
-#include "wx/image.h"
-
-#if wxUSE_RICHTEXT
-
 #include "wx/filename.h"
 #include "wx/clipbrd.h"
 #include "wx/wfstream.h"
@@ -32,8 +32,6 @@
 #include "wx/txtstrm.h"
 #include "wx/xml/xml.h"
 
-#include "wx/richtext/richtextxml.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextXMLHandler, wxRichTextFileHandler)
 
 #if wxUSE_STREAMS
@@ -272,8 +270,16 @@ inline static void OutputString(wxOutputStream& stream, const wxString& str,
 {
     if (str.empty()) return;
 #if wxUSE_UNICODE
-    const wxWX2MBbuf buf(str.mb_str(convFile ? *convFile : wxConvUTF8));
-    stream.Write((const char*)buf, strlen((const char*)buf));
+    if (convFile)
+    {
+        const wxWX2MBbuf buf(str.mb_str(*convFile));
+        stream.Write((const char*)buf, strlen((const char*)buf));
+    }
+    else
+    {
+        const wxWX2MBbuf buf(str.mb_str(wxConvUTF8));
+        stream.Write((const char*)buf, strlen((const char*)buf));
+    }
 #else
     if ( convFile == NULL )
         stream.Write(str.mb_str(), str.Len());
@@ -339,6 +345,7 @@ static wxOutputStream& operator <<(wxOutputStream& stream, const wxString& s)
     return stream;
 }
 
+#if 0
 static wxOutputStream& operator <<(wxOutputStream& stream, long l)
 {
     wxString str;
@@ -352,6 +359,7 @@ static wxOutputStream& operator <<(wxOutputStream& stream, const char c)
     str.Printf(wxT("%c"), c);
     return stream << str;
 }
+#endif
 
 // Convert a colour to a 6-digit hex string
 static wxString ColourToHexString(const wxColour& col)
@@ -810,4 +818,4 @@ void wxRichTextHTMLHandler::OutputParagraphFormatting(const wxTextAttrEx& WXUNUS
 #endif
 
 #endif
-    // wxUSE_RICHTEXT
+    // wxUSE_RICHTEXT && wxUSE_XML