Fixed context menu in wxRichTextCtrl

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

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index 756ecfa1185ce6484905ca037a96a679ea3a1d5c..7f1923332a5ac120d83daa703a86c38f8aa7e8ca 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
 // Created:     15.02.04
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Vadim Zeitlin

+// Licence:     wxWindows Licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CPPUNIT_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CPPUNIT_H_


@@ -27,13 +28,17 @@
 #ifdef __BORLANDC__
     #pragma warn -8022
 #endif
 #ifdef __BORLANDC__
     #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
 // for some compilers (e.g. VC++).
 
 ///////////////////////////////////////////////////////////////////////////////
 // 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 
+#ifndef CPPUNIT_COMPILER_LOCATION_FORMAT

     #define CPPUNIT_COMPILER_LOCATION_FORMAT "%p:%l:"
 #endif
 
     #define CPPUNIT_COMPILER_LOCATION_FORMAT "%p:%l:"
 #endif
 


@@ -76,6 +81,29 @@
 #define WXTEST_FAIL_WITH_CONDITION(suiteName, Condition, testMethod) \
     WXTEST_ANY_WITH_CONDITION(suiteName, Condition, testMethod, CPPUNIT_TEST_FAIL(testMethod))
 
 #define WXTEST_FAIL_WITH_CONDITION(suiteName, Condition, testMethod) \
     WXTEST_ANY_WITH_CONDITION(suiteName, Condition, testMethod, CPPUNIT_TEST_FAIL(testMethod))
 

+// Use this macro to compare a wxString with a literal string.
+#define WX_ASSERT_STR_EQUAL(p, s) CPPUNIT_ASSERT_EQUAL(wxString(p), s)
+
+// 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)
+
+///////////////////////////////////////////////////////////////////////////////
+// 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)
+{
+#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.