X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/184b5d99a5382cd7a19888c85aff11f8a21af2f6..9a05fd8d137bbe26acd4f86adf6d62c55424822c:/include/wx/log.h

diff --git a/include/wx/log.h b/include/wx/log.h
index 32c9b1f0e8..db595e7664 100644
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -57,13 +57,13 @@ class WXDLLEXPORT wxLogFrame;
 class WXDLLEXPORT wxFrame;
 
 #if wxUSE_IOSTREAMH
-// N.B. BC++ doesn't have istream.h, ostream.h
-#  include <iostream.h>
+    // N.B. BC++ doesn't have istream.h, ostream.h
+#   include <iostream.h>
 #else
-#  include <ostream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+#   include <ostream>
+#   if defined(__VISUALC__) || defined(__MWERKS__)
+        using namespace std;
+#   endif
 #endif
 
 // ----------------------------------------------------------------------------
@@ -180,6 +180,7 @@ private:
   FILE *m_fp;
 };
 
+#if wxUSE_STD_IOSTREAM
 // log everything to an "ostream", cerr by default
 class WXDLLEXPORT wxLogStream : public wxLog
 {
@@ -194,9 +195,11 @@ protected:
   // @@ using ptr here to avoid including <iostream.h> from this file
   ostream *m_ostr;
 };
+#endif
 
 #ifndef wxUSE_NOGUI
 
+#if wxUSE_STD_IOSTREAM
 // log everything to a text window (GUI only of course)
 class WXDLLEXPORT wxLogTextCtrl : public wxLogStream
 {
@@ -205,6 +208,7 @@ public:
   wxLogTextCtrl(wxTextCtrl *pTextCtrl);
  ~wxLogTextCtrl();
 };
+#endif
 
 // ----------------------------------------------------------------------------
 // GUI log target, the default one for wxWindows programs