From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 15 Jul 2013 22:37:52 +0000 (+0000)
Subject: Really fix wxUSE_PREFERENCES_EDITOR requirements check.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b545d7ab09787f1fd86b0ac30a873a9c0bd65f60?ds=inline

Really fix wxUSE_PREFERENCES_EDITOR requirements check.

The changes of r74532 were incomplete/wrong and the fix of r74536 didn't
entirely fix the logic here, so try to do it again, hopefully correctly this
time.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

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 */