Blind compilation fixes.

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

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index 32bf79fd92328cdc7d1bb78b80a8b37776613c0d..9ccc2a93c391d0e016492394f0ef0a0a27c06c12 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -29,6 +29,10 @@
     #pragma warn -8022
 #endif
 
     #pragma warn -8022
 #endif
 

+#ifndef CPPUNIT_STD_NEED_ALLOCATOR
+    #define CPPUNIT_STD_NEED_ALLOCATOR 0
+#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
 ///////////////////////////////////////////////////////////////////////////////
 // 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


@@ -83,17 +87,29 @@
 // Use this macro to compare a size_t with a literal integer
 #define WX_ASSERT_SIZET_EQUAL(n, m) CPPUNIT_ASSERT_EQUAL(((size_t)n), m)
 
 // Use this macro to compare a size_t with a literal integer
 #define WX_ASSERT_SIZET_EQUAL(n, m) CPPUNIT_ASSERT_EQUAL(((size_t)n), m)
 

+
+// Use this macro to assert with the given formatted message (it should contain
+// the format string and arguments in a separate pair of parentheses)
+#define WX_ASSERT_MESSAGE(msg, cond) \
+    CPPUNIT_ASSERT_MESSAGE(std::string(wxString::Format msg .mb_str()), (cond))
+

 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// 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"
 
 inline std::ostream& operator<<(std::ostream& o, const wxString& s)
 {
 
 #include "wx/string.h"
 
 inline std::ostream& operator<<(std::ostream& o, const wxString& s)
 {

-    return o << (const char *)wxSafeConvertWX2MB(s);
+#if wxUSE_UNICODE
+    return o << (const char *)wxSafeConvertWX2MB(s.wc_str());
+#else
+    return o << s.c_str();
+#endif

 }
 
 }
 

+#endif // !wxUSE_STD_IOSTREAM

 
 ///////////////////////////////////////////////////////////////////////////////
 // Some more compiler warning tweaking and auto linking.
 
 ///////////////////////////////////////////////////////////////////////////////
 // Some more compiler warning tweaking and auto linking.