OGL fixes for wxMotif; added Set/GetClientData to wxMenu in wxMSW/wxMotif/wxStubs.

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

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 95d016c850c1ca4606e308df1b8fb97b5ea37b3d..4a4117e410b4ce97044673203fe69dc10700de67 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -28,9 +28,13 @@
 #include <stddef.h>
 
 #if wxUSE_IOSTREAMH
-#include <iostream.h>
+// N.B. BC++ doesn't have istream.h, ostream.h
+#  include <iostream.h>
 #else
-#include <iostream>
+#  include <ostream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif
 #endif
 
 #include "wx/string.h"