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 773776fe4cd75acd5d86aefba4b1ab8600103de5..09953c87d10d04849dbc0a9158b6ce0521192efc 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -8,6 +8,7 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

+

 #ifdef __GNUG__
 #pragma implementation "zstream.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "zstream.h"
 #endif


@@ -15,18 +16,21 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/zstream.h"
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+  #include "wx/defs.h"
+#endif

 
 

-#ifdef wxUSE_ZLIB
+#if wxUSE_ZLIB && wxUSE_STREAMS

 
 

+#include "wx/zstream.h"

 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/log.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/log.h"

-#include "../zlib/zlib.h"   // don't change this, Robert
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
+#include "zlib.h"

 
 #define ZSTREAM_BUFFER_SIZE 1024
 
 
 #define ZSTREAM_BUFFER_SIZE 1024
 


@@ -133,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;
   }
 


@@ -186,6 +190,5 @@ size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size)
 }
 
 #endif
 }
 
 #endif

-
-  // wxUSE_ZLIB
+  // wxUSE_ZLIB && wxUSE_STREAMS