Add wxUSE_PREFERENCES_EDITOR and the corresponding configure option.
This was somehow forgotten when wxPreferencesEditor was added. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -936,6 +936,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 +2200,26 @@
|
||||
# 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
|
||||
# error "wxUSE_PREFERENCES_EDITOR requires native toolbar in wxOSX"
|
||||
# endif
|
||||
# else
|
||||
# error "wxUSE_PREFERENCES_EDITOR requires wxNotebook"
|
||||
# endif
|
||||
# else
|
||||
# undef wxUSE_PREFERENCES_EDITOR
|
||||
# define wxUSE_PREFERENCES_EDITOR 0
|
||||
# endif
|
||||
#endif /* wxUSE_PREFERENCES_EDITOR */
|
||||
|
||||
#endif /* wxUSE_GUI */
|
||||
|
||||
#endif /* _WX_CHKCONF_H_ */
|
||||
|
Reference in New Issue
Block a user