define wxUTF8Buf as the type returned by wxString::utf8_str()

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

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index 54db82a366610bd8ac3f3de246bde97bdcaab78b..7f1923332a5ac120d83daa703a86c38f8aa7e8ca 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -88,8 +88,9 @@
 #define WX_ASSERT_SIZET_EQUAL(n, m) CPPUNIT_ASSERT_EQUAL(((size_t)n), m)
 
 ///////////////////////////////////////////////////////////////////////////////
-// stream inserter for wxString
-//
+// define stream inserter for wxString if it's not defined in the main library,
+// we need it to output the test failures involving wxString
+#if !wxUSE_STD_IOSTREAM
 
 #include "wx/string.h"
 
@@ -102,6 +103,7 @@ inline std::ostream& operator<<(std::ostream& o, const wxString& s)
 #endif
 }
 
+#endif // !wxUSE_STD_IOSTREAM
 
 ///////////////////////////////////////////////////////////////////////////////
 // Some more compiler warning tweaking and auto linking.