compilation fix after last change

[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 f9c630775e34105c0e0f39d387ce321a00075655..294804f479b7e97c0b681731a96f0d4f2c3dda91 100644 (file)
--- a/include/wx/mac/carbon/chkconf.h
+++ b/include/wx/mac/carbon/chkconf.h
@@ -31,7 +31,23 @@
  */
 
 #ifndef wxMAC_USE_CORE_GRAPHICS
  */
 
 #ifndef wxMAC_USE_CORE_GRAPHICS

-    #define wxMAC_USE_CORE_GRAPHICS 0
+    #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
 
 /*
 #endif
 
 /*


@@ -39,7 +55,7 @@
  */
 
 #ifndef wxMAC_USE_NATIVE_TOOLBAR
  */
 
 #ifndef wxMAC_USE_NATIVE_TOOLBAR

-    #define wxMAC_USE_NATIVE_TOOLBAR 0
+    #define wxMAC_USE_NATIVE_TOOLBAR 1

 #endif
 
 #endif
 #endif
 
 #endif