Cygwin 1.1 mods (main branch)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-07-22 14:03:36 +00:00
parent 494a19d6d9
commit 74afbadc17
5 changed files with 29 additions and 30 deletions

View File

@@ -626,7 +626,7 @@
#define wxUSE_OWNER_DRAWN 1
// Owner-drawn menus and listboxes
#if defined(__MINGW32__) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
#ifndef wxUSE_NORLANDER_HEADERS
# define wxUSE_NORLANDER_HEADERS 1
#endif
@@ -650,14 +650,16 @@
#undef wxUSE_MS_HTML_HELP
#define wxUSE_MS_HTML_HELP 0
#endif // __GNUWIN32__
// Cygwin b20 doesn't have wcslen
#if defined(__GNUWIN32__) && !defined(__MINGW32__)
#undef wxUSE_WCHAR_T
#define wxUSE_WCHAR_T 0
// Cygwin betas don't have wcslen
#if defined(__CYGWIN__) || defined(__CYGWIN32__)
# if ! ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
# undef wxUSE_WCHAR_T
# define wxUSE_WCHAR_T 0
# endif
#endif
#endif // __GNUWIN32__
// MFC duplicates these operators
#if wxUSE_MFC
#undef wxUSE_GLOBAL_MEMORY_OPERATORS