only define operator<<(wchar_t) in Unicode build

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

diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h
index 8cbc1c747b88a034b389fbec445fb374cdebbf5f..0090deb4e965bea327d17de261a47486a6c3be4c 100644 (file)
--- a/include/wx/txtstrm.h
+++ b/include/wx/txtstrm.h
@@ -121,9 +121,9 @@ public:
     wxTextOutputStream& operator<<(const wxChar *string);
     wxTextOutputStream& operator<<(const wxString& string);
     wxTextOutputStream& operator<<(char c);
     wxTextOutputStream& operator<<(const wxChar *string);
     wxTextOutputStream& operator<<(const wxString& string);
     wxTextOutputStream& operator<<(char c);

-#if wxUSE_WCHAR_T && wxWCHAR_T_IS_REAL_TYPE
+#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE

     wxTextOutputStream& operator<<(wchar_t wc);
     wxTextOutputStream& operator<<(wchar_t wc);

-#endif // wxUSE_WCHAR_T
+#endif // wxUSE_UNICODE

     wxTextOutputStream& operator<<(wxInt16 c);
     wxTextOutputStream& operator<<(wxInt32 c);
     wxTextOutputStream& operator<<(wxUint16 c);
     wxTextOutputStream& operator<<(wxInt16 c);
     wxTextOutputStream& operator<<(wxInt32 c);
     wxTextOutputStream& operator<<(wxUint16 c);

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 6f85a1d6cb831f33329fa933c1cfb9c1e153d3df..0290751e3c72b4880719510db6537e396771bffb 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -425,7 +425,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(char c)
     return *this;
 }
 
     return *this;
 }
 

-#if wxUSE_WCHAR_T && wxWCHAR_T_IS_REAL_TYPE
+#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE

 
 wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc)
 {
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc)
 {


@@ -434,7 +434,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc)
     return *this;
 }
 
     return *this;
 }
 

-#endif // wxUSE_WCHAR_T
+#endif // wxUSE_UNICODE

 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
 {
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
 {