compile fix for Mac

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

diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index 2e171c5d07dac9a1420f9f05f30bafd0a1181aa9..b2205170ed64bbe26eaf0104eea49f6345b25ad0 100644 (file)
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        richtextxml.cpp
+// Name:        src/richtext/richtextxml.cpp

 // Purpose:     XML and HTML I/O for wxRichTextCtrl
 // Author:      Julian Smart
 // Purpose:     XML and HTML I/O for wxRichTextCtrl
 // Author:      Julian Smart

-// Modified by: 
+// Modified by:

 // Created:     2005-09-30
 // Created:     2005-09-30

-// RCS-ID:      
+// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -13,31 +13,29 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP
-  #include "wx/wx.h"
-#endif
+#if wxUSE_RICHTEXT && wxUSE_XML

 
 

-#include "wx/image.h"
+#include "wx/richtext/richtextxml.h"

 
 

-#if wxUSE_RICHTEXT
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/module.h"
+#endif

 
 #include "wx/filename.h"
 #include "wx/clipbrd.h"
 #include "wx/wfstream.h"
 #include "wx/sstream.h"
 
 #include "wx/filename.h"
 #include "wx/clipbrd.h"
 #include "wx/wfstream.h"
 #include "wx/sstream.h"

-#include "wx/module.h"

 #include "wx/txtstrm.h"
 #include "wx/xml/xml.h"
 
 #include "wx/txtstrm.h"
 #include "wx/xml/xml.h"
 

-#include "wx/richtext/richtextxml.h"
-

 IMPLEMENT_DYNAMIC_CLASS(wxRichTextXMLHandler, wxRichTextFileHandler)
 
 #if wxUSE_STREAMS
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextXMLHandler, wxRichTextFileHandler)
 
 #if wxUSE_STREAMS

-bool wxRichTextXMLHandler::LoadFile(wxRichTextBuffer *buffer, wxInputStream& stream)
+bool wxRichTextXMLHandler::DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream)

 {
     if (!stream.IsOk())
         return false;
 {
     if (!stream.IsOk())
         return false;


@@ -47,7 +45,14 @@ bool wxRichTextXMLHandler::LoadFile(wxRichTextBuffer *buffer, wxInputStream& str
     wxXmlDocument* xmlDoc = new wxXmlDocument;
     bool success = true;
 
     wxXmlDocument* xmlDoc = new wxXmlDocument;
     bool success = true;
 

-    if (!xmlDoc->Load(stream, wxT("ISO-8859-1")))
+    // This is the encoding to convert to (memory encoding rather than file encoding)
+    wxString encoding(wxT("UTF-8"));
+
+#if !wxUSE_UNICODE && wxUSE_INTL
+    encoding = wxLocale::GetSystemEncodingName();
+#endif
+
+    if (!xmlDoc->Load(stream, encoding))

     {
         success = false;
     }
     {
         success = false;
     }


@@ -67,7 +72,7 @@ bool wxRichTextXMLHandler::LoadFile(wxRichTextBuffer *buffer, wxInputStream& str
                     else
                         ImportXML(buffer, child);
                 }
                     else
                         ImportXML(buffer, child);
                 }

-                
+

                 child = child->GetNext();
             }
         }
                 child = child->GetNext();
             }
         }


@@ -76,7 +81,7 @@ bool wxRichTextXMLHandler::LoadFile(wxRichTextBuffer *buffer, wxInputStream& str
             success = false;
         }
     }
             success = false;
         }
     }

-    
+

     delete xmlDoc;
 
     buffer->UpdateRanges();
     delete xmlDoc;
 
     buffer->UpdateRanges();


@@ -117,19 +122,13 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
                         wxString text2 = textChild->GetContent();
 
                         // Strip whitespace from end
                         wxString text2 = textChild->GetContent();
 
                         // Strip whitespace from end

-                        if (text2.Length() > 0 && text2[text2.Length()-1] == wxT('\n'))
-                            text2 = text2.Mid(0, text2.Length()-1);
+                        if (!text2.empty() && text2[text2.length()-1] == wxT('\n'))
+                            text2 = text2.Mid(0, text2.length()-1);

 
 

