Unicode compilation fixes

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

diff --git a/contrib/src/xrc/xml.cpp b/contrib/src/xrc/xml.cpp
index 692a39f0bc46542a709a57c27ded120fb0245259..d7001dd1e9b1bb260f71a799df0d0966f9ef85cc 100644 (file)
--- a/contrib/src/xrc/xml.cpp
+++ b/contrib/src/xrc/xml.cpp
@@ -469,7 +469,7 @@ static int UnknownEncodingHnd(void * WXUNUSED(encodingHandlerData),
     // We must build conversion table for expat. The easiest way to do so
     // is to let wxCSConv convert as string containing all characters to
     // wide character representation:
-    wxCSConv conv(name);
+    wxCSConv conv(wxString(name, wxConvLibc));
     char mbBuf[255];
     wchar_t wcBuf[255];
     size_t i;
@@ -559,7 +559,7 @@ inline static void OutputString(wxOutputStream& stream, const wxString& str,
 {
     if (str.IsEmpty()) return;
 #if wxUSE_UNICODE
-    const wxW2MBbuf *buf = str.mb_str(convFile ? *convFile : wxConvUTF8);
+    const wxWX2MBbuf buf(str.mb_str(convFile ? *convFile : wxConvUTF8));
     stream.Write((const char*)buf, strlen((const char*)buf));
 #else
     if ( convFile == NULL )

diff --git a/src/xrc/xml.cpp b/src/xrc/xml.cpp
index 692a39f0bc46542a709a57c27ded120fb0245259..d7001dd1e9b1bb260f71a799df0d0966f9ef85cc 100644 (file)
--- a/src/xrc/xml.cpp
+++ b/src/xrc/xml.cpp
@@ -469,7 +469,7 @@ static int UnknownEncodingHnd(void * WXUNUSED(encodingHandlerData),
     // We must build conversion table for expat. The easiest way to do so
     // is to let wxCSConv convert as string containing all characters to
     // wide character representation:
-    wxCSConv conv(name);
+    wxCSConv conv(wxString(name, wxConvLibc));
     char mbBuf[255];
     wchar_t wcBuf[255];
     size_t i;
@@ -559,7 +559,7 @@ inline static void OutputString(wxOutputStream& stream, const wxString& str,
 {
     if (str.IsEmpty()) return;
 #if wxUSE_UNICODE
-    const wxW2MBbuf *buf = str.mb_str(convFile ? *convFile : wxConvUTF8);
+    const wxWX2MBbuf buf(str.mb_str(convFile ? *convFile : wxConvUTF8));
     stream.Write((const char*)buf, strlen((const char*)buf));
 #else
     if ( convFile == NULL )