]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/msw/wrapwin.h
Have the calendar control handle events from it's combo and spin controls
[wxWidgets.git] / include / wx / msw / wrapwin.h
index 5cd923c50cb5f4f512807cf32cab467fcaa367b0..72c0d8cd176ff036a4150991e5c30cb474581009 100644 (file)
@@ -5,7 +5,7 @@
 // Created:     2003/07/22
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vaclav Slavik
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WRAPWIN_H_
     #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__
@@ -44,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__