-                        if (text2.Length() > 0 && text2[0] == wxT('"'))
+                        if (!text2.empty() && text2[0] == wxT('"'))

                             text2 = text2.Mid(1);
                             text2 = text2.Mid(1);

-                        if (text2.Length() > 0 && text2[text2.Length()-1] == wxT('"'))
-                            text2 = text2.Mid(0, text2.Length() - 1);
-
-                        // TODO: further entity translation
-                        text2.Replace(wxT("&lt;"), wxT("<"));
-                        text2.Replace(wxT("&gt;"), wxT(">"));
-                        text2.Replace(wxT("&amp;"), wxT("&"));
-                        text2.Replace(wxT("&quot;"), wxT("\""));
+                        if (!text2.empty() && text2[text2.length()-1] == wxT('"'))
+                            text2 = text2.Mid(0, text2.length() - 1);

 
                         text += text2;
                     }
 
                         text += text2;
                     }


@@ -145,7 +144,7 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
             {
                 int imageType = wxBITMAP_TYPE_PNG;
                 wxString value = node->GetPropVal(wxT("imagetype"), wxEmptyString);
             {
                 int imageType = wxBITMAP_TYPE_PNG;
                 wxString value = node->GetPropVal(wxT("imagetype"), wxEmptyString);

-                if (!value.IsEmpty())
+                if (!value.empty())

                     imageType = wxAtoi(value);
 
                 wxString data;
                     imageType = wxAtoi(value);
 
                 wxString data;


@@ -163,19 +162,19 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
                             // wxLogDebug(data);
                             dataChild = dataChild->GetNext();
                         }
                             // wxLogDebug(data);
                             dataChild = dataChild->GetNext();
                         }

-                        
+

                     }
                     imageChild = imageChild->GetNext();
                 }
 
                     }
                     imageChild = imageChild->GetNext();
                 }
 

-                if (!data.IsEmpty())
+                if (!data.empty())

                 {
                     wxRichTextImage* imageObj = new wxRichTextImage(para);
                     para->AppendChild(imageObj);
 
                     wxStringInputStream strStream(data);
 
                 {
                     wxRichTextImage* imageObj = new wxRichTextImage(para);
                     para->AppendChild(imageObj);
 
                     wxStringInputStream strStream(data);
 

-                    imageObj->GetImageBlock().ReadHex(strStream, data.Length(), imageType);
+                    imageObj->GetImageBlock().ReadHex(strStream, data.length(), imageType);

                 }
             }
             child = child->GetNext();
                 }
             }
             child = child->GetNext();


@@ -192,7 +191,7 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
             ImportXML(buffer, child);
             child = child->GetNext();
         }
             ImportXML(buffer, child);
             child = child->GetNext();
         }

-    }    
+    }

 
     return true;
 }
 
     return true;
 }


