Small fixes after wxHtmlTagHandler::GetParser() addition.

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

diff --git a/include/wx/osx/chkconf.h b/include/wx/osx/chkconf.h
index 94069d247fa5d5957d107b371e08419b49953c93..1b56ac898193303afe961c986f6dbfbcea58a0d8 100644 (file)
--- a/include/wx/osx/chkconf.h
+++ b/include/wx/osx/chkconf.h
@@ -1,5 +1,5 @@
 /*
- * Name:        wx/mac/chkconf.h
+ * Name:        wx/osx/chkconf.h
  * Purpose:     Mac-specific config settings checks
  * Author:      Vadim Zeitlin
  * Modified by:
@@ -11,24 +11,79 @@
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 
-#if wxUSE_UNICODE
-#    if !TARGET_CARBON
-#        ifdef wxABORT_ON_CONFIG_ERROR
-#            error "wxUSE_UNICODE is only supported for Carbon Targets."
-#        else
-#            define wxUSE_UNICODE 0
-#        endif
-#    endif
+#ifndef _WX_OSX_CHKCONF_H_
+#define _WX_OSX_CHKCONF_H_
+
+/*
+ * check graphics context option, must be on for every os x platform
+ * we only use core graphics now on all builds, try to catch attempts
+ * to configure the build otherwise and give error messages
+ */
+
+#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
 
-#if wxUSE_STACKWALKER
-    /* not supported under Mac */
-#   undef wxUSE_STACKWALKER
-#   define wxUSE_STACKWALKER 0
-#endif /* wxUSE_STACKWALKER */
+/*
+ * using mixins of cocoa functionality
+ */
+
+#ifdef __WXOSX_COCOA__
+    #define wxOSX_USE_COCOA 1
+#else
+    #define wxOSX_USE_COCOA 0
+#endif
 
-#ifdef __WXMAC_CLASSIC__
-#   include "wx/osx/classic/chkconf.h"
+#ifdef __WXOSX_CARBON__
+    #define wxOSX_USE_CARBON 1
 #else
-#   include "wx/osx/carbon/chkconf.h"
+    #define wxOSX_USE_CARBON 0
 #endif
+
+/*
+ * setting flags according to the platform
+ */
+
+#ifdef __LP64__
+    #if wxOSX_USE_COCOA == 0
+        #undef wxOSX_USE_COCOA
+        #define wxOSX_USE_COCOA 1
+    #endif
+    #if wxOSX_USE_CARBON
+        #error "Carbon does not support 64bit"
+    #endif
+    #define wxOSX_USE_IPHONE 0
+#else
+    #ifdef __WXOSX_IPHONE__
+        #define wxOSX_USE_IPHONE 1
+    #else
+        #define wxOSX_USE_IPHONE 0
+    #endif
+#endif
+
+/*
+ * combination flags
+ */
+
+#if wxOSX_USE_COCOA || wxOSX_USE_CARBON
+    #define wxOSX_USE_COCOA_OR_CARBON 1
+#else
+    #define wxOSX_USE_COCOA_OR_CARBON 0
+#endif
+
+#if wxOSX_USE_COCOA || wxOSX_USE_IPHONE
+    #define wxOSX_USE_COCOA_OR_IPHONE 1
+#else
+    #define wxOSX_USE_COCOA_OR_IPHONE 0
+#endif
+
+#if wxOSX_USE_IPHONE
+    #include "wx/osx/iphone/chkconf.h"
+#elif wxOSX_USE_CARBON
+    #include "wx/osx/carbon/chkconf.h"
+#elif wxOSX_USE_COCOA
+    #include "wx/osx/cocoa/chkconf.h"
+#endif
+
+#endif /* _WX_OSX_CHKCONF_H_ */