Replace define for OLECMDID_OPTICAL_ZOOM with an enum to avoid errors in compilers...

[wxWidgets.git] / tests / testprec.h

diff --git a/tests/testprec.h b/tests/testprec.h
index 7724b1959180b6aa4572620702e40ee395c6c59d..d956d4353a0af4b5e54475d8d6497aeac633cae5 100644 (file)
--- a/tests/testprec.h
+++ b/tests/testprec.h
@@ -1,3 +1,6 @@
+#ifndef WX_TESTPREC_INCLUDED
+#define WX_TESTPREC_INCLUDED 1
+
 #include "wx/wxprec.h"
 #include "wx/cppunit.h"
 
@@ -38,7 +41,8 @@
 // -Wundef if it involves an operation with undefined __MINGW_FEATURES__ so
 // test for the latter too to avoid it.
 #if defined(__VISUALC__) || \
-    (defined(__MINGW32__) && !defined(__MINGW_FEATURES__) || !__USE_MINGW_ANSI_STDIO)
+    (defined(__MINGW32__) && \
+     (!defined(__MINGW_FEATURES__) || !__USE_MINGW_ANSI_STDIO))
     #define wxUSING_VC_CRT_IO
 #endif
 
@@ -81,8 +85,12 @@ public:
                 CPPUNIT_FAIL("expected assertion not generated"); \
         }
 #else
-    // there are no assertions in this build so just check that it fails
-    #define WX_ASSERT_FAILS_WITH_ASSERT(cond) CPPUNIT_ASSERT(!(cond))
+    // there are no assertions in this build so we can't do anything (we used
+    // to check that the condition failed but this didn't work well as in
+    // normal build with wxDEBUG_LEVEL != 0 we can pass something not
+    // evaluating to a bool at all but it then would fail to compile in
+    // wxDEBUG_LEVEL == 0 case, so just don't do anything at all now).
+    #define WX_ASSERT_FAILS_WITH_ASSERT(cond)
 #endif
 
 // these functions can be used to hook into wxApp event processing and are
@@ -136,3 +144,5 @@ private:
         CPPUNIT_MAKE_UNIQUE_NAME( autoRegisterRegistry__ ); \
     static CPPUNIT_NS::AutoRegisterSuite< name##TestCase > \
         CPPUNIT_MAKE_UNIQUE_NAME( autoRegisterNamedRegistry__ )(#name "TestCase")
+
+#endif