X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef1717a963dfb76bac26b9f4277ae590b3c0a2e6..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/os2/chkconf.h

diff --git a/include/wx/os2/chkconf.h b/include/wx/os2/chkconf.h
index 924d2f0d45..3a9151853b 100644
--- a/include/wx/os2/chkconf.h
+++ b/include/wx/os2/chkconf.h
@@ -4,7 +4,6 @@
  * Author:      Julian Smart
  * Modified by:
  * Created:     01/02/97
- * RCS-ID:      $Id$
  * Copyright:   (c) Julian Smart
  * Licence:     wxWindows licence
  */
@@ -14,17 +13,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 +37,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_ */