fix a few hundreds of harmless unused parameters warnings and a couple of real bugs...

[wxWidgets.git] / include / wx / mac / carbon / chkconf.h

diff --git a/include/wx/mac/carbon/chkconf.h b/include/wx/mac/carbon/chkconf.h
index e7c5d596c5a3d66f052e256aa670bdc9d9870be0..ec1bfa37ff09bcb981281b675ff9530c3ec3d5b1 100644 (file)
--- a/include/wx/mac/carbon/chkconf.h
+++ b/include/wx/mac/carbon/chkconf.h
@@ -16,13 +16,46 @@
  * disable the settings which don't work for some compilers
  */
 
-/*
- * wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior
- */
-
 #if defined(__MWERKS__)
     #undef wxUSE_DEBUG_NEW_ALWAYS
     #define wxUSE_DEBUG_NEW_ALWAYS      0
+
+    /* DS: Fixes compilation when wxUSE_ON_FATAL_EXCEPTION is 1 */
+    #ifndef wxTYPE_SA_HANDLER
+        #define wxTYPE_SA_HANDLER int
+    #endif
+#endif
+
+/*
+ * use OS X CoreGraphics (1) or QuickDraw (0) for rendering
+ */
+
+#ifndef wxMAC_USE_CORE_GRAPHICS
+    #define wxMAC_USE_CORE_GRAPHICS 1
+#endif
+
+/*
+ * wxMAC_USE_CORE_GRAPHICS is now implemented in terms of wxUSE_GRAPHICS_CONTEXT
+ */
+ 
+#if wxMAC_USE_CORE_GRAPHICS 
+       #undef wxUSE_GRAPHICS_CONTEXT
+       #define wxUSE_GRAPHICS_CONTEXT 1
+#endif
+
+/*
+ * check graphics context option
+ */
+#if wxUSE_GRAPHICS_CONTEXT && !wxMAC_USE_CORE_GRAPHICS
+#   error "wxUSE_GRAPHICS_CONTEXT on wxMac requires wxMAC_USE_CORE_GRAPHICS"
+#endif
+
+/*
+ * native (1) or emulated (0) toolbar
+ */
+
+#ifndef wxMAC_USE_NATIVE_TOOLBAR
+    #define wxMAC_USE_NATIVE_TOOLBAR 1
 #endif
 
 #endif