@@ -242,7 +241,7 @@ wxString wxRichTextXMLHandler::GetNodeContent(wxXmlNode *node)
 
 wxString wxRichTextXMLHandler::GetParamValue(wxXmlNode *node, const wxString& param)
 {
 
 wxString wxRichTextXMLHandler::GetParamValue(wxXmlNode *node, const wxString& param)
 {

-    if (param.IsEmpty())
+    if (param.empty())

         return GetNodeContent(node);
     else
         return GetNodeContent(GetParamNode(node, param));
         return GetNodeContent(node);
     else
         return GetNodeContent(GetParamNode(node, param));


@@ -257,14 +256,31 @@ wxString wxRichTextXMLHandler::GetText(wxXmlNode *node, const wxString& param, b
     return str1;
 }
 
     return str1;
 }
 

+// For use with earlier versions of wxWidgets
+#ifndef WXUNUSED_IN_UNICODE
+#if wxUSE_UNICODE
+#define WXUNUSED_IN_UNICODE(x) WXUNUSED(x)
+#else
+#define WXUNUSED_IN_UNICODE(x) x
+#endif
+#endif
+

 // write string to output:
 inline static void OutputString(wxOutputStream& stream, const wxString& str,
 // write string to output:
 inline static void OutputString(wxOutputStream& stream, const wxString& str,

-                                wxMBConv *convMem = NULL, wxMBConv *convFile = NULL)
+                                wxMBConv *WXUNUSED_IN_UNICODE(convMem) = NULL, wxMBConv *convFile = NULL)

 {
 {

-    if (str.IsEmpty()) return;
+    if (str.empty()) return;

 #if wxUSE_UNICODE
 #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());
 #else
     if ( convFile == NULL )
         stream.Write(str.mb_str(), str.Len());


@@ -284,14 +300,19 @@ static void OutputStringEnt(wxOutputStream& stream, const wxString& str,
     wxString buf;
     size_t i, last, len;
     wxChar c;
     wxString buf;
     size_t i, last, len;
     wxChar c;

-    
+

     len = str.Len();
     last = 0;
     for (i = 0; i < len; i++)
     {
         c = str.GetChar(i);
     len = str.Len();
     last = 0;
     for (i = 0; i < len; i++)
     {
         c = str.GetChar(i);

+
+        // Original code excluded "&amp;" but we _do_ want to convert
+        // the ampersand beginning &amp; because otherwise when read in,
+        // the original "&amp;" becomes "&".
+

         if (c == wxT('<') || c == wxT('>') || c == wxT('"') ||
         if (c == wxT('<') || c == wxT('>') || c == wxT('"') ||

-            (c == wxT('&') && (str.Mid(i+1, 4) != wxT("amp;"))))
+            (c == wxT('&') /* && (str.Mid(i+1, 4) != wxT("amp;")) */ ))

         {
             OutputString(stream, str.Mid(last, i - last), convMem, convFile);
             switch (c)
         {
             OutputString(stream, str.Mid(last, i - last), convMem, convFile);
             switch (c)


@@ -324,26 +345,6 @@ inline static void OutputIndentation(wxOutputStream& stream, int indent)
     OutputString(stream, str, NULL, NULL);
 }
 
     OutputString(stream, str, NULL, NULL);
 }
 

-static wxOutputStream& operator <<(wxOutputStream& stream, const wxString& s)
-{
-    stream.Write(s, s.Length());
-    return stream;
-}
-
-static wxOutputStream& operator <<(wxOutputStream& stream, long l)
-{
-    wxString str;
-    str.Printf(wxT("%ld"), l);
-    return stream << str;
-}
-
-static wxOutputStream& operator <<(wxOutputStream& stream, const char c)
-{
-    wxString str;
-    str.Printf(wxT("%c"), c);
-    return stream << str;
-}
-

 // Convert a colour to a 6-digit hex string
 static wxString ColourToHexString(const wxColour& col)
 {
 // Convert a colour to a 6-digit hex string
 static wxString ColourToHexString(const wxColour& col)
 {


@@ -357,59 +358,79 @@ static wxString ColourToHexString(const wxColour& col)
 }
 
 // Convert 6-digit hex string to a colour
 }
 
 // Convert 6-digit hex string to a colour

-wxColour HexStringToColour(const wxString& hex)
+static wxColour HexStringToColour(const wxString& hex)

 {
 {

-    unsigned int r = 0;
-    unsigned int g = 0;
-    unsigned int b = 0;
-    r = wxHexToDec(hex.Mid(0, 2));
-    g = wxHexToDec(hex.Mid(2, 2));
-    b = wxHexToDec(hex.Mid(4, 2));
+    unsigned char r = (unsigned char)wxHexToDec(hex.Mid(0, 2));
+    unsigned char g = (unsigned char)wxHexToDec(hex.Mid(2, 2));
+    unsigned char b = (unsigned char)wxHexToDec(hex.Mid(4, 2));

 
     return wxColour(r, g, b);
 }
 
 
     return wxColour(r, g, b);
 }
 

-bool wxRichTextXMLHandler::SaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)
+bool wxRichTextXMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)

 {
     if (!stream.IsOk())
         return false;
 
     wxString version(wxT("1.0") ) ;
 {
     if (!stream.IsOk())
         return false;
 
     wxString version(wxT("1.0") ) ;

+
+    bool deleteConvFile = false;
+    wxString fileEncoding;
+    wxMBConv* convFile = NULL;
+

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    wxString fileencoding(wxT("UTF-8")) ;
-    wxString memencoding(wxT("UTF-8")) ;
+    fileEncoding = wxT("UTF-8");
+    convFile = & wxConvUTF8;

 #else
 #else

-    wxString fileencoding(wxT("ISO-8859-1")) ;
-    wxString memencoding(wxT("ISO-8859-1")) ;
+    fileEncoding = wxT("ISO-8859-1");
+    convFile = & wxConvISO8859_1;

 #endif
 #endif

-    wxString s ;
-    
-    wxMBConv *convMem = NULL, *convFile = NULL;
+
+    // If SetEncoding has been called, change the output encoding.
+    if (!m_encoding.empty() && m_encoding.Lower() != fileEncoding.Lower())
+    {
+        if (m_encoding == wxT("<System>"))
+        {
+            fileEncoding = wxLocale::GetSystemEncodingName();
+        }
+        else
+        {
+            fileEncoding = m_encoding;
+        }
+
+        // GetSystemEncodingName may not have returned a name
+        if (fileEncoding.empty())

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    convFile = new wxCSConv(fileencoding);
+            fileEncoding = wxT("UTF-8");

 #else
 #else

-    if ( fileencoding != memencoding )
-    {
-        convFile = new wxCSConv(fileencoding);
-        convMem = new wxCSConv(memencoding);
+            fileEncoding = wxT("ISO-8859-1");
+#endif
+        convFile = new wxCSConv(fileEncoding);
+        deleteConvFile = true;

     }
     }

+
+#if !wxUSE_UNICODE
+    wxMBConv* convMem = wxConvCurrent;
+#else
+    wxMBConv* convMem = NULL;

 #endif
 #endif

-    
+
+    wxString s ;

     s.Printf(wxT("<?xml version=\"%s\" encoding=\"%s\"?>\n"),
     s.Printf(wxT("<?xml version=\"%s\" encoding=\"%s\"?>\n"),

-        (const wxChar*) version, (const wxChar*) fileencoding );
+        (const wxChar*) version, (const wxChar*) fileEncoding );

     OutputString(stream, s, NULL, NULL);
     OutputString(stream, wxT("<richtext version=\"1.0.0.0\" xmlns=\"http://www.wxwidgets.org\">") , NULL, NULL);
 
     int level = 1;
     OutputString(stream, s, NULL, NULL);
     OutputString(stream, wxT("<richtext version=\"1.0.0.0\" xmlns=\"http://www.wxwidgets.org\">") , NULL, NULL);
 
     int level = 1;

-    ExportXML(stream, convMem, convFile, *buffer, level);
+    bool success = ExportXML(stream, convMem, convFile, *buffer, level);

 
     OutputString(stream, wxT("\n</richtext>") , NULL, NULL);
     OutputString(stream, wxT("\n"), NULL, NULL);
 
     OutputString(stream, wxT("\n</richtext>") , NULL, NULL);
     OutputString(stream, wxT("\n"), NULL, NULL);

-    
-    delete convFile;
-    delete convMem;

 
 

-    return true;
+    if (deleteConvFile)
+        delete convFile;
+
+    return success;

 }
 
 /// Recursively export an object
 }
 
 /// Recursively export an object


@@ -432,18 +453,18 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
         wxRichTextPlainText& text = (wxRichTextPlainText&) obj;
 
         OutputIndentation(stream, indent);
         wxRichTextPlainText& text = (wxRichTextPlainText&) obj;
 
         OutputIndentation(stream, indent);

-        stream << wxT("<") << objectName;
-        
+        OutputString(stream, wxT("<") + objectName, convMem, convFile);
+

         wxString style = CreateStyle(obj.GetAttributes(), false);
         wxString style = CreateStyle(obj.GetAttributes(), false);

-        
-        stream << style << wxT(">");
-        
+
+        OutputString(stream, style + wxT(">"), convMem, convFile);
+

         wxString str = text.GetText();
         wxString str = text.GetText();

-        if (str.Length() > 0 && (str[0] == wxT(' ') || str[str.Length()-1] == wxT(' ')))
+        if (!str.empty() && (str[0] == wxT(' ') || str[str.length()-1] == wxT(' ')))

         {
         {

-            stream << wxT("\"");
+            OutputString(stream, wxT("\""), convMem, convFile);

             OutputStringEnt(stream, str, convMem, convFile);
             OutputStringEnt(stream, str, convMem, convFile);

-            stream << wxT("\"");
+            OutputString(stream, wxT("\""), convMem, convFile);

         }
         else
             OutputStringEnt(stream, str, convMem, convFile);
         }
         else
             OutputStringEnt(stream, str, convMem, convFile);


@@ -456,37 +477,37 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
             imageObj.MakeBlock();
 
         OutputIndentation(stream, indent);
             imageObj.MakeBlock();
 
         OutputIndentation(stream, indent);

-        stream << wxT("<") << objectName;
+        OutputString(stream, wxT("<") + objectName, convMem, convFile);

         if (!imageObj.GetImageBlock().Ok())
         {
             // No data
         if (!imageObj.GetImageBlock().Ok())
         {
             // No data

-            stream << wxT(">");
+            OutputString(stream, wxT(">"), convMem, convFile);

         }
         else
         {
         }
         else
         {

-            stream << wxString::Format(wxT(" imagetype=\"%d\""), (int) imageObj.GetImageBlock().GetImageType()) << wxT(">");
+            OutputString(stream, wxString::Format(wxT(" imagetype=\"%d\">"), (int) imageObj.GetImageBlock().GetImageType()));

         }
 
         OutputIndentation(stream, indent+1);
         }
 
         OutputIndentation(stream, indent+1);

-        stream << wxT("<data>");
+        OutputString(stream, wxT("<data>"), convMem, convFile);

 
         imageObj.GetImageBlock().WriteHex(stream);
 
 
         imageObj.GetImageBlock().WriteHex(stream);
 

-        stream << wxT("</data>");
+        OutputString(stream, wxT("</data>"), convMem, convFile);

     }
     else if (obj.IsKindOf(CLASSINFO(wxRichTextCompositeObject)))
     {
         OutputIndentation(stream, indent);
     }
     else if (obj.IsKindOf(CLASSINFO(wxRichTextCompositeObject)))
     {
         OutputIndentation(stream, indent);

-        stream << wxT("<") << objectName;
-     
+        OutputString(stream, wxT("<") + objectName, convMem, convFile);
+

         bool isPara = false;
         if (objectName == wxT("paragraph") || objectName == wxT("paragraphlayout"))
             isPara = true;
 
         wxString style = CreateStyle(obj.GetAttributes(), isPara);
         bool isPara = false;
         if (objectName == wxT("paragraph") || objectName == wxT("paragraphlayout"))
             isPara = true;
 
         wxString style = CreateStyle(obj.GetAttributes(), isPara);

-        
-        stream << style << wxT(">");
-        
+
+        OutputString(stream, style + wxT(">"), convMem, convFile);
+

         wxRichTextCompositeObject& composite = (wxRichTextCompositeObject&) obj;
         size_t i;
         for (i = 0; i < composite.GetChildCount(); i++)
         wxRichTextCompositeObject& composite = (wxRichTextCompositeObject&) obj;
         size_t i;
         for (i = 0; i < composite.GetChildCount(); i++)


@@ -499,7 +520,7 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
     if (objectName != wxT("text"))
         OutputIndentation(stream, indent);
 
     if (objectName != wxT("text"))
         OutputIndentation(stream, indent);
 

-    stream << wxT("</") << objectName << wxT(">");
+    OutputString(stream, wxT("</") + objectName + wxT(">"), convMem, convFile);

 
     return true;
 }
 
     return true;
 }


@@ -527,7 +548,7 @@ wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& attr, bool isPara
         str << wxT(" fontface=\"") << attr.GetFont().GetFaceName() << wxT("\"");
     }
 
         str << wxT(" fontface=\"") << attr.GetFont().GetFaceName() << wxT("\"");
     }
 

