X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f94380234878ab30799ccce3d1cf8cced364df37..d11e8786ed13b72766eea18cb577cc00f9f08f41:/include/wx/msw/wrapwin.h

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index f723f1bf99..a9a927d839 100644
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -17,7 +17,26 @@
     #define STRICT 1
 #endif
 
+// don't define min() and max() as macros, they conflict with standard C++ ones
+#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>
+
+    // this one OTOH contains many useful CE-only functions
+    #include <shellapi.h>
+#endif // __WXWINCE__
+
 #include "wx/msw/winundef.h"
 
 // types DWORD_PTR, ULONG_PTR and so on might be not defined in old headers but
@@ -28,7 +47,7 @@
 // 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
-#ifndef __WIN64__
+#if !defined(__WIN64__) && !defined(__WXWINCE__)
     #define UINT_PTR unsigned int
     #define ULONG_PTR unsigned long
     #define DWORD_PTR unsigned long