X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a4480ec2966a7db9f07e372fc9b2c934957a59b..9c34a216817028bc533e07873d047208a96b05a2:/include/wx/chkconf.h?ds=sidebyside

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index f01831b8ea..9db157b2fc 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -2209,13 +2209,21 @@
 #   if !wxUSE_NOTEBOOK
 #       ifdef __WXOSX_COCOA__
 #           if !wxUSE_TOOLBAR || !wxOSX_USE_NATIVE_TOOLBAR
-#               error "wxUSE_PREFERENCES_EDITOR requires native toolbar in wxOSX"
+#               if wxABORT_ON_CONFIG_ERROR
+#                   error "wxUSE_PREFERENCES_EDITOR requires native toolbar in wxOSX"
+#               else
+#                   undef wxUSE_PREFERENCES_EDITOR
+#                   define wxUSE_PREFERENCES_EDITOR 0
+#               endif
 #           endif
 #       else
-#           error "wxUSE_PREFERENCES_EDITOR requires wxNotebook"
+#           if wxABORT_ON_CONFIG_ERROR
+#               error "wxUSE_PREFERENCES_EDITOR requires wxNotebook"
+#           else
+#               undef wxUSE_PREFERENCES_EDITOR
+#               define wxUSE_PREFERENCES_EDITOR 0
+#           endif
 #       endif
-#       undef wxUSE_PREFERENCES_EDITOR
-#       define wxUSE_PREFERENCES_EDITOR 0
 #   endif
 #endif /* wxUSE_PREFERENCES_EDITOR */