-    if (!attr.GetCharacterStyleName().IsEmpty())
+    if (!attr.GetCharacterStyleName().empty())

         str << wxT(" charactertyle=\"") << wxString(attr.GetCharacterStyleName()) << wxT("\"");
 
     if (isPara)
         str << wxT(" charactertyle=\"") << wxString(attr.GetCharacterStyleName()) << wxT("\"");
 
     if (isPara)


@@ -543,7 +564,7 @@ wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& attr, bool isPara
         str << wxT(" bulletnumber=\"") << (int) attr.GetBulletNumber() << wxT("\"");
         str << wxT(" bulletsymbol=\"") << wxString(attr.GetBulletSymbol()) << wxT("\"");
 
         str << wxT(" bulletnumber=\"") << (int) attr.GetBulletNumber() << wxT("\"");
         str << wxT(" bulletsymbol=\"") << wxString(attr.GetBulletSymbol()) << wxT("\"");
 

-        if (!attr.GetParagraphStyleName().IsEmpty())
+        if (!attr.GetParagraphStyleName().empty())

             str << wxT(" parstyle=\"") << wxString(attr.GetParagraphStyleName()) << wxT("\"");
     }
 
             str << wxT(" parstyle=\"") << wxString(attr.GetParagraphStyleName()) << wxT("\"");
     }
 


