/////////////////////////////////////////////////////////////////////////////
-// Name: msw/wrapwin.h
+// Name: wx/msw/wrapwin.h
// Purpose: Wrapper around <windows.h>, to be included instead of it
// Author: Vaclav Slavik
// Created: 2003/07/22
// #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 LONG_PTR long
#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);
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