moved MSW-specific stuff to wx/msw/chkconf.h, this also means that MSW-specific checks are not done for WinCE build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
7ecb668390
commit
b55c37167d
@ -12,7 +12,7 @@
|
|||||||
/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
|
/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Compiler-specific checking.
|
Platform-specific checking.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if defined(__WXPALMOS__)
|
#if defined(__WXPALMOS__)
|
||||||
@ -1168,63 +1168,6 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif /* wxGTK && !wxUniv */
|
#endif /* wxGTK && !wxUniv */
|
||||||
|
|
||||||
/* wxMSW-specific dependencies */
|
|
||||||
#ifdef __WXMSW__
|
|
||||||
# ifndef wxUSE_UNICODE_MSLU
|
|
||||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
|
||||||
# error "wxUSE_UNICODE_MSLU must be defined."
|
|
||||||
# else
|
|
||||||
# define wxUSE_UNICODE_MSLU 0
|
|
||||||
# endif
|
|
||||||
# endif /* wxUSE_UNICODE_MSLU */
|
|
||||||
# ifndef wxUSE_UXTHEME
|
|
||||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
|
||||||
# error "wxUSE_UXTHEME must be defined."
|
|
||||||
# else
|
|
||||||
# define wxUSE_UXTHEME 0
|
|
||||||
# endif
|
|
||||||
# endif /* wxUSE_UXTHEME */
|
|
||||||
# ifndef wxUSE_UXTHEME_AUTO
|
|
||||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
|
||||||
# error "wxUSE_UXTHEME_AUTO must be defined."
|
|
||||||
# else
|
|
||||||
# define wxUSE_UXTHEME_AUTO 0
|
|
||||||
# endif
|
|
||||||
# endif /* wxUSE_UXTHEME_AUTO */
|
|
||||||
# ifndef wxUSE_MS_HTML_HELP
|
|
||||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
|
||||||
# error "wxUSE_MS_HTML_HELP must be defined."
|
|
||||||
# else
|
|
||||||
# define wxUSE_MS_HTML_HELP 0
|
|
||||||
# endif
|
|
||||||
# endif /* !defined(wxUSE_MS_HTML_HELP) */
|
|
||||||
# ifndef wxUSE_DIALUP_MANAGER
|
|
||||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
|
||||||
# error "wxUSE_DIALUP_MANAGER must be defined."
|
|
||||||
# else
|
|
||||||
# define wxUSE_DIALUP_MANAGER 0
|
|
||||||
# endif
|
|
||||||
# endif /* !defined(wxUSE_DIALUP_MANAGER) */
|
|
||||||
|
|
||||||
# if !wxUSE_DYNAMIC_LOADER
|
|
||||||
# if wxUSE_MS_HTML_HELP
|
|
||||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
|
||||||
# error "wxUSE_MS_HTML_HELP requires wxUSE_DYNAMIC_LOADER."
|
|
||||||
# else
|
|
||||||
# define wxUSE_DYNAMIC_LOADER 1
|
|
||||||
# endif
|
|
||||||
# endif
|
|
||||||
# if wxUSE_DIALUP_MANAGER
|
|
||||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
|
||||||
# error "wxUSE_DIALUP_MANAGER requires wxUSE_DYNAMIC_LOADER."
|
|
||||||
# else
|
|
||||||
# define wxUSE_DYNAMIC_LOADER 1
|
|
||||||
# endif
|
|
||||||
# endif
|
|
||||||
# endif /* wxUSE_DYNAMIC_LOADER */
|
|
||||||
|
|
||||||
#endif /* wxMSW */
|
|
||||||
|
|
||||||
/* wxMGL-specific dependencies */
|
/* wxMGL-specific dependencies */
|
||||||
#ifdef __WXMGL__
|
#ifdef __WXMGL__
|
||||||
# if !wxUSE_PALETTE
|
# if !wxUSE_PALETTE
|
||||||
|
@ -168,5 +168,62 @@
|
|||||||
# define wxUSE_DATEPICKCTRL_GENERIC 1
|
# define wxUSE_DATEPICKCTRL_GENERIC 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef wxUSE_UNICODE_MSLU
|
||||||
|
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||||
|
# error "wxUSE_UNICODE_MSLU must be defined."
|
||||||
|
# else
|
||||||
|
# define wxUSE_UNICODE_MSLU 0
|
||||||
|
# endif
|
||||||
|
#endif /* wxUSE_UNICODE_MSLU */
|
||||||
|
|
||||||
|
#ifndef wxUSE_UXTHEME
|
||||||
|
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||||
|
# error "wxUSE_UXTHEME must be defined."
|
||||||
|
# else
|
||||||
|
# define wxUSE_UXTHEME 0
|
||||||
|
# endif
|
||||||
|
#endif /* wxUSE_UXTHEME */
|
||||||
|
|
||||||
|
#ifndef wxUSE_UXTHEME_AUTO
|
||||||
|
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||||
|
# error "wxUSE_UXTHEME_AUTO must be defined."
|
||||||
|
# else
|
||||||
|
# define wxUSE_UXTHEME_AUTO 0
|
||||||
|
# endif
|
||||||
|
#endif /* wxUSE_UXTHEME_AUTO */
|
||||||
|
|
||||||
|
#ifndef wxUSE_MS_HTML_HELP
|
||||||
|
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||||
|
# error "wxUSE_MS_HTML_HELP must be defined."
|
||||||
|
# else
|
||||||
|
# define wxUSE_MS_HTML_HELP 0
|
||||||
|
# endif
|
||||||
|
#endif /* !defined(wxUSE_MS_HTML_HELP) */
|
||||||
|
|
||||||
|
#ifndef wxUSE_DIALUP_MANAGER
|
||||||
|
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||||
|
# error "wxUSE_DIALUP_MANAGER must be defined."
|
||||||
|
# else
|
||||||
|
# define wxUSE_DIALUP_MANAGER 0
|
||||||
|
# endif
|
||||||
|
#endif /* !defined(wxUSE_DIALUP_MANAGER) */
|
||||||
|
|
||||||
|
#if !wxUSE_DYNAMIC_LOADER
|
||||||
|
# if wxUSE_MS_HTML_HELP
|
||||||
|
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||||
|
# error "wxUSE_MS_HTML_HELP requires wxUSE_DYNAMIC_LOADER."
|
||||||
|
# else
|
||||||
|
# define wxUSE_DYNAMIC_LOADER 1
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
# if wxUSE_DIALUP_MANAGER
|
||||||
|
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||||
|
# error "wxUSE_DIALUP_MANAGER requires wxUSE_DYNAMIC_LOADER."
|
||||||
|
# else
|
||||||
|
# define wxUSE_DYNAMIC_LOADER 1
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
#endif /* wxUSE_DYNAMIC_LOADER */
|
||||||
|
|
||||||
#endif /* _WX_MSW_CHKCONF_H_ */
|
#endif /* _WX_MSW_CHKCONF_H_ */
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user