Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Really fix wxUSE_PREFERENCES_EDITOR requirements check.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2013-07-15 22:37:52 +00:00
parent 6a4480ec29
commit b545d7ab09
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/chkconf.h
View File

@@ -2209,13 +2209,21 @@
# if !wxUSE_NOTEBOOK # if !wxUSE_NOTEBOOK
# ifdef __WXOSX_COCOA__ # ifdef __WXOSX_COCOA__
# if !wxUSE_TOOLBAR || !wxOSX_USE_NATIVE_TOOLBAR # 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 # endif
# else # 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 # endif
# undef wxUSE_PREFERENCES_EDITOR
# define wxUSE_PREFERENCES_EDITOR 0
# endif # endif
#endif /* wxUSE_PREFERENCES_EDITOR */ #endif /* wxUSE_PREFERENCES_EDITOR */