#include "wx/datstrm.h"
#include "wx/zstream.h"
#include "wx/mstream.h"
-#include "wx/ptr_scpd.h"
+#include "wx/scopedptr.h"
#include "wx/wfstream.h"
#include "zlib.h"
//
static wxFileOffset QuietSeek(wxInputStream& stream, wxFileOffset pos)
{
-#if defined(__WXDEBUG__) && wxUSE_LOG
+#if wxUSE_LOG
wxLogLevel level = wxLog::GetLogLevel();
wxLog::SetLogLevel(wxLOG_Debug - 1);
wxFileOffset result = stream.SeekI(pos);
/////////////////////////////////////////////////////////////////////////////
// Class factory
-wxZipClassFactory g_wxZipClassFactory;
+static wxZipClassFactory g_wxZipClassFactory;
wxZipClassFactory::wxZipClassFactory()
{
wxFileOffset m_pos;
wxFileOffset m_len;
- DECLARE_NO_COPY_CLASS(wxStoredInputStream)
+ wxDECLARE_NO_COPY_CLASS(wxStoredInputStream);
};
wxStoredInputStream::wxStoredInputStream(wxInputStream& stream)
private:
wxFileOffset m_pos;
- DECLARE_NO_COPY_CLASS(wxStoredOutputStream)
+ wxDECLARE_NO_COPY_CLASS(wxStoredOutputStream);
};
size_t wxStoredOutputStream::OnSysWrite(const void *buffer, size_t size)
size_t m_start;
size_t m_end;
- DECLARE_NO_COPY_CLASS(wxTeeInputStream)
+ wxDECLARE_NO_COPY_CLASS(wxTeeInputStream);
};
wxTeeInputStream::wxTeeInputStream(wxInputStream& stream)
enum { BUFSIZE = 8192 };
wxCharBuffer m_dummy;
- DECLARE_NO_COPY_CLASS(wxRawInputStream)
+ wxDECLARE_NO_COPY_CLASS(wxRawInputStream);
};
wxRawInputStream::wxRawInputStream(wxInputStream& stream)
if (m_DiskNumber != 0 || m_StartDisk != 0 ||
m_EntriesHere != m_TotalEntries)
+ {
wxLogWarning(_("assuming this is a multi-part zip concatenated"));
+ }
return true;
}
m_lasterror = m_parent_o_stream->GetLastError();
m_endrecWritten = true;
-
+
if (!wxFilterOutputStream::Close() || !IsOk())
return false;
m_lasterror = wxSTREAM_EOF;