Don't interpret '&' specially in wxTextWrapper.

[wxWidgets.git] / include / wx / osx / chkconf.h

diff --git a/include/wx/osx/chkconf.h b/include/wx/osx/chkconf.h
index 243b9899e74fd741cbbcbfd8d05d1709fc0bc6ce..d205f75cccdace5232af83e2b2daf240de15c25b 100644 (file)
--- a/include/wx/osx/chkconf.h
+++ b/include/wx/osx/chkconf.h
@@ -41,7 +41,8 @@
  * to configure the build otherwise and give error messages
  */
 
-#if !wxUSE_GRAPHICS_CONTEXT || ( defined( wxMAC_USE_CORE_GRAPHICS ) && !wxMAC_USE_CORE_GRAPHICS )
+#if wxUSE_GUI && (!wxUSE_GRAPHICS_CONTEXT || \
+    ( defined( wxMAC_USE_CORE_GRAPHICS ) && !wxMAC_USE_CORE_GRAPHICS ))
 #   error "OS X builds use CoreGraphics in this wx version, you cannot turn back to QuickDraw completely"
 #endif
 
@@ -70,7 +71,9 @@
         #undef wxOSX_USE_COCOA
         #define wxOSX_USE_COCOA 1
     #endif
-    #define wxOSX_USE_CARBON 0
+    #if wxOSX_USE_CARBON
+        #error "Carbon does not support 64bit"
+    #endif
     #define wxOSX_USE_IPHONE 0
 #else
     #ifdef __WXOSX_IPHONE__
@@ -104,4 +107,4 @@
     #include "wx/osx/cocoa/chkconf.h"
 #endif
 
-#endif // _WX_OSX_CHKCONF_H_
+#endif /* _WX_OSX_CHKCONF_H_ */