Apply patch [ 1548750 ] wxVsnprintf() various fixes

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

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index 243e68303f81d51dc0ba25d9e39a855aa306c1cd..8bbc99f7f51a9284014bb0540beb7ba518d2d069 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -5,6 +5,7 @@
 // Created:     15.02.04
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Vadim Zeitlin
+// Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CPPUNIT_H_
@@ -27,6 +28,15 @@
 #ifdef __BORLANDC__
     #pragma warn -8022
 #endif
+ 
+///////////////////////////////////////////////////////////////////////////////
+// Set the default format for the errors, which can be used by an IDE to jump
+// to the error location. This default gets overridden by the cppunit headers
+// for some compilers (e.g. VC++).
+
+#ifndef CPPUNIT_COMPILER_LOCATION_FORMAT 
+    #define CPPUNIT_COMPILER_LOCATION_FORMAT "%p:%l:"
+#endif
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -38,6 +48,7 @@
 #include <cppunit/ui/text/TestRunner.h>
 #include <cppunit/TestCase.h>
 #include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/CompilerOutputter.h>
 #include "wx/afterstd.h"
 
 
@@ -47,7 +58,7 @@
 
 // Base macro for wrapping CPPUNIT_TEST macros and so making them conditional
 // tests, meaning that the test only get registered and thus run when a given
-// runtime condition is true. 
+// runtime condition is true.
 // In case the condition is evaluated as false a skip message is logged
 // (the message will only be shown in verbose mode).
 #define WXTEST_ANY_WITH_CONDITION(suiteName, Condition, testMethod, anyTest) \
@@ -67,6 +78,16 @@
     WXTEST_ANY_WITH_CONDITION(suiteName, Condition, testMethod, CPPUNIT_TEST_FAIL(testMethod))
 
 
+///////////////////////////////////////////////////////////////////////////////
+// stream inserter for wxString
+//
+
+inline std::ostream& operator<<(std::ostream& o, const wxString& s)
+{
+    return o << s.mb_str();
+}
+
+
 ///////////////////////////////////////////////////////////////////////////////
 // Some more compiler warning tweaking and auto linking.
 //