Replaced ostream with FILE* in wxExpr.

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

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index 110199eda6d184c0cce196e1efdb162b770cd4b3..09953c87d10d04849dbc0a9158b6ce0521192efc 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -8,23 +8,30 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

+

 #ifdef __GNUG__
 #pragma implementation "zstream.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 #ifdef __GNUG__
 #pragma implementation "zstream.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

-#include <wx/stream.h>
-#include <wx/zstream.h>
-#include <wx/utils.h>
-#include <wx/intl.h>
-#include "wx/log.h"
-#include "../zlib/zlib.h"   // don't change this, Robert

 
 #ifdef __BORLANDC__
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

+#ifndef WX_PRECOMP
+  #include "wx/defs.h"
+#endif
+
+#if wxUSE_ZLIB && wxUSE_STREAMS
+
+#include "wx/zstream.h"
+#include "wx/utils.h"
+#include "wx/intl.h"
+#include "wx/log.h"
+#include "zlib.h"
+

 #define ZSTREAM_BUFFER_SIZE 1024
 
 //////////////////////
 #define ZSTREAM_BUFFER_SIZE 1024
 
 //////////////////////


@@ -130,7 +137,7 @@ wxZlibOutputStream::~wxZlibOutputStream()
   err = deflate(m_deflate, Z_FINISH);
   if (err != Z_STREAM_END) 
   {
   err = deflate(m_deflate, Z_FINISH);
   if (err != Z_STREAM_END) 
   {

-    wxLogDebug( "wxZlibOutputStream: an error occured while closing the stream.\n" );
+    wxLogDebug( _T("wxZlibOutputStream: an error occured while closing the stream.\n") );

     return;
   }
 
     return;
   }
 


@@ -181,3 +188,7 @@ size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size)
   }
   return size;
 }
   }
   return size;
 }

+
+#endif
+  // wxUSE_ZLIB && wxUSE_STREAMS
+