applied patch 411059 (mingw win32 api version check)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 352820024a928202057088f1af673df4e6b63587..b3893851f5e0bcb02422f994bc5f4699552ccad3 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -165,23 +165,8 @@
     #define va_list __gnuc_va_list
 #endif // HP-UX
 
-// Cygwin / Mingw32 with gcc >= 2.95 use new windows headers which
-// are more ms-like (header author is Anders Norlander, hence the name)
-#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
-    #ifndef wxUSE_NORLANDER_HEADERS
-        #define wxUSE_NORLANDER_HEADERS 1
-    #endif
-#else
-    #ifndef wxUSE_NORLANDER_HEADERS
-        #define wxUSE_NORLANDER_HEADERS 0
-    #endif
-#endif
-
-// "old" GNUWIN32 is the one without Norlander's headers: it lacks the
-// standard Win32 headers and we define the used stuff ourselves for it
-// in wx/msw/gnuwin32/extra.h
-#if defined(__GNUC__) && !wxUSE_NORLANDER_HEADERS
-    #define __GNUWIN32_OLD__
+#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ )
+#include "wx/msw/gccpriv.h"
 #endif
 
 //////////////////////////////////////////////////////////////////////////////////

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 __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)
    {
-      return StartDocW(h, info);
+      return StartDocW(h, (DOCINFOW*) info);
    }
    #else
    inline int StartDoc(HDC h, CONST DOCINFOA* info)
    {
-      return StartDocA(h, info);
+      return StartDocA(h, (DOCINFOA*) info);
    }
    #endif
 #endif

diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h
index 25862671a5c2fe17df7811a62f9d1138fc114d21..8ea215d41671bed74b2c51126fd0af5a32c20a26 100644 (file)
--- a/src/jpeg/jmorecfg.h
+++ b/src/jpeg/jmorecfg.h
@@ -155,6 +155,10 @@ typedef unsigned int UINT16;
 typedef short INT16;
 #endif
 
+#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ )
+#include <wx/msw/gccpriv.h>
+#endif
+
 /* INT32 must hold at least signed 32-bit values. */
 
 /* you may define INT32_DEFINED if it is already defined somewhere */
@@ -163,8 +167,10 @@ typedef short INT16;
 /* X11/xmd.h correctly defines INT32 */
 #define INT32_DEFINED
 #elif (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550) || \
+      wxCHECK_W32API_VERSION( 0, 5 ) || \
       ((defined(__MINGW32__) || defined(__CYGWIN__)) \
        && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>=95))))
+
 /* INT32 is defined in windows.h  for these compilers */
 #define INT32_DEFINED
 #include <windows.h>

diff --git a/src/makeg95.env b/src/makeg95.env
index 0f3115a32944510cd7e4a34f44bef4daa8c17e2f..6ddf27be2a36dbdb072077926201b0a96d06a38c 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -93,6 +93,7 @@ DLLTOOL = $(CROSS)dlltool
 
 # Miscellaneous compiler options
 # GRG: the __MINGW32__ option is not needed anymore
+# add "-DHAVE_W32API_H" if you have w32api >= 0.5
 OPTIONS = -DSTRICT # -D__MINGW32__
 
 # Debugging information

diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index 910b0aa98d0ac776c2035575c193abda5200f089..bf03145dc5e47534230096930e75568842934822 100644 (file)
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -55,8 +55,8 @@
 DEFINE_EVENT_TYPE(wxEVT_DIALUP_CONNECTED)
 DEFINE_EVENT_TYPE(wxEVT_DIALUP_DISCONNECTED)
 
-// Doesn't yet compile under VC++ 4, BC++, mingw, Watcom C++: no wininet.h
-#if !defined(__BORLANDC__) && !defined(__GNUWIN32_OLD__) && !defined(__GNUWIN32__) && !defined(__WATCOMC__) && ! (defined(__VISUALC__) && (__VISUALC__ < 1020))
+// Doesn't yet compile under VC++ 4, BC++, Watcom C++: no wininet.h
+#if !defined(__BORLANDC__) && !defined(__GNUWIN32_OLD__) && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 0, 5 ) ) && !defined(__WATCOMC__) && ! (defined(__VISUALC__) && (__VISUALC__ < 1020))
 
 #include <ras.h>
 #include <raserror.h>