]> git.saurik.com Git - wxWidgets.git/commitdiff
VC6 doesn't have wostream when using old iostream.h
authorVadim Zeitlin <vadim@wxwidgets.org>
Tue, 4 Mar 2008 12:06:07 +0000 (12:06 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Tue, 4 Mar 2008 12:06:07 +0000 (12:06 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/defs.h

index c48dbaa91fde862aaef5522410abdc72f4af64f6..0c3848a2a3a10f594db4087beb6577343216a22f 100644 (file)
@@ -452,9 +452,20 @@ typedef short int WXTYPE;
 
 #ifndef HAVE_WOSTREAM
     // Mingw <=3.4 doesn't have std::wostream
-    #if !defined(__MINGW32__) || wxCHECK_GCC_VERSION(4,0)
+    #if defined(__MINGW32__) && !wxCHECK_GCC_VERSION(4,0)
+        #define wxNO_WOSTREAM
+    #endif
+
+    // VC++ doesn't have it in the old iostream library
+    #if defined(__VISUALC__) && wxUSE_IOSTREAMH
+        #define wxNO_WOSTREAM
+    #endif
+
+    #ifndef wxNO_WOSTREAM
         #define HAVE_WOSTREAM
     #endif
+
+    #undef wxNO_WOSTREAM
 #endif /* HAVE_WOSTREAM */
 
 // ----------------------------------------------------------------------------