Fix warnings about signed/unsigned comparisons inside wxMax() and friends.

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

diff --git a/include/wx/mgl/chkconf.h b/include/wx/mgl/chkconf.h
index 643aafdc64b1f17f9e233dc864752c1661bec5a4..12ebd70cde6c0784799a12b9c145de3c96590352 100644 (file)
--- a/include/wx/mgl/chkconf.h
+++ b/include/wx/mgl/chkconf.h
@@ -14,6 +14,23 @@
 #ifndef _WX_MGL_CHKCONF_H_
 #define _WX_MGL_CHKCONF_H_
 
+#ifndef __WXUNIVERSAL__
+#   error "wxMGL cannot be built without wxUniversal"
+#endif
+
+/* wxPalette is always needed */
+#if !wxUSE_PALETTE
+#   error "wxMGL requires wxUSE_PALETTE=1"
+#endif
+
+/*
+   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
@@ -41,11 +58,6 @@
 #   define wxUSE_DYNAMIC_LOADER 0
 #endif /* wxUSE_DYNAMIC_LOADER */
 
-#if wxUSE_ODBC
-#   undef wxUSE_ODBC
-#   define wxUSE_ODBC 0
-#endif /* wxUSE_ODBC */
-
 #if wxUSE_DATAOBJ
 #   undef wxUSE_DATAOBJ
 #   define wxUSE_DATAOBJ 0
@@ -81,6 +93,11 @@
 #   define wxUSE_FS_INET 0
 #endif /* wxUSE_FS_INET */
 
+#if wxUSE_MS_HTML_HELP
+#   undef wxUSE_MS_HTML_HELP
+#   define wxUSE_MS_HTML_HELP 0
+#endif
+
 #endif /* __WATCOM__ */
 
 #endif /* _WX_MGL_CHKCONF_H_ */