projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add GTK3-specific code for DrawItemSelectionRect(), fixes drawing selected tree contr...
[wxWidgets.git]
/
include
/
wx
/
msw
/
chkconf.h
diff --git
a/include/wx/msw/chkconf.h
b/include/wx/msw/chkconf.h
index eabc05bdf6e7ce1763c3a9168938bf8fab71b1c7..6f6e6f3082b2f22d13ae0ce746461732af968e47 100644
(file)
--- a/
include/wx/msw/chkconf.h
+++ b/
include/wx/msw/chkconf.h
@@
-155,12
+155,6
@@
# define wxUSE_STACKWALKER 0
#endif /* compiler doesn't support SEH */
# define wxUSE_STACKWALKER 0
#endif /* compiler doesn't support SEH */
-/* wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior */
-#if defined(__MWERKS__)
-# undef wxUSE_DEBUG_NEW_ALWAYS
-# define wxUSE_DEBUG_NEW_ALWAYS 0
-#endif
-
#if defined(__GNUWIN32__)
/* These don't work as expected for mingw32 and cygwin32 */
# undef wxUSE_MEMORY_TRACING
#if defined(__GNUWIN32__)
/* These don't work as expected for mingw32 and cygwin32 */
# undef wxUSE_MEMORY_TRACING
@@
-224,11
+218,6
@@
*/
#ifdef __WIN64__
# if wxUSE_STACKWALKER
*/
#ifdef __WIN64__
# if wxUSE_STACKWALKER
- /* this is not currently supported under Win64, volunteers needed to
- make it work */
-# undef wxUSE_STACKWALKER
-# define wxUSE_STACKWALKER 0
-
# undef wxUSE_CRASHREPORT
# define wxUSE_CRASHREPORT 0
# endif
# undef wxUSE_CRASHREPORT
# define wxUSE_CRASHREPORT 0
# endif
@@
-239,7
+228,7
@@
Compiler-specific checks.
*/
Compiler-specific checks.
*/
-/
/ Borland
+/
* Borland */
#ifdef __BORLANDC__
#if __BORLANDC__ < 0x500
#ifdef __BORLANDC__
#if __BORLANDC__ < 0x500
@@
-336,6
+325,14
@@
#endif /* !wxUSE_DYNAMIC_LOADER */
#if !wxUSE_DYNLIB_CLASS
#endif /* !wxUSE_DYNAMIC_LOADER */
#if !wxUSE_DYNLIB_CLASS
+# if wxUSE_DC_TRANSFORM_MATRIX
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_DC_TRANSFORM_MATRIX requires wxUSE_DYNLIB_CLASS"
+# else
+# undef wxUSE_DC_TRANSFORM_MATRIX
+# define wxUSE_DC_TRANSFORM_MATRIX 0
+# endif
+# endif
# if wxUSE_UXTHEME
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_UXTHEME requires wxUSE_DYNLIB_CLASS"
# if wxUSE_UXTHEME
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_UXTHEME requires wxUSE_DYNLIB_CLASS"
@@
-400,6
+397,14
@@
# define wxUSE_MEDIACTRL 0
# endif
# endif
# define wxUSE_MEDIACTRL 0
# endif
# endif
+# if wxUSE_WEB
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxWebView requires wxActiveXContainer under MSW"
+# else
+# undef wxUSE_WEB
+# define wxUSE_WEB 0
+# endif
+# endif
#endif /* !wxUSE_ACTIVEX */
#if !wxUSE_THREADS
#endif /* !wxUSE_ACTIVEX */
#if !wxUSE_THREADS
@@
-413,6
+418,18
@@
# endif
#endif /* !wxUSE_THREADS */
# endif
#endif /* !wxUSE_THREADS */
+
+#if !wxUSE_OLE_AUTOMATION
+# if wxUSE_WEB
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxWebView requires wxUSE_OLE_AUTOMATION under MSW"
+# else
+# undef wxUSE_WEB
+# define wxUSE_WEB 0
+# endif
+# endif
+#endif /* !wxUSE_OLE_AUTOMATION */
+
#if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
# undef wxUSE_POSTSCRIPT
# define wxUSE_POSTSCRIPT 1
#if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
# undef wxUSE_POSTSCRIPT
# define wxUSE_POSTSCRIPT 1