Add wx/datetimectrl.h to the wxAdv files list.

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

diff --git a/include/wx/osx/chkconf.h b/include/wx/osx/chkconf.h
index 755cc8c9859b32aacb16685faea3cd767d0d5001..d205f75cccdace5232af83e2b2daf240de15c25b 100644 (file)
--- a/include/wx/osx/chkconf.h
+++ b/include/wx/osx/chkconf.h
@@ -40,19 +40,28 @@
  * we only use core graphics now on all builds, try to catch attempts
  * 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
 
 /*
  * using mixins of cocoa functionality
  */
- 
-#ifndef wxOSX_USE_COCOA
+
+#ifdef __WXOSX_COCOA__
+    #define wxOSX_USE_COCOA 1
+#else
     #define wxOSX_USE_COCOA 0
 #endif
 
+#ifdef __WXOSX_CARBON__
+    #define wxOSX_USE_CARBON 1
+#else
+    #define wxOSX_USE_CARBON 0
+#endif
+
 /*
  * setting flags according to the platform
  */
@@ -62,26 +71,22 @@
         #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__
-        #define wxOSX_USE_CARBON 0
         #define wxOSX_USE_IPHONE 1
     #else
         #define wxOSX_USE_IPHONE 0
-        #if wxOSX_USE_COCOA
-            #define wxOSX_USE_CARBON 0
-        #else
-            #define wxOSX_USE_CARBON 1
-        #endif
     #endif
 #endif
 
 /*
  * combination flags
  */
- 
+
 #if wxOSX_USE_COCOA || wxOSX_USE_CARBON
     #define wxOSX_USE_COCOA_OR_CARBON 1
 #else
@@ -102,4 +107,4 @@
     #include "wx/osx/cocoa/chkconf.h"
 #endif
 
-#endif // _WX_OSX_CHKCONF_H_
\ No newline at end of file
+#endif /* _WX_OSX_CHKCONF_H_ */