X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30f6914ba1d999b84c28fc84a3cf0fdbf9cc326f..3d9bff2f13c7fe6a61b99de92c8283dcbb59b147:/src/xml/xml.cpp diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp index 7e4fdd5a99..3767c9dc30 100644 --- a/src/xml/xml.cpp +++ b/src/xml/xml.cpp @@ -798,14 +798,7 @@ bool OutputString(wxOutputStream& stream, 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() ) { @@ -815,8 +808,6 @@ bool OutputString(wxOutputStream& stream, } stream.Write(buf, buf.length()); -#endif - #else // !wxUSE_UNICODE if ( convFile && convMem ) {