Add support for custom attributes to wxOSX/Cocoa wxDataViewCustomRenderer.

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

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index 7e10e80a6891ef6e9c3acb1e140d380c512448a7..d320acdc7109dc922fcbefac74d03ca0a09a3493 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -49,9 +49,15 @@
 
 #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)
+
+    // and also 4100 (unreferenced formal parameter) in extensions/
+    // ExceptionTestCaseDecorator.h
+    #pragma warning(disable:4100)
 #endif
 
 #include <cppunit/extensions/TestFactoryRegistry.h>
@@ -61,7 +67,7 @@
 #include <cppunit/CompilerOutputter.h>
 
 #ifdef __VISUALC__
-    #pragma warning(default:4701)
+    #pragma warning(pop)
 #endif
 #include "wx/afterstd.h"
 
@@ -81,7 +87,7 @@
     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()))