wxMGL compilation fixes

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

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index ed0b3c0b0731ca1710c044755461b52c5b76d434..056cc19565a4857fbf193e8c2949873f58bdfdef 100644 (file)
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "xml.h"
 #endif
 
@@ -32,6 +32,10 @@
 
 #include "expat.h" // from Expat
 
+// DLL options compatibility check:
+#include "wx/app.h"
+WX_CHECK_BUILD_OPTIONS("wxXML")
+
 //-----------------------------------------------------------------------------
 //  wxXmlNode
 //-----------------------------------------------------------------------------
@@ -576,7 +580,13 @@ inline static void OutputString(wxOutputStream& stream, const wxString& str,
 {
     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 )