projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avoiding reshow of hidden windows when app is brought forward #12402
[wxWidgets.git]
/
tests
/
strings
/
iostream.cpp
diff --git
a/tests/strings/iostream.cpp
b/tests/strings/iostream.cpp
index 6e40cbb28f124b1f3c8eb16b56eafb09828fc90b..30ac12ba6c63a9dbd15b80f1ee178325a0ddeb7d 100644
(file)
--- a/
tests/strings/iostream.cpp
+++ b/
tests/strings/iostream.cpp
@@
-21,6
+21,8
@@
#include "wx/string.h"
#endif // WX_PRECOMP
#include "wx/string.h"
#endif // WX_PRECOMP
+#if wxUSE_STD_IOSTREAM
+
#include <sstream>
#define ASSERT_OSTREAM_EQUAL(p, s) CPPUNIT_ASSERT_EQUAL(std::string(p), s.str())
#include <sstream>
#define ASSERT_OSTREAM_EQUAL(p, s) CPPUNIT_ASSERT_EQUAL(std::string(p), s.str())
@@
-45,7
+47,7
@@
private:
CPPUNIT_TEST_SUITE_REGISTRATION( StringIostreamTestCase );
CPPUNIT_TEST_SUITE_REGISTRATION( StringIostreamTestCase );
-// also include in it
'
s own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( StringIostreamTestCase, "StringIostream" );
void StringIostreamTestCase::Out()
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( StringIostreamTestCase, "StringIostream" );
void StringIostreamTestCase::Out()
@@
-54,8
+56,11
@@
void StringIostreamTestCase::Out()
s << wxString("hello");
ASSERT_OSTREAM_EQUAL("hello", s);
s << wxString("hello");
ASSERT_OSTREAM_EQUAL("hello", s);
+#if wxUSE_UNICODE && defined(HAVE_WOSTREAM)
std::wostringstream ws;
ws << wxString("bye");
ASSERT_WOSTREAM_EQUAL(L"bye", ws);
std::wostringstream ws;
ws << wxString("bye");
ASSERT_WOSTREAM_EQUAL(L"bye", ws);
+#endif
}
}
+#endif // wxUSE_STD_IOSTREAM