X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14d3c9f7b4c8f7ca0a83974af6e01b07183c500a..f23b6f74bbf43799594924e94382b13587b4a57e:/include/wx/msw/wrapwin.h 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 #ifdef __WXWINCE__