X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b55c37167d58995621a264e09477e9e350573a9a..b01ca8b6a9b2828aa7fe6399d8920951c24661ce:/include/wx/msw/chkconf.h

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 85990ed350..53059846ab 100644
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -14,6 +14,16 @@
 #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
  */
@@ -89,6 +99,12 @@
 
 #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
@@ -213,14 +229,15 @@
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #            error "wxUSE_MS_HTML_HELP requires wxUSE_DYNAMIC_LOADER."
 #        else
-#            define wxUSE_DYNAMIC_LOADER 1
+#            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
-#            define wxUSE_DYNAMIC_LOADER 1
+#            undef wxUSE_DIALUP_MANAGER
+#            define wxUSE_DIALUP_MANAGER 0
 #        endif
 #    endif
 #endif  /* wxUSE_DYNAMIC_LOADER */