update mac gl, after rev 50900

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

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index ef3f4505a6242806c020e53ac013a9bd8fd53b6a..d6bc50a870e311d10aa517a261f0cb042d78d9ed 100644 (file)
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -39,15 +39,30 @@
     #endif
 #endif
 
+// define _WIN32_WINNT and _WIN32_IE to the highest possible values because we
+// always check for the version of installed DLLs at runtime anyway (see
+// wxGetWinVersion() and wxApp::GetComCtl32Version()) unless the user really
+// doesn't want to use APIs only available on later OS versions and had defined
+// them to (presumably lower) values
 #ifndef _WIN32_WINNT
     #define _WIN32_WINNT 0x0600
 #endif
 
+#ifndef _WIN32_IE
+    #define _WIN32_IE 0x0700
+#endif
+
 /* Deal with clash with __WINDOWS__ include guard */
 #if defined(__WXWINCE__) && defined(__WINDOWS__)
 #undef __WINDOWS__
 #endif
 
+// For IPv6 support, we must include winsock2.h before winsock.h, and
+// windows.h include winsock.h so do it before including it
+#if wxUSE_IPV6
+    #include <winsock2.h>
+#endif
+
 #include <windows.h>
 
 #if defined(__WXWINCE__) && !defined(__WINDOWS__)
@@ -97,3 +112,4 @@ WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn);
 
 #endif // _WX_WRAPWIN_H_
 
+