Use wxMBConvUTF8 when G_FILENAME_ENCODING is UTF-8, and set

[wxWidgets.git] / src / mac / carbon / pnghand.cpp

diff --git a/src/mac/carbon/pnghand.cpp b/src/mac/carbon/pnghand.cpp
index 9ac29da3c2d9eb46eaa1635de5142689401177ca..bbcfcbec4554de73c6331da300cc9d59f3b7f995 100644 (file)
--- a/src/mac/carbon/pnghand.cpp
+++ b/src/mac/carbon/pnghand.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #  pragma implementation "pngread.h"
 #  pragma implementation "pnghand.h"
 #endif
@@ -21,12 +21,23 @@
 #  pragma hdrstop
 #endif
 
-#if wxUSE_LIBPNG
+#if 0 // wxUSE_LIBPNG
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
+#if defined(__DARWIN__)
+/* MW's math routines do certain things if __FP__ (the include guard around
+CarbonCore's fp.h) is defined.  CarbonCore's fp.h does certain things if
+__cmath__ is defined so it seems the easy thing to do is to make sure
+__cmath__ is effectively not defined which counteracts the MWERKS check
+then when the real cmath is included everything will be okay.
+*/
+#include <CoreServices/CoreServices.h>
+//#include <cmath>
+#endif //defined(__DARWIN__)
+
 #if wxUSE_IOSTREAMH
 #   include <fstream.h>
 #else