@@ -563,29 +584,29 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
     fontFacename = node->GetPropVal(wxT("fontface"), wxEmptyString);
 
     wxString value = node->GetPropVal(wxT("fontfamily"), wxEmptyString);
     fontFacename = node->GetPropVal(wxT("fontface"), wxEmptyString);
 
     wxString value = node->GetPropVal(wxT("fontfamily"), wxEmptyString);

-    if (!value.IsEmpty())
+    if (!value.empty())

         fontFamily = wxAtoi(value);
 
     value = node->GetPropVal(wxT("fontstyle"), wxEmptyString);
         fontFamily = wxAtoi(value);
 
     value = node->GetPropVal(wxT("fontstyle"), wxEmptyString);

-    if (!value.IsEmpty())
+    if (!value.empty())

         fontStyle = wxAtoi(value);
 
     value = node->GetPropVal(wxT("fontsize"), wxEmptyString);
         fontStyle = wxAtoi(value);
 
     value = node->GetPropVal(wxT("fontsize"), wxEmptyString);

-    if (!value.IsEmpty())
+    if (!value.empty())

         fontSize = wxAtoi(value);
 
     value = node->GetPropVal(wxT("fontweight"), wxEmptyString);
         fontSize = wxAtoi(value);
 
     value = node->GetPropVal(wxT("fontweight"), wxEmptyString);

