merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions

View File

@@ -95,6 +95,14 @@
# endif
#endif /* !defined(wxUSE_MIMETYPE) */
#ifndef wxUSE_PROLOGIO
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_PROLOGIO must be defined."
# else
# define wxUSE_PROLOGIO 0
# endif
#endif /* !defined(wxUSE_PROLOGIO) */
#ifndef wxUSE_PROTOCOL
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_PROTOCOL must be defined."
@@ -675,6 +683,14 @@
# endif
#endif /* !defined(wxUSE_TREECTRL) */
#ifndef wxUSE_WX_RESOURCES
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_WX_RESOURCES must be defined."
# else
# define wxUSE_WX_RESOURCES 0
# endif
#endif /* !defined(wxUSE_WX_RESOURCES) */
#ifndef wxUSE_WXHTML_HELP
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_WXHTML_HELP must be defined."
@@ -1168,5 +1184,14 @@
# endif
#endif /* wxUSE_CLIPBOARD */
#if wxUSE_WX_RESOURCES && !wxUSE_PROLOGIO
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxr resources require PrologIO"
# else
# undef wxUSE_PROLOGIO
# define wxUSE_PROLOGIO 1
# endif
#endif /* wxUSE_WX_RESOURCES */
#endif /* wxUSE_GUI */