X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d7792236f7e4fcbb94cdc2a5213e0c5788e8c28..723aa01a832bf97a43f9cb5c0850e82b4998cd7d:/include/wx/msw/winundef.h diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index 41cea6dc90..9247673876 100644 --- a/include/wx/msw/winundef.h +++ b/include/wx/msw/winundef.h @@ -248,26 +248,20 @@ #endif -/* - When this file is included, sometimes the wxCHECK_W32API_VERSION macro - is undefined. With for example CodeWarrior this gives problems with - the following code: - #if 0 && wxCHECK_W32API_VERSION( 0, 5 ) - Because CodeWarrior does macro expansion before test evaluation. - We define wxCHECK_W32API_VERSION here if it's undefined. -*/ -#if !defined(__GNUG__) && !defined(wxCHECK_W32API_VERSION) - #define wxCHECK_W32API_VERSION(maj, min) (0) -#endif - // StartDoc #ifdef StartDoc #undef StartDoc - #if defined( __GNUG__ ) && !wxCHECK_W32API_VERSION( 0, 5 ) - #define DOCINFOW DOCINFO - #define DOCINFOA DOCINFO + + // Work around a bug in very old MinGW headers that didn't define DOCINFOW + // and DOCINFOA but only DOCINFO in both ANSI and Unicode. + #if defined( __GNUG__ ) + #if !wxCHECK_W32API_VERSION( 0, 5 ) + #define DOCINFOW DOCINFO + #define DOCINFOA DOCINFO + #endif #endif + #ifdef _UNICODE inline int StartDoc(HDC h, CONST DOCINFOW* info) {