MIME classes with docs (not yet added to the makefiles)

[wxWidgets.git] / src / common / log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index f92320b0f81535a94f28c687a17d0bc8222c6761..f99580301def8e4d4a4d43bf8c7c2d8149312783 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -389,6 +389,7 @@ void wxLogStderr::DoLogString(const char *szString)
 // wxLogStream implementation
 // ----------------------------------------------------------------------------
 
 // wxLogStream implementation
 // ----------------------------------------------------------------------------
 

+#if wxUSE_STD_IOSTREAM

 wxLogStream::wxLogStream(ostream *ostr)
 {
   if ( ostr == NULL )
 wxLogStream::wxLogStream(ostream *ostr)
 {
   if ( ostr == NULL )


@@ -401,15 +402,17 @@ void wxLogStream::DoLogString(const char *szString)
 {
   (*m_ostr) << szString << endl << flush;
 }
 {
   (*m_ostr) << szString << endl << flush;
 }

+#endif

 
 #ifndef   wxUSE_NOGUI
 
 #ifndef   wxUSE_NOGUI

+

 // ----------------------------------------------------------------------------
 // wxLogTextCtrl implementation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxLogTextCtrl implementation
 // ----------------------------------------------------------------------------

-wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
-// @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf

 
 

-// Also, in DLL mode in wxMSW, can't use it.
+#if wxUSE_STD_IOSTREAM
+wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
+// DLL mode in wxMSW, can't use it.

 #if defined(NO_TEXT_WINDOW_STREAM)
 #else
              : wxLogStream(new ostream(pTextCtrl))
 #if defined(NO_TEXT_WINDOW_STREAM)
 #else
              : wxLogStream(new ostream(pTextCtrl))


@@ -421,6 +424,7 @@ wxLogTextCtrl::~wxLogTextCtrl()
 {
   delete m_ostr;
 }
 {
   delete m_ostr;
 }

+#endif

 
 // ----------------------------------------------------------------------------
 // wxLogGui implementation
 
 // ----------------------------------------------------------------------------
 // wxLogGui implementation