From e4940febd0aa35a8b70fe3244beab9604c1dd3d7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 12 Sep 2004 15:08:36 +0000 Subject: [PATCH] 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 --- include/wx/txtstrm.h | 4 ++-- src/common/txtstrm.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h index 8cbc1c747b..0090deb4e9 100644 --- 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); -#if wxUSE_WCHAR_T && wxWCHAR_T_IS_REAL_TYPE +#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE wxTextOutputStream& operator<<(wchar_t wc); -#endif // wxUSE_WCHAR_T +#endif // wxUSE_UNICODE 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 6f85a1d6cb..0290751e3c 100644 --- a/src/common/txtstrm.cpp +++ b/src/common/txtstrm.cpp @@ -425,7 +425,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(char c) 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) { @@ -434,7 +434,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc) return *this; } -#endif // wxUSE_WCHAR_T +#endif // wxUSE_UNICODE wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c) { -- 2.47.2