X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68379eaf0ae64d105f8244b1db83e793f7dd83b0..f321ab7fb40525098cea6594ffbf2daf0186b1a3:/include/wx/cppunit.h?ds=sidebyside diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h index dbdae16f4a..6698891991 100644 --- 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 #include #include +#include #include "wx/afterstd.h" @@ -67,6 +78,18 @@ WXTEST_ANY_WITH_CONDITION(suiteName, Condition, testMethod, CPPUNIT_TEST_FAIL(testMethod)) +/////////////////////////////////////////////////////////////////////////////// +// stream inserter for wxString +// + +#include "wx/string.h" + +inline std::ostream& operator<<(std::ostream& o, const wxString& s) +{ + return o << s.mb_str(); +} + + /////////////////////////////////////////////////////////////////////////////// // Some more compiler warning tweaking and auto linking. //