From e5805c0fde8bfabee79b155fbea761398efa4fc0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 12 Jul 2010 22:50:51 +0000 Subject: [PATCH] Only compile wxStd{Input,Output}Stream if wxUSE_STREAMS==1. This fixes compilation of minimal wxWidgets build. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/stdstream.h | 4 ++-- src/common/stdstream.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/stdstream.h b/include/wx/stdstream.h index a973bbb768..e3f3a474fe 100644 --- a/include/wx/stdstream.h +++ b/include/wx/stdstream.h @@ -14,7 +14,7 @@ #include "wx/defs.h" // wxUSE_STD_IOSTREAM -#if wxUSE_STD_IOSTREAM +#if wxUSE_STREAMS && wxUSE_STD_IOSTREAM #include "wx/defs.h" #include "wx/stream.h" @@ -106,6 +106,6 @@ protected: wxStdOutputStreamBuffer m_streamBuffer; }; -#endif // wxUSE_STD_IOSTREAM +#endif // wxUSE_STREAMS && wxUSE_STD_IOSTREAM #endif // _WX_STDSTREAM_H_ diff --git a/src/common/stdstream.cpp b/src/common/stdstream.cpp index cec1fc925f..54b18ad2dd 100644 --- a/src/common/stdstream.cpp +++ b/src/common/stdstream.cpp @@ -20,7 +20,7 @@ #pragma hdrstop #endif -#if wxUSE_STD_IOSTREAM +#if wxUSE_STREAMS && wxUSE_STD_IOSTREAM #ifndef WX_PRECOMP #endif @@ -290,4 +290,4 @@ wxStdOutputStream::wxStdOutputStream(wxOutputStream& stream) : #endif // VC6/!VC6 -#endif // wxUSE_STD_IOSTREAM +#endif // wxUSE_STREAMS && wxUSE_STD_IOSTREAM -- 2.45.2