-    if (!value.IsEmpty())
+    if (!value.empty())

         fontWeight = wxAtoi(value);
 
     value = node->GetPropVal(wxT("fontunderlined"), wxEmptyString);
         fontWeight = wxAtoi(value);
 
     value = node->GetPropVal(wxT("fontunderlined"), wxEmptyString);

-    if (!value.IsEmpty())
+    if (!value.empty())

         fontUnderlined = wxAtoi(value) != 0;
 
     attr.SetFont(* wxTheFontList->FindOrCreateFont(fontSize, fontFamily, fontStyle, fontWeight, fontUnderlined, fontFacename));
 
     value = node->GetPropVal(wxT("textcolor"), wxEmptyString);
         fontUnderlined = wxAtoi(value) != 0;
 
     attr.SetFont(* wxTheFontList->FindOrCreateFont(fontSize, fontFamily, fontStyle, fontWeight, fontUnderlined, fontFacename));
 
     value = node->GetPropVal(wxT("textcolor"), wxEmptyString);

-    if (!value.IsEmpty())
+    if (!value.empty())

     {
         if (value[0] == wxT('#'))
             attr.SetTextColour(HexStringToColour(value.Mid(1)));
     {
         if (value[0] == wxT('#'))
             attr.SetTextColour(HexStringToColour(value.Mid(1)));


@@ -594,7 +615,7 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
     }
 
     value = node->GetPropVal(wxT("backgroundcolor"), wxEmptyString);
     }
 
     value = node->GetPropVal(wxT("backgroundcolor"), wxEmptyString);

-    if (!value.IsEmpty())
+    if (!value.empty())

     {
         if (value[0] == wxT('#'))
             attr.SetBackgroundColour(HexStringToColour(value.Mid(1)));
     {
         if (value[0] == wxT('#'))
             attr.SetBackgroundColour(HexStringToColour(value.Mid(1)));


@@ -603,56 +624,56 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
     }
 
     value = node->GetPropVal(wxT("characterstyle"), wxEmptyString);
     }
 
     value = node->GetPropVal(wxT("characterstyle"), wxEmptyString);

