X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef1717a963dfb76bac26b9f4277ae590b3c0a2e6..d0f063020e6fb1b1a660952d0844071e0df24324:/include/wx/os2/chkconf.h diff --git a/include/wx/os2/chkconf.h b/include/wx/os2/chkconf.h index 924d2f0d45..8b78599992 100644 --- a/include/wx/os2/chkconf.h +++ b/include/wx/os2/chkconf.h @@ -14,17 +14,19 @@ #ifndef _WX_OS2_CHKCONF_H_ #define _WX_OS2_CHKCONF_H_ -#ifdef __WATCOMC__ +/* + wxDisplay is not implemented for OS/2, use stub common version instead. + */ +#if wxUSE_DISPLAY +# undef wxUSE_DISPLAY +# define wxUSE_DISPLAY 0 +#endif /* wxUSE_DISPLAY */ /* Watcom builds for OS/2 port are setup.h driven and setup.h is automatically generated from include/wx/setup_inc.h so we have to disable here features not supported currently or enable features required */ - -#if wxUSE_DISPLAY -# undef wxUSE_DISPLAY -# define wxUSE_DISPLAY 0 -#endif /* wxUSE_DISPLAY */ +#ifdef __WATCOMC__ #if wxUSE_STACKWALKER # undef wxUSE_STACKWALKER @@ -36,6 +38,11 @@ # define wxUSE_POSTSCRIPT 1 #endif +#if wxUSE_MS_HTML_HELP +# undef wxUSE_MS_HTML_HELP +# define wxUSE_MS_HTML_HELP 0 +#endif + #endif /* __WATCOM__ */ #endif /* _WX_OS2_CHKCONF_H_ */