added wxMessageOutputBest which tries to show the message to the user in the best...

[wxWidgets.git] / include / wx / msw / wrapwin.h

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index f70ed821e1ccef47d6c0b1c56e20d962a7a65517..72c0d8cd176ff036a4150991e5c30cb474581009 100644 (file)
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -18,7 +18,9 @@
 #endif
 
 // don't define min() and max() as macros, they conflict with standard C++ ones
-#define NOMINMAX
+#ifndef NOMINMAX
+    #define NOMINMAX
+#endif // NOMINMAX
 
 #include <windows.h>
 
@@ -47,6 +49,7 @@
 // with newer SDK headers
 #if !defined(__WIN64__) && !defined(__WXWINCE__)
     #define UINT_PTR unsigned int
+    #define LONG_PTR long
     #define ULONG_PTR unsigned long
     #define DWORD_PTR unsigned long
 #endif // !__WIN64__