adding ContentScaleFactor support to dc - defaulting to 1.0

[wxWidgets.git] / src / common / stdstream.cpp

diff --git a/src/common/stdstream.cpp b/src/common/stdstream.cpp
index 1fa00576423bbbd3a33da5758c3ee0e099cf9ea4..0f4fea1836da9cdff9e8174e6648f571d50eb896 100644 (file)
--- a/src/common/stdstream.cpp
+++ b/src/common/stdstream.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/stdstream.h
+// Name:        src/common/stdstream.cpp
 // Purpose:     Implementation of std::istream and std::ostream derived
 //              wrappers for wxInputStream and wxOutputStream
 // Author:      Jonathan Liu <net147@gmail.com>
@@ -20,7 +20,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_STD_IOSTREAM
+#if wxUSE_STREAMS && wxUSE_STD_IOSTREAM
 
 #ifndef WX_PRECOMP
 #endif
@@ -39,7 +39,7 @@
 namespace
 {
 
-inline bool
+bool
 IosSeekDirToWxSeekMode(std::ios_base::seekdir way,
                        wxSeekMode& seekMode)
 {
@@ -290,4 +290,4 @@ wxStdOutputStream::wxStdOutputStream(wxOutputStream& stream) :
 
 #endif // VC6/!VC6
 
-#endif // wxUSE_STD_IOSTREAM
+#endif // wxUSE_STREAMS && wxUSE_STD_IOSTREAM