From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 28 Mar 2006 14:17:42 +0000 (+0000)
Subject: really disable wxUSE_DISPLAY for wxMGL and wxOS2
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5981cd22f313eb75f465bec4ed2872ea2eb1ebae?ds=inline

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 ab3271487f..b20fb61cae 100644
--- 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
@@ -56,11 +64,6 @@
 #   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
diff --git a/include/wx/os2/chkconf.h b/include/wx/os2/chkconf.h
index 924d2f0d45..ef8d72b1ea 100644
--- 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