X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..63e2147c8b027645682e0e4cd013a3f30bbd3483:/include/wx/msw/wrapwin.h?ds=sidebyside

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index 04b9d59ed3..a9a927d839 100644
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -17,6 +17,11 @@
     #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__