no need to add . and .. explicitely to the catalogs search path, the new catalog...

[wxWidgets.git] / include / wx / msw / chkconf.h

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 9841894966bbaad6c6881b8227e63caab2bde256..a381c045aa729626756aea8ff18366c4b049c432 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -37,7 +37,8 @@
 #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
@@ -70,7 +71,7 @@
 
 #    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__)
@@ -167,12 +168,6 @@
 #   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__
@@ -229,58 +224,45 @@
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #            error "wxUSE_MS_HTML_HELP requires wxUSE_DYNAMIC_LOADER."
 #        else
-#            define wxUSE_DYNAMIC_LOADER 1
+#            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
-#            define wxUSE_DYNAMIC_LOADER 1
+#            undef wxUSE_DIALUP_MANAGER
+#            define wxUSE_DIALUP_MANAGER 0
 #        endif
 #    endif
 #endif  /* wxUSE_DYNAMIC_LOADER */
 
-
-/*
-    Finally, although this is not really a configuration check, do it here for
-    now as we'll supplement it with a real consistency check verifying that
-    wxUSE_UNICODE_MSLU corresponds to USE_MSLU in the makefiles. But for MSVC
-    we can do even better: not just check for consistency but even link in the
-    lib ourselves if needed.
-
-    Notice that this is used for DLL wx build, as otherwise we have to do the
-    same for the main executable and not the (static) library. It is done in
-    msvc/wx/setup.h in that case.
- */
-#if wxUSE_UNICODE_MSLU && \
-    (defined(WXMAKINGDLL) || \
-     defined(WXMAKINGDLL_NET) || \
-     defined(WXMAKINGDLL_CORE) || \
-     defined(WXMAKINGDLL_ADV) || \
-     defined(WXMAKINGDLL_ODBC) || \
-     defined(WXMAKINGDLL_DBGRID) || \
-     defined(WXMAKINGDLL_HTML) || \
-     defined(WXMAKINGDLL_GL) || \
-     defined(WXMAKINGDLL_XML) || \
-     defined(WXMAKINGDLL_XRC) || \
-     defined(WXMAKINGDLL_MEDIA))
-    // first remove all default libraries
-    #pragma comment(linker, "/nod:kernel32.lib /nod:advapi32.lib /nod:user32.lib /nod:gdi32.lib /nod:shell32.lib /nod:comdlg32.lib /nod:version.lib /nod:mpr.lib /nod:rasapi32.lib /nod:winmm.lib /nod:winspool.lib /nod:vfw32.lib /nod:secur32.lib /nod:oleacc.lib /nod:oledlg.lib /nod:sensapi.lib")
-
-    // then add unicows.lib as the first library
-    #pragma comment(lib, "unicows.lib")
-
-    // and only then re-add back all the other ones
-    #pragma comment(lib, "kernel32.lib")
-    #pragma comment(lib, "user32.lib")
-    #pragma comment(lib, "gdi32.lib")
-    #pragma comment(lib, "winspool.lib")
-    #pragma comment(lib, "comdlg32.lib")
-    #pragma comment(lib, "advapi32.lib")
-    #pragma comment(lib, "shell32.lib")
-    #pragma comment(lib, "oleacc.lib")
-#endif
+#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_ */
-