-    if (!value.IsEmpty())
+    if (!value.empty())

         attr.SetCharacterStyleName(value);
 
     // Set paragraph attributes
     if (isPara)
     {
         value = node->GetPropVal(wxT("alignment"), wxEmptyString);
         attr.SetCharacterStyleName(value);
 
     // Set paragraph attributes
     if (isPara)
     {
         value = node->GetPropVal(wxT("alignment"), wxEmptyString);

-        if (!value.IsEmpty())
+        if (!value.empty())

             attr.SetAlignment((wxTextAttrAlignment) wxAtoi(value));
 
         int leftSubIndent = 0;
         int leftIndent = 0;
         value = node->GetPropVal(wxT("leftindent"), wxEmptyString);
             attr.SetAlignment((wxTextAttrAlignment) wxAtoi(value));
 
         int leftSubIndent = 0;
         int leftIndent = 0;
         value = node->GetPropVal(wxT("leftindent"), wxEmptyString);

-        if (!value.IsEmpty())
+        if (!value.empty())

             leftIndent = wxAtoi(value);
         value = node->GetPropVal(wxT("leftsubindent"), wxEmptyString);
             leftIndent = wxAtoi(value);
         value = node->GetPropVal(wxT("leftsubindent"), wxEmptyString);

-        if (!value.IsEmpty())
+        if (!value.empty())

             leftSubIndent = wxAtoi(value);
         attr.SetLeftIndent(leftIndent, leftSubIndent);
 
         value = node->GetPropVal(wxT("rightindent"), wxEmptyString);
             leftSubIndent = wxAtoi(value);
         attr.SetLeftIndent(leftIndent, leftSubIndent);
 
         value = node->GetPropVal(wxT("rightindent"), wxEmptyString);

-        if (!value.IsEmpty())
+        if (!value.empty())

             attr.SetRightIndent(wxAtoi(value));
 
         value = node->GetPropVal(wxT("parspacingbefore"), wxEmptyString);
             attr.SetRightIndent(wxAtoi(value));
 
         value = node->GetPropVal(wxT("parspacingbefore"), wxEmptyString);

-        if (!value.IsEmpty())
+        if (!value.empty())

             attr.SetParagraphSpacingBefore(wxAtoi(value));
 
         value = node->GetPropVal(wxT("parspacingafter"), wxEmptyString);
             attr.SetParagraphSpacingBefore(wxAtoi(value));
 
         value = node->GetPropVal(wxT("parspacingafter"), wxEmptyString);

-        if (!value.IsEmpty())
+        if (!value.empty())

             attr.SetParagraphSpacingAfter(wxAtoi(value));
 
         value = node->GetPropVal(wxT("linespacing"), wxEmptyString);
             attr.SetParagraphSpacingAfter(wxAtoi(value));
 
         value = node->GetPropVal(wxT("linespacing"), wxEmptyString);

-        if (!value.IsEmpty())
+        if (!value.empty())

             attr.SetLineSpacing(wxAtoi(value));
 
         value = node->GetPropVal(wxT("bulletstyle"), wxEmptyString);
             attr.SetLineSpacing(wxAtoi(value));
 
         value = node->GetPropVal(wxT("bulletstyle"), wxEmptyString);

-        if (!value.IsEmpty())
+        if (!value.empty())

             attr.SetBulletStyle(wxAtoi(value));
 
         value = node->GetPropVal(wxT("bulletnumber"), wxEmptyString);
             attr.SetBulletStyle(wxAtoi(value));
 
         value = node->GetPropVal(wxT("bulletnumber"), wxEmptyString);

-        if (!value.IsEmpty())
+        if (!value.empty())

             attr.SetBulletNumber(wxAtoi(value));
 
         value = node->GetPropVal(wxT("bulletsymbol"), wxEmptyString);
             attr.SetBulletNumber(wxAtoi(value));
 
         value = node->GetPropVal(wxT("bulletsymbol"), wxEmptyString);

-        if (!value.IsEmpty())
+        if (!value.empty())

             attr.SetBulletSymbol(value[0]);
 
         value = node->GetPropVal(wxT("parstyle"), wxEmptyString);
             attr.SetBulletSymbol(value[0]);
 
         value = node->GetPropVal(wxT("parstyle"), wxEmptyString);

-        if (!value.IsEmpty())
+        if (!value.empty())

             attr.SetParagraphStyleName(value);
     }
 
             attr.SetParagraphStyleName(value);
     }
 


