X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed0769cdabaff7365d3068a5b73e527b4ca8ce14..c8e1af672f46e93ae2fe6d7f9d5b35a3d8d49c16:/include/wx/msw/wrapwin.h diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h index 7d93fe701a..04b9d59ed3 100644 --- a/include/wx/msw/wrapwin.h +++ b/include/wx/msw/wrapwin.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wrapwin.h +// Name: msw/wrapwin.h // Purpose: Wrapper around , to be included instead of it // Author: Vaclav Slavik // Created: 2003/07/22 @@ -18,7 +18,35 @@ #endif #include + +#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 + #include + #include + + // this one OTOH contains many useful CE-only functions + #include +#endif // __WXWINCE__ + #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__) + #define UINT_PTR unsigned int + #define ULONG_PTR unsigned long + #define DWORD_PTR unsigned long +#endif // !__WIN64__ + #endif // _WX_WRAPWIN_H_