1. wxGrid fixes contributed by Gerhard Gruber (client data for cells...)

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

diff --git a/include/wx/log.h b/include/wx/log.h
index af0a164dd6bac64b0c8ca0ea4f262c9168f87fc0..72f8d774fb020e1ce411b344f37922d174eb33d9 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -16,6 +16,8 @@
     #pragma interface "log.h"
 #endif
 
+#include "wx/setup.h"
+
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
@@ -87,15 +89,7 @@ enum
     #define wxTraceOleCalls 0x0100  // OLE interface calls
 #endif
 
-#if wxUSE_IOSTREAMH
-// N.B. BC++ doesn't have istream.h, ostream.h
-#   include <iostream.h>
-#else
-#   include <ostream>
-#   if defined(__VISUALC__) || defined(__MWERKS__)
-        using namespace std;
-#   endif
-#endif
+#include "wx/ioswrap.h"
 
 // ----------------------------------------------------------------------------
 // derive from this class to redirect (or suppress, or ...) log messages
@@ -449,7 +443,7 @@ DECLARE_LOG_FUNCTION2(SysError, long lErrCode);
     #define __TFILE__ __XFILE__(__FILE__)
 #endif
 
-#if __WXDEBUG__
+#ifdef __WXDEBUG__
     // make life easier for people using VC++ IDE: clicking on the message
     // will take us immediately to the place of the failed API
 #ifdef __VISUALC__