old makefiles removed

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

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index 110199eda6d184c0cce196e1efdb162b770cd4b3..90d3338161b54add68663b2143a34a573d36e193 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -14,10 +14,13 @@
 
 // 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/stream.h>
-#include <wx/zstream.h>
-#include <wx/utils.h>
-#include <wx/intl.h>
+
+#include "wx/zstream.h"
+
+#if wxUSE_ZLIB
+
+#include "wx/utils.h"
+#include "wx/intl.h"

 #include "wx/log.h"
 #include "../zlib/zlib.h"   // don't change this, Robert
 
 #include "wx/log.h"
 #include "../zlib/zlib.h"   // don't change this, Robert
 


@@ -130,7 +133,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 +184,8 @@ size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size)
   }
   return size;
 }
   }
   return size;
 }

+
+#endif
+
+  // wxUSE_ZLIB
+