define insertion operator in std::wostream in Unicode build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/string.h b/include/wx/string.h
index 1710a2e165e6379ed0bac915cadab77b7103bf05..9f403dab076100d0e503d9db0f27ea9abcc0714d 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -3031,6 +3031,14 @@ WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxCharBuffer&);
 WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxWCharBuffer&);
 #endif
 
+#if wxUSE_UNICODE
+
+WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxString&);
+WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxCStrData&);
+WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxWCharBuffer&);
+
+#endif  // wxUSE_UNICODE
+
 #endif  // wxUSE_STD_IOSTREAM
 
 // ---------------------------------------------------------------------------

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 36efc0ce8e2a3bbfdec7705d883177ba25a06d3c..a032dec82f30350863eb197c9f6d40d465586ae5 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -96,6 +96,25 @@ wxSTD ostream& operator<<(wxSTD ostream& os, const wxWCharBuffer& str)
 }
 #endif
 
+#if wxUSE_UNICODE
+
+wxSTD wostream& operator<<(wxSTD wostream& wos, const wxString& str)
+{
+    return wos << str.wc_str();
+}
+
+wxSTD wostream& operator<<(wxSTD wostream& wos, const wxCStrData& str)
+{
+    return wos << str.AsWChar();
+}
+
+wxSTD wostream& operator<<(wxSTD wostream& wos, const wxWCharBuffer& str)
+{
+    return wos << str.data();
+}
+
+#endif  // wxUSE_UNICODE
+
 #endif // wxUSE_STD_IOSTREAM
 
 // ===========================================================================