@@ -660,149 +681,7 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
 }
 
 #endif
 }
 
 #endif

-
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextHTMLHandler, wxRichTextFileHandler)
-
-/// Can we handle this filename (if using files)? By default, checks the extension.
-bool wxRichTextHTMLHandler::CanHandle(const wxString& filename) const
-{
-    wxString path, file, ext;
-    wxSplitPath(filename, & path, & file, & ext);
-
-    return (ext.Lower() == wxT("html") || ext.Lower() == wxT("htm"));
-}
-
-
-#if wxUSE_STREAMS
-bool wxRichTextHTMLHandler::LoadFile(wxRichTextBuffer *WXUNUSED(buffer), wxInputStream& WXUNUSED(stream))
-{
-    return false;
-}
-
-/*
- * We need to output only _changes_ in character formatting.
- */
-
-bool wxRichTextHTMLHandler::SaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)
-{
-    buffer->Defragment();
-
-    wxTextOutputStream str(stream);
-
-    wxTextAttrEx currentParaStyle = buffer->GetAttributes();
-    wxTextAttrEx currentCharStyle = buffer->GetAttributes();
-
-    str << wxT("<html><head></head><body>\n");
-
-    wxRichTextObjectList::compatibility_iterator node = buffer->GetChildren().GetFirst();
-    while (node)
-    {
-        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
-        wxASSERT (para != NULL);
-
-        if (para)
-        {
-            OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream, true);
-
-            wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst();
-            while (node2)
-            {
-                wxRichTextObject* obj = node2->GetData();
-                wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
-                if (textObj && !textObj->IsEmpty())
-                {
-                    OutputCharacterFormatting(currentCharStyle, obj->GetAttributes(), stream, true);
-
-                    str << textObj->GetText();
-
-                    OutputCharacterFormatting(currentCharStyle, obj->GetAttributes(), stream, false);
-                }
-
-                node2 = node2->GetNext();
-            }            
-
-            OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream, false);
-
-            str << wxT("<P>\n");
-        }
-
-        node = node->GetNext();
-    }
-
-    str << wxT("</body></html>\n");
-
-    return true;
-}
-
-/// Output character formatting
-void wxRichTextHTMLHandler::OutputCharacterFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream, bool start)
-{
-    wxTextOutputStream str(stream);
-
-    bool isBold = false;
-    bool isItalic = false;
-    bool isUnderline = false;
-    wxString faceName;
-
-    if (thisStyle.GetFont().Ok())
-    {
-        if (thisStyle.GetFont().GetWeight() == wxBOLD)
-            isBold = true;
-        if (thisStyle.GetFont().GetStyle() == wxITALIC)
-            isItalic = true;
-        if (thisStyle.GetFont().GetUnderlined())
-            isUnderline = true;
-
-        faceName = thisStyle.GetFont().GetFaceName();
-    }
-
-    if (start)
-    {
-        if (isBold)
-            str << wxT("<b>");
-        if (isItalic)
-            str << wxT("<i>");
-        if (isUnderline)
-            str << wxT("<u>");
-    }
-    else
-    {
-        if (isUnderline)
-            str << wxT("</u>");
-        if (isItalic)
-            str << wxT("</i>");
-        if (isBold)
-            str << wxT("</b>");
-    }
-}
-
-/// Output paragraph formatting
-void wxRichTextHTMLHandler::OutputParagraphFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream, bool start)
-{
-    // TODO: lists, indentation (using tables), fonts, right-align, ...
-
-    wxTextOutputStream str(stream);
-    bool isCentered = false;
-
-    if (thisStyle.GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
-    {
-        isCentered = true;
-    }
-
-    if (start)
-    {
-        if (isCentered)
-            str << wxT("<center>");
-    }
-    else
-    {
-        if (isCentered)
-            str << wxT("</center>");
-    }
-}
-
-#endif
+    // wxUSE_STREAMS

 
 #endif
 
 #endif

-    // wxUSE_RICHTEXT
-
+    // wxUSE_RICHTEXT && wxUSE_XML