From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 21 Feb 2005 02:06:21 +0000 (+0000)
Subject: don't define min/max macros in windows.h (closes 1052256)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/baec3aee005c382ce1d062725022b6349c97540b

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 04b9d59ed3..f70ed821e1 100644
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -17,6 +17,9 @@
     #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__