don't define min/max macros in windows.h (closes 1052256)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index 04b9d59ed33c19295b98b34b555359e890dd452a..f70ed821e1ccef47d6c0b1c56e20d962a7a65517 100644 (file)
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -17,6 +17,9 @@
     #define STRICT 1
 #endif
 
     #define STRICT 1
 #endif
 

+// don't define min() and max() as macros, they conflict with standard C++ ones
+#define NOMINMAX
+

 #include <windows.h>
 
 #ifdef __WXWINCE__
 #include <windows.h>
 
 #ifdef __WXWINCE__