unicode wxMac CW fixes

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

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index 7fc49292a2c6eadf6da4eb927ad261b345312d00..056cc19565a4857fbf193e8c2949873f58bdfdef 100644 (file)
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -580,7 +580,13 @@ inline static void OutputString(wxOutputStream& stream, const wxString& str,
 {
     if (str.IsEmpty()) return;
 #if wxUSE_UNICODE
 {
     if (str.IsEmpty()) return;
 #if wxUSE_UNICODE

-    const wxWX2MBbuf buf(str.mb_str(convFile ? *convFile : wxConvUTF8));
+    const wxWX2MBbuf buf(str.mb_str(
+#ifdef __MWERKS__
+    *(convFile ? convFile : &wxConvUTF8)
+#else
+    convFile ? *convFile : wxConvUTF8
+#endif
+    ));

     stream.Write((const char*)buf, strlen((const char*)buf));
 #else
     if ( convFile == NULL )
     stream.Write((const char*)buf, strlen((const char*)buf));
 #else
     if ( convFile == NULL )