X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d48f13a168143e97c271bbeb2f544a63983ee435..dd44c130144ad153bf67121a94b23a615db409f5:/include/wx/chkconf.h?ds=inline diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index ad5744acaf..47fa8ee467 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -4,7 +4,6 @@ * Author: Vadim Zeitlin * Modified by: * Created: 09.08.00 - * RCS-ID: $Id$ * Copyright: (c) 2000 Vadim Zeitlin * Licence: wxWindows licence */ @@ -936,6 +935,14 @@ # endif #endif /* !defined(wxUSE_POPUPWIN) */ +#ifndef wxUSE_PREFERENCES_EDITOR +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_PREFERENCES_EDITOR must be defined, please read comment near the top of this file." +# else +# define wxUSE_PREFERENCES_EDITOR 0 +# endif +#endif /* !defined(wxUSE_PREFERENCES_EDITOR) */ + #ifndef wxUSE_PRINTING_ARCHITECTURE # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_PRINTING_ARCHITECTURE must be defined, please read comment near the top of this file." @@ -2192,6 +2199,33 @@ # endif #endif /* wxUSE_WEBVIEW && !any web view backend */ +#if wxUSE_PREFERENCES_EDITOR + /* + We can use either a generic implementation, using wxNotebook, or a + native one under wxOSX/Cocoa but then we must be using the native + toolbar. + */ +# if !wxUSE_NOTEBOOK +# ifdef __WXOSX_COCOA__ +# if !wxUSE_TOOLBAR || !wxOSX_USE_NATIVE_TOOLBAR +# ifdef 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 +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_PREFERENCES_EDITOR requires wxNotebook" +# else +# undef wxUSE_PREFERENCES_EDITOR +# define wxUSE_PREFERENCES_EDITOR 0 +# endif +# endif +# endif +#endif /* wxUSE_PREFERENCES_EDITOR */ + #endif /* wxUSE_GUI */ #endif /* _WX_CHKCONF_H_ */