[ 1494561 ] wxComboCtrl vertical size fix.

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

diff --git a/include/wx/mgl/chkconf.h b/include/wx/mgl/chkconf.h
index c8664d4b730598da9d147d22b4ea34de1c744b50..b20fb61caefdcbcd52f904d89e2046eaca4d0c2e 100644 (file)
--- a/include/wx/mgl/chkconf.h
+++ b/include/wx/mgl/chkconf.h
@@ -14,6 +14,14 @@
 #ifndef _WX_MGL_CHKCONF_H_
 #define _WX_MGL_CHKCONF_H_
 
+/*
+   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 */
+
 #ifdef __WATCOMC__
 
 /* Watcom builds for MGL port are setup.h driven and setup.h is
@@ -61,6 +69,11 @@
 #   define wxUSE_SOCKETS 0
 #endif /* wxUSE_SOCKETS */
 
+#if wxUSE_THREADS
+#   undef wxUSE_THREADS
+#   define wxUSE_THREADS 0
+#endif /* wxUSE_SOCKETS */
+
 #if wxUSE_PROTOCOL
 #   undef wxUSE_PROTOCOL
 #   define wxUSE_PROTOCOL 0