really disable wxUSE_DISPLAY for wxMGL and wxOS2

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mgl/chkconf.h b/include/wx/mgl/chkconf.h
index ab3271487f9a13b8c4b1fa0cae3afffe4153572b..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_
 
 #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
 #ifdef __WATCOMC__
 
 /* Watcom builds for MGL port are setup.h driven and setup.h is


@@ -56,11 +64,6 @@
 #   define wxUSE_CLIPBOARD 0
 #endif /* wxUSE_CLIPBOARD */
 
 #   define wxUSE_CLIPBOARD 0
 #endif /* wxUSE_CLIPBOARD */
 

-#if wxUSE_DISPLAY
-#   undef wxUSE_DISPLAY
-#   define wxUSE_DISPLAY 0
-#endif /* wxUSE_DISPLAY */
-

 #if wxUSE_SOCKETS
 #   undef wxUSE_SOCKETS
 #   define wxUSE_SOCKETS 0
 #if wxUSE_SOCKETS
 #   undef wxUSE_SOCKETS
 #   define wxUSE_SOCKETS 0

diff --git a/include/wx/os2/chkconf.h b/include/wx/os2/chkconf.h
index 924d2f0d45365f30d7cbd5c0fc94dd352baae562..ef8d72b1eaf3378ddbc4d99f02739df156c88539 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_
 
 #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 */
 
 /* 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
 
 #if wxUSE_STACKWALKER
 #   undef wxUSE_STACKWALKER