Extend history api using the ie backend to include loading history items, and getting...

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

diff --git a/include/wx/osx/chkconf.h b/include/wx/osx/chkconf.h
index 77a9ca66c2aa144e00ec0808d08cf8886a8da95a..d205f75cccdace5232af83e2b2daf240de15c25b 100644 (file)
--- a/include/wx/osx/chkconf.h
+++ b/include/wx/osx/chkconf.h
@@ -40,15 +40,16 @@
  * we only use core graphics now on all builds, try to catch attempts
  * to configure the build otherwise and give error messages
  */
  * 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
  */
 #   error "OS X builds use CoreGraphics in this wx version, you cannot turn back to QuickDraw completely"
 #endif
 
 /*
  * using mixins of cocoa functionality
  */

- 
+

 #ifdef __WXOSX_COCOA__
     #define wxOSX_USE_COCOA 1
 #else
 #ifdef __WXOSX_COCOA__
     #define wxOSX_USE_COCOA 1
 #else


@@ -70,7 +71,9 @@
         #undef wxOSX_USE_COCOA
         #define wxOSX_USE_COCOA 1
     #endif
         #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_IPHONE 0
 #else
     #ifdef __WXOSX_IPHONE__


@@ -83,7 +86,7 @@
 /*
  * combination flags
  */
 /*
  * combination flags
  */

- 
+

 #if wxOSX_USE_COCOA || wxOSX_USE_CARBON
     #define wxOSX_USE_COCOA_OR_CARBON 1
 #else
 #if wxOSX_USE_COCOA || wxOSX_USE_CARBON
     #define wxOSX_USE_COCOA_OR_CARBON 1
 #else


@@ -104,4 +107,4 @@
     #include "wx/osx/cocoa/chkconf.h"
 #endif
 
     #include "wx/osx/cocoa/chkconf.h"
 #endif
 

-#endif // _WX_OSX_CHKCONF_H_
\ No newline at end of file
+#endif /* _WX_OSX_CHKCONF_H_ */