Compile wxUIActionSimulator in wxUniv builds.

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

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index 7e4fdd5a99431d6c3b49144f35e0bb0407589c5c..922332b1d623ed20a0d9d770e12daea772d8c6e6 100644 (file)
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -30,6 +30,7 @@
 #include "wx/zstream.h"
 #include "wx/strconv.h"
 #include "wx/scopedptr.h"
 #include "wx/zstream.h"
 #include "wx/strconv.h"
 #include "wx/scopedptr.h"

+#include "wx/versioninfo.h"

 
 #include "expat.h" // from Expat
 
 
 #include "expat.h" // from Expat
 


@@ -798,14 +799,7 @@ bool OutputString(wxOutputStream& stream,
     wxUnusedVar(convMem);
     if ( !convFile )
         convFile = &wxConvUTF8;
     wxUnusedVar(convMem);
     if ( !convFile )
         convFile = &wxConvUTF8;

-#if 1
-    // JACS test
-    const wxWX2MBbuf buf(str.mb_str(*convFile));
-    if (!buf.length())
-        return false;
-    
-    stream.Write((const char*)buf, strlen((const char*)buf));
-#else
+

     const wxScopedCharBuffer buf(str.mb_str(*convFile));
     if ( !buf.length() )
     {
     const wxScopedCharBuffer buf(str.mb_str(*convFile));
     if ( !buf.length() )
     {


@@ -815,8 +809,6 @@ bool OutputString(wxOutputStream& stream,
     }
 
     stream.Write(buf, buf.length());
     }
 
     stream.Write(buf, buf.length());

-#endif
-

 #else // !wxUSE_UNICODE
     if ( convFile && convMem )
     {
 #else // !wxUSE_UNICODE
     if ( convFile && convMem )
     {


@@ -1044,4 +1036,12 @@ bool wxXmlDocument::Save(wxOutputStream& stream, int indentstep) const
            OutputString(stream, wxS("\n"), convMem.get(), convFile.get());
 }
 
            OutputString(stream, wxS("\n"), convMem.get(), convFile.get());
 }
 

+/*static*/ wxVersionInfo wxXmlDocument::GetLibraryVersionInfo()
+{
+    return wxVersionInfo("expat",
+                         XML_MAJOR_VERSION,
+                         XML_MINOR_VERSION,
+                         XML_MICRO_VERSION);
+}
+

 #endif // wxUSE_XML
 #endif // wxUSE_XML