More unicode related cleanup and fixes for wxPython

[wxWidgets.git] / include / wx / ioswrap.h

diff --git a/include/wx/ioswrap.h b/include/wx/ioswrap.h
index ce0b15357c12b12f6b1550f3fd1450c2450802d6..293437577753e1c744dd8d623a208aaddfb21d8e 100644 (file)
--- a/include/wx/ioswrap.h
+++ b/include/wx/ioswrap.h
@@ -9,12 +9,20 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
+#if wxUSE_STD_IOSTREAM
+
 #if wxUSE_IOSTREAMH
     // N.B. BC++ doesn't have istream.h, ostream.h
 #   include <iostream.h>
 #else
 #   include <iostream>
+#   if 0 // this is not needed any longer now that we have wxSTD
 #   if defined(__VISUALC__) || defined(__MWERKS__)
         using namespace std;
 #   endif
+#endif // 0
+#endif
+
 #endif
+  // wxUSE_STD_IOSTREAM
+