Added a few files; fixed some warnings and wxMotif compile problems

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

diff --git a/include/wx/log.h b/include/wx/log.h
index 219301b80f7d0c976107616df3e9f597c6a3ee5b..ec849d8df93ab4708310a2825614f13028795649 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -57,7 +57,8 @@ class WXDLLEXPORT wxLogFrame;
 class WXDLLEXPORT wxFrame;
 
 #if wxUSE_IOSTREAMH
 class WXDLLEXPORT wxFrame;
 
 #if wxUSE_IOSTREAMH

-#  include <ostream.h>
+// N.B. BC++ doesn't have istream.h, ostream.h
+#  include <iostream.h>

 #else
 #  include <ostream>
 #  ifdef _MSC_VER
 #else
 #  include <ostream>
 #  ifdef _MSC_VER


@@ -179,6 +180,7 @@ private:
   FILE *m_fp;
 };
 
   FILE *m_fp;
 };
 

+#if wxUSE_STD_IOSTREAM

 // log everything to an "ostream", cerr by default
 class WXDLLEXPORT wxLogStream : public wxLog
 {
 // log everything to an "ostream", cerr by default
 class WXDLLEXPORT wxLogStream : public wxLog
 {


@@ -193,9 +195,11 @@ protected:
   // @@ using ptr here to avoid including <iostream.h> from this file
   ostream *m_ostr;
 };
   // @@ using ptr here to avoid including <iostream.h> from this file
   ostream *m_ostr;
 };

+#endif

 
 #ifndef wxUSE_NOGUI
 
 
 #ifndef wxUSE_NOGUI
 

+#if wxUSE_STD_IOSTREAM

 // log everything to a text window (GUI only of course)
 class WXDLLEXPORT wxLogTextCtrl : public wxLogStream
 {
 // log everything to a text window (GUI only of course)
 class WXDLLEXPORT wxLogTextCtrl : public wxLogStream
 {


@@ -204,6 +208,7 @@ public:
   wxLogTextCtrl(wxTextCtrl *pTextCtrl);
  ~wxLogTextCtrl();
 };
   wxLogTextCtrl(wxTextCtrl *pTextCtrl);
  ~wxLogTextCtrl();
 };

+#endif

 
 // ----------------------------------------------------------------------------
 // GUI log target, the default one for wxWindows programs
 
 // ----------------------------------------------------------------------------
 // GUI log target, the default one for wxWindows programs


@@ -378,9 +383,9 @@ WXDLLEXPORT_DATA(extern bool) g_bVerbose;
 // ----------------------------------------------------------------------------
 
 // return the last system error code
 // ----------------------------------------------------------------------------
 
 // return the last system error code

-unsigned long WXDLLEXPORT wxSysErrorCode();
+WXDLLEXPORT unsigned long wxSysErrorCode();

 // return the error message for given (or last if 0) error code
 // return the error message for given (or last if 0) error code

-const char* WXDLLEXPORT wxSysErrorMsg(unsigned long nErrCode = 0);
+WXDLLEXPORT const char* wxSysErrorMsg(unsigned long nErrCode = 0);

 
 // ----------------------------------------------------------------------------
 // debug only logging functions: use them with API name and error code
 
 // ----------------------------------------------------------------------------
 // debug only logging functions: use them with API name and error code