Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

really disable wxUSE_DISPLAY for wxMGL and wxOS2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-28 14:17:42 +00:00
parent 020e385d47
commit 5981cd22f3
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/mgl/chkconf.h
View File

@@ -14,6 +14,14 @@
#ifndef _WX_MGL_CHKCONF_H_ #ifndef _WX_MGL_CHKCONF_H_
#define _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__ #ifdef __WATCOMC__
/* Watcom builds for MGL port are setup.h driven and setup.h is /* Watcom builds for MGL port are setup.h driven and setup.h is
@@ -56,11 +64,6 @@
# define wxUSE_CLIPBOARD 0 # define wxUSE_CLIPBOARD 0
#endif /* wxUSE_CLIPBOARD */ #endif /* wxUSE_CLIPBOARD */
#if wxUSE_DISPLAY
# undef wxUSE_DISPLAY
# define wxUSE_DISPLAY 0
#endif /* wxUSE_DISPLAY */
#if wxUSE_SOCKETS #if wxUSE_SOCKETS
# undef wxUSE_SOCKETS # undef wxUSE_SOCKETS
# define wxUSE_SOCKETS 0 # define wxUSE_SOCKETS 0

14
include/wx/os2/chkconf.h
View File

@@ -14,17 +14,19 @@
#ifndef _WX_OS2_CHKCONF_H_ #ifndef _WX_OS2_CHKCONF_H_
#define _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 /* 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 automatically generated from include/wx/setup_inc.h so we have
to disable here features not supported currently or enable to disable here features not supported currently or enable
features required */ features required */
#ifdef __WATCOMC__
#if wxUSE_DISPLAY
# undef wxUSE_DISPLAY
# define wxUSE_DISPLAY 0
#endif /* wxUSE_DISPLAY */
#if wxUSE_STACKWALKER #if wxUSE_STACKWALKER
# undef wxUSE_STACKWALKER # undef wxUSE_STACKWALKER