1. more proper fix for wxChoice/wxComboBox height problems than in 2,2 branch

2. wxIsspace() fix merged from the 2.2 branch


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-05-19 01:01:21 +00:00
parent 31827af3ea
commit 18c5099700
5 changed files with 27 additions and 32 deletions

View File

@@ -637,6 +637,13 @@ WXDLLEXPORT int wxSystem(const wxChar *psz);
WXDLLEXPORT size_t wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const struct tm *tm);
#endif
// under VC++ 6.0 isspace() returns 1 for 8 bit chars which completely breaks
// the file parsing - this may be true for 5.0 as well, update #ifdef then
#if defined(__VISUALC__) && (__VISUALC__ >= 1200) && !wxUSE_UNICODE
#undef wxIsspace
#define wxIsspace(c) ((((unsigned)c) < 128) && isspace(c))
#endif // VC++
// ----------------------------------------------------------------------------
// common macros which are always defined
// ----------------------------------------------------------------------------