projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regenerated makefiles
[wxWidgets.git]
/
src
/
xml
/
xml.cpp
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 )