added checks for more wxUSE_SVG dependencies: wxUSE_IMAGE and wxUSE_LIBPNG

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

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index 1e039d424de835ff03d073cc4758018ceadd9026..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__)
@@ -57,7 +72,6 @@
 // #undef the macros defined in winsows.h which conflict with code elsewhere
 #include "wx/msw/winundef.h"
 
-
 // Types DWORD_PTR, ULONG_PTR and so on are used for 64-bit compatability 
 // in the WINAPI SDK (they are an integral type that is the size of a
 // pointer) on MSVC 7 and later. However, they are not available in older 
@@ -70,5 +84,32 @@
     #define DWORD_PTR unsigned long
 #endif // !defined(_MSC_VER) || _MSC_VER < 1300
 
+// ----------------------------------------------------------------------------
+// Fix the functions wrongly implemented in unicows.dll
+// ----------------------------------------------------------------------------
+
+#if wxUSE_UNICODE_MSLU
+
+#if wxUSE_GUI
+
+WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc,
+                                  WXLPARAM lData, WXWPARAM wData,
+                                  int x, int y, int cx, int cy,
+                                  unsigned int flags);
+#define DrawStateW(dc, br, func, ld, wd, x, y, cx, cy, flags) \
+    wxMSLU_DrawStateW((WXHDC)dc,(WXHBRUSH)br,(WXFARPROC)func, \
+                      ld, wd, x, y, cx, cy, flags)
+
+WXDLLEXPORT int wxMSLU_GetOpenFileNameW(void *ofn);
+#define GetOpenFileNameW(ofn) wxMSLU_GetOpenFileNameW((void*)ofn)
+
+WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn);
+#define GetSaveFileNameW(ofn) wxMSLU_GetSaveFileNameW((void*)ofn)
+
+#endif // wxUSE_GUI
+
+#endif // wxUSE_UNICODE_MSLU
+
 #endif // _WX_WRAPWIN_H_
 
+