Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tidy up includes and #if wxUSE statements.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-10-27 22:03:29 +00:00
parent 959d17852d
commit 5410f5728d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/zipstrm.h
View File

@@ -12,10 +12,9 @@
#include "wx/defs.h" #include "wx/defs.h"
#if wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM #if wxUSE_ZIPSTREAM
#include "wx/archive.h" #include "wx/archive.h"
#include "wx/hashmap.h"
#include "wx/filename.h" #include "wx/filename.h"
// some methods from wxZipInputStream and wxZipOutputStream stream do not get // 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__ #endif // _WX_WXZIPSTREAM_H__

9
src/common/zipstrm.cpp
View File

@@ -14,19 +14,20 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM #if wxUSE_ZIPSTREAM
#include "wx/zipstrm.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/hashmap.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/utils.h" #include "wx/utils.h"
#endif #endif
#include "wx/zipstrm.h"
#include "wx/datstrm.h" #include "wx/datstrm.h"
#include "wx/zstream.h" #include "wx/zstream.h"
#include "wx/mstream.h" #include "wx/mstream.h"
#include "wx/buffer.h"
#include "wx/ptr_scpd.h" #include "wx/ptr_scpd.h"
#include "wx/wfstream.h" #include "wx/wfstream.h"
#include "zlib.h" #include "zlib.h"
@@ -2421,4 +2422,4 @@ size_t wxZipOutputStream::OnSysWrite(const void *buffer, size_t size)
return m_comp->LastWrite(); return m_comp->LastWrite();
} }
#endif // wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM #endif // wxUSE_ZIPSTREAM