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

Don't use wxCHECK_W32API_VERSION() in #if when it can be undefined.

Browse Source 
wxCHECK_W32API_VERSION() is only defined when using MinGW, don't use it an #if
test which is always parsed but only in a separate test inside #ifdef __GNUG__
test which is parsed only when we do use MinGW.

This fixes harmless but annoying warning from MSVC 10.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-05-23 21:16:41 +00:00
parent ff7dbb27d4
commit 364f3b0700
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/msw/winundef.h
View File

@@ -252,10 +252,16 @@
#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)
{