From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 23 May 2012 21:16:41 +0000 (+0000)
Subject: Don't use wxCHECK_W32API_VERSION() in #if when it can be undefined.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/364f3b070071ee73e417a3770342d779774288e8

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

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
---

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index e012910321..9247673876 100644
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -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)
    {