compatibility fix: have wxListKey ctors from C strings so that passing string literal...

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

diff --git a/include/wx/os2/chkconf.h b/include/wx/os2/chkconf.h
index 924d2f0d45365f30d7cbd5c0fc94dd352baae562..8b7859999257c5622735091e784dfccf2340d9ee 100644 (file)
--- 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_ */