#include "wx/platform.h"
+// strict type checking to detect conversion from HFOO to HBAR at compile-time
#ifndef STRICT
#define STRICT 1
#endif
-// don't define min() and max() as macros, they conflict with standard C++ ones
+// this macro tells windows.h to not define min() and max() as macros: we need
+// this as otherwise they conflict with standard C++ functions
#ifndef NOMINMAX
#define NOMINMAX
#endif // NOMINMAX
-#include <windows.h>
-#ifdef __WXWINCE__
- // this doesn't make any sense knowing that windows.h includes all these
- // headers anyhow, but the fact remains that when building using eVC 4 the
- // functions and constants from these headers are not defined unless we
- // explicitly include them ourselves -- how is it possible is beyond me...
- #include <winbase.h>
- #include <wingdi.h>
- #include <winuser.h>
+// before including windows.h, define version macros at (currently) maximal
+// values because we do all our checks at run-time anyhow
+#ifndef WINVER
+ // the only exception to the above is MSVC 6 which has a time bomb in its
+ // headers: they warn against using them with WINVER >= 0x0500 as they
+ // contain only part of the declarations and they're not always correct, so
+ // don't define WINVER for it at all as this allows everything to work as
+ // expected both with standard VC6 headers (which define WINVER as 0x0400
+ // by default) and headers from a newer SDK (which may define it as 0x0500)
+ #if !defined(__VISUALC__) || (__VISUALC__ >= 1300)
+ #define WINVER 0x0600
+ #endif
+#endif
- // this one OTOH contains many useful CE-only functions
- #include <shellapi.h>
-#endif // __WXWINCE__
+#ifndef _WIN32_WINNT
+ #define _WIN32_WINNT 0x0600
+#endif
+
+/* Deal with clash with __WINDOWS__ include guard */
+#if defined(__WXWINCE__) && defined(__WINDOWS__)
+#undef __WINDOWS__
+#endif
+
+#include <windows.h>
+
+#if defined(__WXWINCE__) && !defined(__WINDOWS__)
+#define __WINDOWS__
+#endif
+// #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 might be not defined in old headers but
-// unfortunately I don't know of any standard way to test for this (as they're
-// typedefs and not #defines), so simply overwrite them in any case in Win32
-// mode -- and if compiling for Win64 they'd better have new headers anyhow
-//
-// this is ugly but what else can we do? even testing for compiler version
-// wouldn't help as you can perfectly well be using an older compiler (VC6)
-// with newer SDK headers
-#if !defined(__WIN64__) && !defined(__WXWINCE__)
+// 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
+// overwrite them if there is a chance that they're not defined
+#if !defined(_MSC_VER) || (_MSC_VER < 1300)
#define UINT_PTR unsigned int
#define LONG_PTR long
#define ULONG_PTR unsigned long
#define DWORD_PTR unsigned long
-#endif // !__WIN64__
+#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_
projects / wxWidgets.git / blobdiff