#ifndef _WX_MSW_CHKCONF_H_
#define _WX_MSW_CHKCONF_H_
+/* ensure that MSW-specific settings are defined */
+#ifndef wxUSE_DC_CACHEING
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_DC_CACHEING must be defined"
+# else
+# define wxUSE_DC_CACHEING 1
+# endif
+#endif /* wxUSE_DC_CACHEING */
+
+
/*
* disable the settings which don't work for some compilers
*/
#endif
#ifndef wxUSE_NORLANDER_HEADERS
-# if (defined(__WATCOMC__) && (__WATCOMC__ >= 1200)) || defined(__WINE__) || ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))))
+# if ( wxCHECK_WATCOM_VERSION(1,0) || defined(__WINE__) ) || \
+ ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))))
# define wxUSE_NORLANDER_HEADERS 1
# else
# define wxUSE_NORLANDER_HEADERS 0
# undef wxUSE_STACKWALKER
# define wxUSE_STACKWALKER 0
-#endif // compiler doesn't support SEH
+#endif /* compiler doesn't support SEH */
/* wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior */
#if defined(__MWERKS__)
#endif /* __GNUWIN32__ */
+/* wxUSE_MFC is not defined when using configure as it doesn't make sense for
+ gcc or mingw32 anyhow */
+#ifndef wxUSE_MFC
+ #define wxUSE_MFC 0
+#endif /* !defined(wxUSE_MFC) */
+
/* MFC duplicates these operators */
#if wxUSE_MFC
# undef wxUSE_GLOBAL_MEMORY_OPERATORS
# define wxUSE_DEBUG_NEW_ALWAYS 0
#endif
-/* Early Watcom version don't have good enough wide char support */
-#if defined(__WXMSW__) && (defined(__WATCOMC__) && __WATCOMC__ < 1200)
-# undef wxUSE_WCHAR_T
-# define wxUSE_WCHAR_T 0
-#endif
-
/* DMC++ doesn't have definitions for date picker control, so use generic control
*/
#ifdef __DMC__
# define wxUSE_DATEPICKCTRL_GENERIC 1
#endif
-#endif /* _WX_MSW_CHKCONF_H_ */
+#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
+# undef wxUSE_MS_HTML_HELP
+# define wxUSE_MS_HTML_HELP 0
+# endif
+# endif
+# if wxUSE_DIALUP_MANAGER
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_DIALUP_MANAGER requires wxUSE_DYNAMIC_LOADER."
+# else
+# undef wxUSE_DIALUP_MANAGER
+# define wxUSE_DIALUP_MANAGER 0
+# endif
+# endif
+#endif /* wxUSE_DYNAMIC_LOADER */
+
+#if !wxUSE_DYNLIB_CLASS
+# if wxUSE_UXTHEME
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_UXTHEME requires wxUSE_DYNLIB_CLASS"
+# else
+# undef wxUSE_UXTHEME
+# define wxUSE_UXTHEME 0
+# endif
+# endif
+# if wxUSE_MEDIACTRL
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_MEDIACTRL requires wxUSE_DYNLIB_CLASS"
+# else
+# undef wxUSE_MEDIACTRL
+# define wxUSE_MEDIACTRL 0
+# endif
+# endif
+# if wxUSE_INKEDIT
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_INKEDIT requires wxUSE_DYNLIB_CLASS"
+# else
+# undef wxUSE_INKEDIT
+# define wxUSE_INKEDIT 0
+# endif
+# endif
+#endif /* wxUSE_DYNLIB_CLASS */
+
+#endif /* _WX_MSW_CHKCONF_H_ */