Fixed bug #1163384. Moved the code that handles activating the cell

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

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index 5cd923c50cb5f4f512807cf32cab467fcaa367b0..a9a927d83969dc3f5a1c7d0dc39a1ee0421bb82b 100644 (file)
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -5,7 +5,7 @@
 // Created:     2003/07/22
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vaclav Slavik
 // Created:     2003/07/22
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vaclav Slavik

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WRAPWIN_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WRAPWIN_H_


@@ -17,6 +17,11 @@
     #define STRICT 1
 #endif
 
     #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__
 #include <windows.h>
 
 #ifdef __WXWINCE__