wxUSE_BUTTONBAR removed.

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

diff --git a/include/wx/ioswrap.h b/include/wx/ioswrap.h
index ce0b15357c12b12f6b1550f3fd1450c2450802d6..8fb05a157941960b634074f2b6aff1a245426879 100644 (file)
--- a/include/wx/ioswrap.h
+++ b/include/wx/ioswrap.h
@@ -1,20 +1,22 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        ioswrap.h
+// Name:        wx/ioswrap.h

 // Purpose:     includes the correct iostream headers for current compiler
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.02.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Purpose:     includes the correct iostream headers for current compiler
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.02.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

+#if wxUSE_STD_IOSTREAM
+

 #if wxUSE_IOSTREAMH
 #if wxUSE_IOSTREAMH

-    // N.B. BC++ doesn't have istream.h, ostream.h

 #   include <iostream.h>
 #else
 #   include <iostream>
 #   include <iostream.h>
 #else
 #   include <iostream>

-#   if defined(__VISUALC__) || defined(__MWERKS__)
-        using namespace std;
-#   endif

 #endif
 #endif

+
+#endif
+  // wxUSE_STD_IOSTREAM
+