corrected conditional include

[wxWidgets.git] / include / wx / msw / winundef.h

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index 7a078f9a769ec3da237b8f1d6b4c742518431f60..3e6653c834c10e03e5b65c34c346a5b8fac5f3f5 100644 (file)
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -128,19 +128,19 @@
 
 #ifdef StartDoc
    #undef StartDoc
 
 #ifdef StartDoc
    #undef StartDoc

-   #ifdef __GNUG__
+   #if defined( __GNUG__ ) && !wxCHECK_W32API_VERSION( 0, 5 )

       #define DOCINFOW DOCINFO
       #define DOCINFOA DOCINFO
    #endif
    #ifdef _UNICODE
    inline int StartDoc(HDC h, CONST DOCINFOW* info)
    {
       #define DOCINFOW DOCINFO
       #define DOCINFOA DOCINFO
    #endif
    #ifdef _UNICODE
    inline int StartDoc(HDC h, CONST DOCINFOW* info)
    {

-      return StartDocW(h, info);
+      return StartDocW(h, (DOCINFOW*) info);

    }
    #else
    inline int StartDoc(HDC h, CONST DOCINFOA* info)
    {
    }
    #else
    inline int StartDoc(HDC h, CONST DOCINFOA* info)
    {

-      return StartDocA(h, info);
+      return StartDocA(h, (DOCINFOA*) info);

    }
    #endif
 #endif
    }
    #endif
 #endif