X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1032aee2d4fcf5d13377eefaaa2ab627462a8f05..db51298a741c46719a70884f750befc3b5749036:/include/wx/msw/wrapwin.h?ds=inline diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h index 5f54a6f0d2..103fb8774c 100644 --- a/include/wx/msw/wrapwin.h +++ b/include/wx/msw/wrapwin.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/wrapwin.h +// Name: wx/msw/wrapwin.h // Purpose: Wrapper around , to be included instead of it // Author: Vaclav Slavik // Created: 2003/07/22 @@ -57,6 +57,12 @@ #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 +#endif + #include #if defined(__WXWINCE__) && !defined(__WINDOWS__) @@ -66,13 +72,15 @@ // #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 +// 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 -// Platform SDKs, and since they are typedefs and not #defines we simply +// pointer) on MSVC 7 and later. However, they are not available in older +// Platform SDKs, and since they are typedefs and not #defines we simply // overwrite them if there is a chance that they're not defined -#if !defined(_MSC_VER) || (_MSC_VER < 1300) +#if (!defined(_MSC_VER) || (_MSC_VER < 1300)) && !defined(__WIN64__) #define UINT_PTR unsigned int + #define INT_PTR int + #define HANDLE_PTR unsigned long #define LONG_PTR long #define ULONG_PTR unsigned long #define DWORD_PTR unsigned long @@ -86,7 +94,7 @@ #if wxUSE_GUI -WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc, +WXDLLIMPEXP_CORE int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc, WXLPARAM lData, WXWPARAM wData, int x, int y, int cx, int cy, unsigned int flags); @@ -94,10 +102,10 @@ WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc, wxMSLU_DrawStateW((WXHDC)dc,(WXHBRUSH)br,(WXFARPROC)func, \ ld, wd, x, y, cx, cy, flags) -WXDLLEXPORT int wxMSLU_GetOpenFileNameW(void *ofn); +WXDLLIMPEXP_CORE int wxMSLU_GetOpenFileNameW(void *ofn); #define GetOpenFileNameW(ofn) wxMSLU_GetOpenFileNameW((void*)ofn) -WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn); +WXDLLIMPEXP_CORE int wxMSLU_GetSaveFileNameW(void *ofn); #define GetSaveFileNameW(ofn) wxMSLU_GetSaveFileNameW((void*)ofn) #endif // wxUSE_GUI @@ -106,3 +114,4 @@ WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn); #endif // _WX_WRAPWIN_H_ +