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

partially applied patch #895170: "Building with minimal setup.h - continuation"

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2004-05-30 15:14:41 +00:00
parent 0063a4dce6
commit 0b4f47a319
11 changed files with 123 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
include/wx/chkconf.h
View File

@@ -946,6 +946,17 @@
# endif
#endif /* controls */
#if wxUSE_BMPBUTTON
# if !wxUSE_BUTTON
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_BMPBUTTON requires wxUSE_BUTTON"
# else
# undef wxUSE_BUTTON
# define wxUSE_BUTTON 1
# endif
# endif
#endif /* wxUSE_BMPBUTTON */
#if wxUSE_NOTEBOOK || wxUSE_LISTBOOK
# if defined(wxUSE_BOOKCTRL) && !wxUSE_BOOKCTRL
# ifdef wxABORT_ON_CONFIG_ERROR
@@ -1201,6 +1212,17 @@
# endif
#endif /* wxUSE_RADIOBTN */
#if wxUSE_HELP
# if !wxUSE_BMPBUTTON
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_HELP requires wxUSE_BMPBUTTON"
# else
# undef wxUSE_BMPBUTTON
# define wxUSE_BMPBUTTON 1
# endif
# endif
#endif /* wxUSE_HELP */
#if wxUSE_WXHTML_HELP
# if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK
# ifdef wxABORT_ON_CONFIG_ERROR
@@ -1378,6 +1400,25 @@
# endif
#endif /* wxUSE_FILEDLG */
#if !wxUSE_BUTTON
# if wxUSE_PROGRESSDLG || \
wxUSE_FONTDLG || \
wxUSE_FILEDLG || \
wxUSE_CHOICEDLG || \
wxUSE_NUMBERDLG || \
wxUSE_TEXTDLG || \
wxUSE_DIRDLG || \
wxUSE_STARTUP_TIPS || \
wxUSE_WIZARDDLG
# ifdef wxABORT_ON_CONFIG_ERROR
# error "Common and generic dialogs require wxUSE_BUTTON"
# else
# undef wxUSE_BUTTON
# define wxUSE_BUTTON 1
# endif
# endif
#endif /* wxUSE_PROGRESSDLG */
#if !wxUSE_TOOLBAR
# if wxUSE_TOOLBAR_NATIVE
# ifdef wxABORT_ON_CONFIG_ERROR
@@ -1444,12 +1485,14 @@
#endif /* wxUSE_LOGWINDOW */
#if wxUSE_LOG_DIALOG
# if !wxUSE_LISTCTRL
# if !wxUSE_LISTCTRL || !wxUSE_BUTTON
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_LOG_DIALOG requires wxUSE_LISTCTRL"
# error "wxUSE_LOG_DIALOG requires wxUSE_LISTCTRL and wxUSE_BUTTON"
# else
# undef wxUSE_LISTCTRL
# define wxUSE_LISTCTRL 1
# undef wxUSE_BUTTON
# define wxUSE_BUTTON 1
# endif
# endif
#endif /* wxUSE_LOG_DIALOG */