X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..08670ea85abf4b4946a9ce64971b591d7b1ee30b:/src/common/archive.cpp?ds=inline diff --git a/src/common/archive.cpp b/src/common/archive.cpp index 223b8942bb..e6962a7784 100644 --- a/src/common/archive.cpp +++ b/src/common/archive.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: archive.cpp +// Name: src/common/archive.cpp // Purpose: Streams for archive formats // Author: Mike Wetherell // RCS-ID: $Id$ @@ -11,11 +11,7 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/defs.h" + #pragma hdrstop #endif #if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS @@ -23,14 +19,7 @@ #include "wx/archive.h" IMPLEMENT_ABSTRACT_CLASS(wxArchiveEntry, wxObject) -IMPLEMENT_ABSTRACT_CLASS(wxArchiveClassFactory, wxObject) - -#if wxUSE_ZIPSTREAM -//FORCE_LINK(zipstrm) -extern int _wx_link_dummy_func_zipstrm(); -static int _wx_link_dummy_var_zipstrm = - _wx_link_dummy_func_zipstrm (); -#endif +IMPLEMENT_ABSTRACT_CLASS(wxArchiveClassFactory, wxFilterClassFactoryBase) ///////////////////////////////////////////////////////////////////////////// @@ -43,6 +32,13 @@ wxArchiveInputStream::wxArchiveInputStream(wxInputStream& stream, { } +wxArchiveInputStream::wxArchiveInputStream(wxInputStream *stream, + wxMBConv& conv) + : wxFilterInputStream(stream), + m_conv(conv) +{ +} + ///////////////////////////////////////////////////////////////////////////// // wxArchiveOutputStream @@ -54,6 +50,13 @@ wxArchiveOutputStream::wxArchiveOutputStream(wxOutputStream& stream, { } +wxArchiveOutputStream::wxArchiveOutputStream(wxOutputStream *stream, + wxMBConv& conv) + : wxFilterOutputStream(stream), + m_conv(conv) +{ +} + ///////////////////////////////////////////////////////////////////////////// // wxArchiveEntry @@ -71,4 +74,25 @@ wxArchiveEntry& wxArchiveEntry::operator=(const wxArchiveEntry& WXUNUSED(e)) return *this; } + +///////////////////////////////////////////////////////////////////////////// +// wxArchiveClassFactory + +wxArchiveClassFactory *wxArchiveClassFactory::sm_first = NULL; + +void wxArchiveClassFactory::Remove() +{ + if (m_next != this) + { + wxArchiveClassFactory **pp = &sm_first; + + while (*pp != this) + pp = &(*pp)->m_next; + + *pp = m_next; + + m_next = this; + } +} + #endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS