Added project files for wxUniv under MSW

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

diff --git a/include/wx/log.h b/include/wx/log.h
index 43fae9c89ea84bdebe5528e4dbb06f91b32a082c..db1f30d5d1217c006698bf9fb3c2f744dbb3a8e5 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -251,14 +251,14 @@ class WXDLLEXPORT wxLogStream : public wxLog
 {
 public:
     // redirect log output to an ostream
 {
 public:
     // redirect log output to an ostream

-    wxLogStream(ostream *ostr = (ostream *) NULL);
+    wxLogStream(wxSTD ostream *ostr = (wxSTD ostream *) NULL);

 
 protected:
     // implement sink function
     virtual void DoLogString(const wxChar *szString, time_t t);
 
     // using ptr here to avoid including <iostream.h> from this file
 
 protected:
     // implement sink function
     virtual void DoLogString(const wxChar *szString, time_t t);
 
     // using ptr here to avoid including <iostream.h> from this file

-    ostream *m_ostr;
+    wxSTD ostream *m_ostr;

 };
 #endif
 
 };
 #endif
 


@@ -268,6 +268,8 @@ protected:
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

+#if wxUSE_TEXTCTRL
+

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


@@ -282,9 +284,14 @@ private:
     wxTextCtrl *m_pTextCtrl;
 };
 
     wxTextCtrl *m_pTextCtrl;
 };
 

+#endif // wxUSE_TEXTCTRL
+

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

+
+#if wxUSE_LOGGUI
+

 class WXDLLEXPORT wxLogGui : public wxLog
 {
 public:
 class WXDLLEXPORT wxLogGui : public wxLog
 {
 public:


@@ -307,12 +314,17 @@ protected:
                   m_bWarnings;      // any warnings?
 };
 
                   m_bWarnings;      // any warnings?
 };
 

+#endif // wxUSE_LOGGUI
+

 // ----------------------------------------------------------------------------
 // (background) log window: this class forwards all log messages to the log
 // target which was active when it was instantiated, but also collects them
 // to the log window. This window has it's own menu which allows the user to
 // close it, clear the log contents or save it to the file.
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // (background) log window: this class forwards all log messages to the log
 // target which was active when it was instantiated, but also collects them
 // to the log window. This window has it's own menu which allows the user to
 // close it, clear the log contents or save it to the file.
 // ----------------------------------------------------------------------------

+
+#if wxUSE_LOGWINDOW
+

 class WXDLLEXPORT wxLogWindow : public wxLog
 {
 public:
 class WXDLLEXPORT wxLogWindow : public wxLog
 {
 public:


@@ -366,6 +378,8 @@ private:
     wxLogFrame *m_pLogFrame;      // the log frame
 };
 
     wxLogFrame *m_pLogFrame;      // the log frame
 };
 

+#endif // wxUSE_LOGWINDOW
+

 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------