Add a class for parsing simple markup.

[wxWidgets.git] / include / wx / cppunit.h

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index 7e10e80a6891ef6e9c3acb1e140d380c512448a7..9c646ff0838d138b934cf9cf187a496d43bdeb9e 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -49,9 +49,15 @@
 
 #include "wx/beforestd.h"
 #ifdef __VISUALC__
 
 #include "wx/beforestd.h"
 #ifdef __VISUALC__

+    #pragma warning(push)
+

     // with cppunit 1.12 we get many bogus warnings 4701 (local variable may be
     // used without having been initialized) in TestAssert.h
     #pragma warning(disable:4701)
     // with cppunit 1.12 we get many bogus warnings 4701 (local variable may be
     // used without having been initialized) in TestAssert.h
     #pragma warning(disable:4701)

+
+    // and also 4100 (unreferenced formal parameter) in extensions/
+    // ExceptionTestCaseDecorator.h
+    #pragma warning(disable:4100)

 #endif
 
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #endif
 
 #include <cppunit/extensions/TestFactoryRegistry.h>


@@ -61,7 +67,7 @@
 #include <cppunit/CompilerOutputter.h>
 
 #ifdef __VISUALC__
 #include <cppunit/CompilerOutputter.h>
 
 #ifdef __VISUALC__

-    #pragma warning(default:4701)
+    #pragma warning(pop)

 #endif
 #include "wx/afterstd.h"
 
 #endif
 #include "wx/afterstd.h"
 


@@ -81,7 +87,7 @@
     if (Condition) \
         { anyTest; } \
     else \
     if (Condition) \
         { anyTest; } \
     else \

-        wxLogInfo(wxString::Format(_T("skipping: %s.%s\n  reason: %s equals false\n"), \
+        wxLogInfo(wxString::Format(wxT("skipping: %s.%s\n  reason: %s equals false\n"), \

                                     wxString(suiteName, wxConvUTF8).c_str(), \
                                     wxString(#testMethod, wxConvUTF8).c_str(), \
                                     wxString(#Condition, wxConvUTF8).c_str()))
                                     wxString(suiteName, wxConvUTF8).c_str(), \
                                     wxString(#testMethod, wxConvUTF8).c_str(), \
                                     wxString(#Condition, wxConvUTF8).c_str()))


@@ -194,10 +200,10 @@ WX_CPPUNIT_ALLOW_EQUALS_TO_INT(short)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned long)
 
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned long)
 

-#if defined(wxLongLong_t) && !defined(wxLongLongIsLong)
+#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG

 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxLongLong_t)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned wxLongLong_t)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxLongLong_t)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned wxLongLong_t)

-#endif
+#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG

 
 // Use this macro to compare a wxArrayString with the pipe-separated elements
 // of the given string
 
 // Use this macro to compare a wxArrayString with the pipe-separated elements
 // of the given string