From 5410f5728d75f905375c2b05944b11fc92a74aa4 Mon Sep 17 00:00:00 2001
From: Michael Wetherell <mike.wetherell@ntlworld.com>
Date: Fri, 27 Oct 2006 22:03:29 +0000
Subject: [PATCH] Tidy up includes and #if wxUSE statements.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/zipstrm.h   | 5 ++---
 src/common/zipstrm.cpp | 9 +++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h
index 37abe860c1..8d704a001a 100644
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -12,10 +12,9 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM
+#if wxUSE_ZIPSTREAM
 
 #include "wx/archive.h"
-#include "wx/hashmap.h"
 #include "wx/filename.h"
 
 // some methods from wxZipInputStream and wxZipOutputStream stream do not get
@@ -570,6 +569,6 @@ inline void wxZipEntry::SetName(const wxString& name,
 }
 
 
-#endif // wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM
+#endif // wxUSE_ZIPSTREAM
 
 #endif // _WX_WXZIPSTREAM_H__
diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 83c3cfbeab..3a533fcb93 100644
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -14,19 +14,20 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM
+#if wxUSE_ZIPSTREAM
+
+#include "wx/zipstrm.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/hashmap.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
 #endif
 
-#include "wx/zipstrm.h"
 #include "wx/datstrm.h"
 #include "wx/zstream.h"
 #include "wx/mstream.h"
-#include "wx/buffer.h"
 #include "wx/ptr_scpd.h"
 #include "wx/wfstream.h"
 #include "zlib.h"
@@ -2421,4 +2422,4 @@ size_t wxZipOutputStream::OnSysWrite(const void *buffer, size_t size)
     return m_comp->LastWrite();
 }
 
-#endif // wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM
+#endif // wxUSE_ZIPSTREAM