adding measuring contexts, streamlining printing code

[wxWidgets.git] / include / wx / platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 2f5e5318fae835defaa50d139ace9486c8a74991..faeaf6fd204cf18c2571f805bec98aca9d8ce1d8 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -34,6 +34,12 @@
 #        define __WXMAC_OSX__
 #        define __WXMAC_CARBON__
 #        include <AvailabilityMacros.h>
+#        ifndef MAC_OS_X_VERSION_10_4
+#           define MAC_OS_X_VERSION_10_4 1040
+#        endif
+#        ifndef MAC_OS_X_VERSION_10_5
+#           define MAC_OS_X_VERSION_10_5 1050
+#        endif
 #        ifdef __WXMAC_XCODE__
 #            include <unistd.h>
 #            include "wx/mac/carbon/config_xcode.h"
@@ -529,6 +535,10 @@
     #define wxCHECK_GCC_VERSION( major, minor ) 0
 #endif
 
+#if defined(__BORLANDC__) || (defined(__GNUC__) && __GNUC__ < 3)
+#define wxNEEDS_CHARPP
+#endif
+
 /*
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min