moved MSW-specific stuff to wx/msw/chkconf.h, this also means that MSW-specific check...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index e9760937ac964bf65f382ad3da699e1b4006a056..21e94aa0063c69152aa0764d9eb7dc7da66d70e5 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -12,7 +12,7 @@
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 
 /*
-   Compiler-specific checking.
+   Platform-specific checking.
  */
 
 #if defined(__WXPALMOS__)
@@ -1168,63 +1168,6 @@
 #   endif
 #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 */
 #ifdef __WXMGL__
 #   if !wxUSE_PALETTE

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index ac012a67f53cc89cbfb819aa732e755078616c3d..85990ed350618b75958d19a10a1f0889b7fa815c 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -168,5 +168,62 @@
 #   define wxUSE_DATEPICKCTRL_GENERIC 1
 #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_ */