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

Fixed release number in version.h, turned off WCHAR_T for Cygwin

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-07-09 12:59:44 +00:00
parent c55f0098d5
commit 6bf87dad49
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/msw/setup0.h
View File

@@ -649,8 +649,15 @@
#undef wxUSE_MS_HTML_HELP #undef wxUSE_MS_HTML_HELP
#define wxUSE_MS_HTML_HELP 0 #define wxUSE_MS_HTML_HELP 0
#endif // __GNUWIN32__ #endif // __GNUWIN32__
// Cygwin b20 doesn't have wcslen
#if defined(__GNUWIN32__) && !defined(__MINGW32__)
#undef wxUSE_WCHAR_T
#define wxUSE_WCHAR_T 0
#endif
// MFC duplicates these operators // MFC duplicates these operators
#if wxUSE_MFC #if wxUSE_MFC
#undef wxUSE_GLOBAL_MEMORY_OPERATORS #undef wxUSE_GLOBAL_MEMORY_OPERATORS

2
include/wx/version.h
View File

@@ -15,7 +15,7 @@
// Bump-up with each new version // Bump-up with each new version
#define wxMAJOR_VERSION 2 #define wxMAJOR_VERSION 2
#define wxMINOR_VERSION 2 #define wxMINOR_VERSION 2
#define wxRELEASE_NUMBER 2 #define wxRELEASE_NUMBER 0
#define wxVERSION_STRING _T("wxWindows 2.2.0") #define wxVERSION_STRING _T("wxWindows 2.2.0")
#define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
#define wxBETA_NUMBER 0 #define wxBETA_NUMBER 0