[ 1945434 ] Changing method wxComboCtrlBase::DrawButton to virtual one

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

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index 4160617d6dec957add508ef5fc40b9a0e89063d8..a7affd50ae9c9a03d42ac45fdb3996bf47a7873f 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -87,6 +87,22 @@
 // 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 wxArrayString with the pipe-separated elements
+// of the given string
+//
+// NB: it's a macro and not a function to have the correct line numbers in the
+//     test failure messages
+#define WX_ASSERT_STRARRAY_EQUAL(s, a)                                        \
+    {                                                                         \
+        wxArrayString expected(wxSplit(s, '|', '\0'));                        \
+                                                                              \
+        CPPUNIT_ASSERT_EQUAL( expected.size(), a.size() );                    \
+                                                                              \
+        for ( size_t n = 0; n < a.size(); n++ )                               \
+        {                                                                     \
+            CPPUNIT_ASSERT_EQUAL( expected[n], a[n] );                        \
+        }                                                                     \
+    }
 
 // Use this macro to assert with the given formatted message (it should contain
 // the format string and arguments in a separate pair of parentheses)
@@ -111,7 +127,9 @@ inline std::ostream& operator<<(std::ostream& o, const wxString& s)
 #endif
 }
 
-#ifdef wxLongLong_t
+// VC6 doesn't provide overloads for operator<<(__int64) in its stream classes
+// so do it ourselves
+#if defined(__VISUALC6__) && defined(wxLongLong_t)
 
 #include "wx/longlong.h"
 
@@ -129,7 +147,7 @@ inline std::ostream& operator<<(std::ostream& ostr, unsigned wxLongLong_t llu)
     return ostr;
 }
 
-#endif // wxLongLong_t
+#endif // VC6 && wxLongLong_t
 
 #endif // !wxUSE_STD_IOSTREAM